You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/09/11 18:42:14 UTC
[1/3] cassandra git commit: Move prepared statement invalidation
message to DEBUG
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 665f74740 -> 0b990b798
Move prepared statement invalidation message to DEBUG
Those message are of no particular use to users as they result from
a user action and don't provide actionable information.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9f36042
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9f36042
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9f36042
Branch: refs/heads/cassandra-3.0
Commit: e9f36042cd07459df8f50a1cc7cf621eaf183657
Parents: 9faa193
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Sep 11 18:38:24 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Sep 11 18:38:27 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9f36042/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 3d33713..d59d84f 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -616,20 +616,20 @@ public class QueryProcessor implements QueryHandler
{
if (columnsDidChange)
{
- logger.info("Column definitions for {}.{} changed, invalidating related prepared statements", ksName, cfName);
+ logger.debug("Column definitions for {}.{} changed, invalidating related prepared statements", ksName, cfName);
removeInvalidPreparedStatements(ksName, cfName);
}
}
public void onDropKeyspace(String ksName)
{
- logger.info("Keyspace {} was dropped, invalidating related prepared statements", ksName);
+ logger.debug("Keyspace {} was dropped, invalidating related prepared statements", ksName);
removeInvalidPreparedStatements(ksName, null);
}
public void onDropColumnFamily(String ksName, String cfName)
{
- logger.info("Table {}.{} was dropped, invalidating related prepared statements", ksName, cfName);
+ logger.debug("Table {}.{} was dropped, invalidating related prepared statements", ksName, cfName);
removeInvalidPreparedStatements(ksName, cfName);
}
}
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b990b79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b990b79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b990b79
Branch: refs/heads/cassandra-3.0
Commit: 0b990b79854a744e054990438067fa08bfca7bc7
Parents: 665f747 0d5908b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Sep 11 18:42:05 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Sep 11 18:42:05 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b990b79/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
src/java/org/apache/cassandra/cql3/QueryProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d5908bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d5908bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d5908bc
Branch: refs/heads/cassandra-3.0
Commit: 0d5908bcc031f93b439fe9a2d717b8e2f9a98740
Parents: 72f2cc4 e9f3604
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Sep 11 18:40:23 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Sep 11 18:40:23 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d5908bc/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index b1b4cb4,d59d84f..e9ff1b1
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -597,30 -612,13 +597,30 @@@ public class QueryProcessor implements
return ksName.equals(statementKsName) && (cfName == null || cfName.equals(statementCfName));
}
+ public void onCreateFunction(String ksName, String functionName, List<AbstractType<?>> argTypes) {
+ if (Functions.getOverloadCount(new FunctionName(ksName, functionName)) > 1)
+ {
+ // in case there are other overloads, we have to remove all overloads since argument type
+ // matching may change (due to type casting)
+ removeInvalidPreparedStatementsForFunction(preparedStatements.values().iterator(), ksName, functionName);
+ removeInvalidPreparedStatementsForFunction(thriftPreparedStatements.values().iterator(), ksName, functionName);
+ }
+ }
+ public void onCreateAggregate(String ksName, String aggregateName, List<AbstractType<?>> argTypes) {
+ if (Functions.getOverloadCount(new FunctionName(ksName, aggregateName)) > 1)
+ {
+ // in case there are other overloads, we have to remove all overloads since argument type
+ // matching may change (due to type casting)
+ removeInvalidPreparedStatementsForFunction(preparedStatements.values().iterator(), ksName, aggregateName);
+ removeInvalidPreparedStatementsForFunction(thriftPreparedStatements.values().iterator(), ksName, aggregateName);
+ }
+ }
+
public void onUpdateColumnFamily(String ksName, String cfName, boolean columnsDidChange)
{
- logger.info("Column definitions for {}.{} changed, invalidating related prepared statements", ksName, cfName);
++ logger.debug("Column definitions for {}.{} changed, invalidating related prepared statements", ksName, cfName);
if (columnsDidChange)
- {
- logger.debug("Column definitions for {}.{} changed, invalidating related prepared statements", ksName, cfName);
removeInvalidPreparedStatements(ksName, cfName);
- }
}
public void onDropKeyspace(String ksName)
@@@ -631,41 -629,8 +631,41 @@@
public void onDropColumnFamily(String ksName, String cfName)
{
- logger.info("Table {}.{} was dropped, invalidating related prepared statements", ksName, cfName);
+ logger.debug("Table {}.{} was dropped, invalidating related prepared statements", ksName, cfName);
removeInvalidPreparedStatements(ksName, cfName);
}
- }
+
+ public void onDropFunction(String ksName, String functionName, List<AbstractType<?>> argTypes)
+ {
+ removeInvalidPreparedStatementsForFunction(preparedStatements.values().iterator(), ksName, functionName);
+ removeInvalidPreparedStatementsForFunction(thriftPreparedStatements.values().iterator(), ksName, functionName);
+ }
+
+ public void onDropAggregate(String ksName, String aggregateName, List<AbstractType<?>> argTypes)
+ {
+ removeInvalidPreparedStatementsForFunction(preparedStatements.values().iterator(), ksName, aggregateName);
+ removeInvalidPreparedStatementsForFunction(thriftPreparedStatements.values().iterator(), ksName, aggregateName);
+ }
+
+ private static void removeInvalidPreparedStatementsForFunction(Iterator<ParsedStatement.Prepared> statements,
+ final String ksName,
+ final String functionName)
+ {
+ final Predicate<Function> matchesFunction = new Predicate<Function>()
+ {
+ public boolean apply(Function f)
+ {
+ return ksName.equals(f.name().keyspace) && functionName.equals(f.name().name);
+ }
+ };
+
+ Iterators.removeIf(statements, new Predicate<ParsedStatement.Prepared>()
+ {
+ public boolean apply(ParsedStatement.Prepared statement)
+ {
+ return Iterables.any(statement.statement.getFunctions(), matchesFunction);
+ }
+ });
+ }
+ }
}