Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0e20364 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0e20364 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0e20364 Branch: refs/heads/trunk Commit: d0e20364529b8c037bc14d95f477d8bf6caf2ff2 Parents: 6b7db8a e4eabd9 Author: Robert Stupp <[email protected]> Authored: Mon Jan 4 16:34:43 2016 +0100 Committer: Robert Stupp <[email protected]> Committed: Mon Jan 4 16:34:43 2016 +0100 ---------------------------------------------------------------------- .../cassandra/cql3/functions/AggregateFcts.java | 230 ++++++++++++++----- .../cql3/validation/entities/UFTest.java | 26 +++ .../validation/operations/AggregationTest.java | 41 ++++ 3 files changed, 239 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0e20364/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0e20364/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ----------------------------------------------------------------------
