cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Fri, 22 Sep 2017 14:44:26 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e5c84ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e5c84ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e5c84ad

Branch: refs/heads/trunk
Commit: 0e5c84ad8f5b43ff98b72ccdc62718bb2795b711
Parents: de6f21f 51e6f24
Author: Paulo Motta <paulo@apache.org>
Authored: Fri Sep 22 09:42:36 2017 -0500
Committer: Paulo Motta <paulo@apache.org>
Committed: Fri Sep 22 09:42:43 2017 -0500

----------------------------------------------------------------------
 .../cassandra/triggers/TriggerExecutor.java     |  7 ++++-
 .../cassandra/triggers/TriggerExecutorTest.java | 25 ++++++++++++----
 .../apache/cassandra/triggers/TriggersTest.java | 30 ++++++++++++--------
 3 files changed, 43 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e5c84ad/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e5c84ad/test/unit/org/apache/cassandra/triggers/TriggerExecutorTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e5c84ad/test/unit/org/apache/cassandra/triggers/TriggersTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/triggers/TriggersTest.java
index e5a2dd6,67619dc..165a7fe
--- a/test/unit/org/apache/cassandra/triggers/TriggersTest.java
+++ b/test/unit/org/apache/cassandra/triggers/TriggersTest.java
@@@ -192,10 -194,12 +192,10 @@@ public class TriggersTes
                     org.apache.cassandra.thrift.ConsistencyLevel.LOCAL_SERIAL,
                     org.apache.cassandra.thrift.ConsistencyLevel.ONE);
  
-         assertUpdateIsAugmented(6);
+         assertUpdateIsAugmented(6, "v1", 6);
      }
  
 -    // Unfortunately, an IRE thrown from StorageProxy.cas
 -    // results in a RuntimeException from QueryProcessor.process
 -    @Test(expected=RuntimeException.class)
 +    @Test(expected=org.apache.cassandra.exceptions.InvalidRequestException.class)
      public void onCqlUpdateWithConditionsRejectGeneratedUpdatesForDifferentPartition() throws
Exception
      {
          String cf = "cf" + System.nanoTime();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message