You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/07/16 23:03:41 UTC
[2/2] cassandra git commit: Merge 'cassandra-2.2' into trunk
Merge 'cassandra-2.2' into trunk
Conflicts:
test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/689582c0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/689582c0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/689582c0
Branch: refs/heads/trunk
Commit: 689582c04464c62e7570af8785e4e97ce06b30e0
Parents: 0bd5170 2b99b5d
Author: blerer <be...@datastax.com>
Authored: Thu Jul 16 23:02:47 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Thu Jul 16 23:02:47 2015 +0200
----------------------------------------------------------------------
NEWS.txt | 4 +
doc/cql3/CQL.textile | 5 +-
.../selection/AbstractFunctionSelector.java | 9 +-
.../cassandra/cql3/selection/Selection.java | 7 +-
.../cql3/selection/SelectorFactories.java | 12 --
.../cql3/selection/SimpleSelector.java | 8 +-
.../cql3/selection/WritetimeOrTTLSelector.java | 8 +-
.../validation/operations/AggregationTest.java | 135 +++++++++++++++++--
8 files changed, 150 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/689582c0/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/689582c0/doc/cql3/CQL.textile
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/689582c0/src/java/org/apache/cassandra/cql3/selection/Selection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/689582c0/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
index 1ecc810,51e4a28..a5952c2
--- a/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
@@@ -24,16 -24,17 +24,18 @@@ import java.util.Date
import java.util.TimeZone;
import org.apache.commons.lang3.time.DateUtils;
- import org.junit.Assert;
+
import org.junit.Test;
+import org.apache.cassandra.config.Schema;
+ import org.apache.cassandra.cql3.CQLTester;
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.cql3.CQLTester;
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;