Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/triggers/TriggerExecutor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8cedb607
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cedb607
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cedb607
Branch: refs/heads/trunk
Commit: 8cedb6079409064b7d550f2b9cb7865394b0323b
Parents: 83f4acc 8440bc5
Author: Aleksey Yeschenko <[email protected]>
Authored: Wed Mar 19 00:09:36 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Wed Mar 19 00:09:36 2014 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageProxy.java | 10 +
.../cassandra/triggers/TriggerExecutor.java | 44 ++++-
.../apache/cassandra/triggers/TriggersTest.java | 190 ++++++++++++++++++-
4 files changed, 236 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cedb607/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cedb607/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/triggers/TriggerExecutor.java
index 8d7f42b,8a8c51d..43ab0c8
--- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
+++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
@@@ -28,8 -29,10 +29,9 @@@ import com.google.common.collect.Lists
import com.google.common.collect.Maps;
import org.apache.cassandra.config.TriggerDefinition;
-import org.apache.cassandra.cql.QueryProcessor;
+import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.db.*;
-import org.apache.cassandra.db.composites.CellName;
+ import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.utils.FBUtilities;
