Repository: cassandra Updated Branches: refs/heads/trunk 6770d0ff8 -> 50c27cca4
fix merge issue Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50c27cca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50c27cca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50c27cca Branch: refs/heads/trunk Commit: 50c27cca4084e1e65ac51af6e7125cf2be918d76 Parents: 6770d0f Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Sep 16 21:07:10 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Sep 16 21:07:10 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/50c27cca/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index 7a110ac..4e46125 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -24,17 +24,16 @@ import java.util.concurrent.ConcurrentHashMap; import com.google.common.annotations.VisibleForTesting; import com.google.common.primitives.Ints; - import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.googlecode.concurrentlinkedhashmap.EntryWeigher; import com.googlecode.concurrentlinkedhashmap.EvictionListener; + import org.antlr.runtime.*; import org.apache.cassandra.service.IMigrationListener; import org.apache.cassandra.service.MigrationManager; import org.github.jamm.MemoryMeter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.cassandra.cql3.statements.*; import org.apache.cassandra.db.*; import org.apache.cassandra.db.composites.*; @@ -559,9 +558,11 @@ public class QueryProcessor implements QueryHandler public void onCreateKeyspace(String ksName) { } public void onCreateColumnFamily(String ksName, String cfName) { } public void onCreateUserType(String ksName, String typeName) { } + public void onCreateFunction(String namespace, String functionName) { } public void onUpdateKeyspace(String ksName) { } public void onUpdateColumnFamily(String ksName, String cfName) { } public void onUpdateUserType(String ksName, String typeName) { } + public void onUpdateFunction(String namespace, String functionName) { } public void onDropKeyspace(String ksName) { @@ -574,5 +575,6 @@ public class QueryProcessor implements QueryHandler } public void onDropUserType(String ksName, String typeName) { } + public void onDropFunction(String namespace, String functionName) { } } }
