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/14558378 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14558378 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14558378 Branch: refs/heads/cassandra-3.0 Commit: 145583784f3a203c3935f31a390608c672a33ea6 Parents: a1a260c fec40fd Author: Robert Stupp <[email protected]> Authored: Tue Aug 11 22:27:42 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Tue Aug 11 22:27:42 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/Cql.g | 4 +- .../statements/CreateAggregateStatement.java | 24 +++------ .../validation/operations/AggregationTest.java | 56 +++++++++++--------- 3 files changed, 40 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14558378/src/java/org/apache/cassandra/cql3/Cql.g ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14558378/src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java index 0bb13e5,5ee7e33..98354d5 --- a/src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateAggregateStatement.java @@@ -88,9 -87,8 +87,8 @@@ public final class CreateAggregateState AbstractType<?> stateType = prepareType("state type", stateTypeRaw); List<AbstractType<?>> stateArgs = stateArguments(stateType, argTypes); - stateFunc = validateFunctionKeyspace(stateFunc); - Function f = Functions.find(stateFunc, stateArgs); + Function f = Schema.instance.findFunction(stateFunc, stateArgs).orElse(null); if (!(f instanceof ScalarFunction)) throw new InvalidRequestException("State function " + stateFuncSig(stateFunc, stateTypeRaw, argRawTypes) + " does not exist or is not a scalar function"); stateFunction = (ScalarFunction)f; @@@ -102,8 -100,7 +100,7 @@@ if (finalFunc != null) { List<AbstractType<?>> finalArgs = Collections.<AbstractType<?>>singletonList(stateType); - finalFunc = validateFunctionKeyspace(finalFunc); - f = Functions.find(finalFunc, finalArgs); + f = Schema.instance.findFunction(finalFunc, finalArgs).orElse(null); if (!(f instanceof ScalarFunction)) throw new InvalidRequestException("Final function " + finalFunc + '(' + stateTypeRaw + ") does not exist or is not a scalar function"); finalFunction = (ScalarFunction) f; http://git-wip-us.apache.org/repos/asf/cassandra/blob/14558378/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java index 16333dd,6a77368..9994114 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java @@@ -32,10 -31,11 +32,11 @@@ import org.apache.cassandra.cql3.CQLTes import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.UntypedResultSet.Row; -import org.apache.cassandra.cql3.functions.Functions; import org.apache.cassandra.cql3.functions.UDAggregate; + import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.exceptions.FunctionExecutionException; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.transport.Event; import org.apache.cassandra.transport.messages.ResultMessage;
