natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch cassandra-3.0 into trunk

This commit is contained in:
blerer 2015-09-22 20:52:00 +02:00
parent b283eac157 96eb58a0fb
commit 56d81ac53b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS.txt
View File

@ -44,6 +44,9 @@ New features
Upgrading
---------
- The LIMIT clause applies now only to the number of rows returned to the user,
not to the number of row queried. By consequence, queries using aggregates will not
be impacted by the LIMIT clause anymore.
- The native protocol versions 1 and 2 are not supported anymore.
- Max mutation size is now configurable via max_mutation_size_in_kb setting in
cassandra.yaml; the default is half the size commitlog_segment_size_in_mb * 1024.

4
test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java
View File

@ -91,6 +91,8 @@ public class AggregationTest extends CQLTester
assertRows(execute("SELECT COUNT(*) FROM %s"), row(4L));
assertRows(execute("SELECT COUNT(1) FROM %s"), row(4L));
assertRows(execute("SELECT COUNT(b), count(c), count(e), count(f) FROM %s"), row(4L, 3L, 3L, 3L));
// Makes sure that LIMIT does not affect the result of aggregates
assertRows(execute("SELECT COUNT(b), count(c), count(e), count(f) FROM %s LIMIT 2"), row(4L, 3L, 3L, 3L));
}
@Test
@ -130,6 +132,8 @@ public class AggregationTest extends CQLTester
assertRows(execute("SELECT COUNT(1) FROM %s"), row(4L));
assertRows(execute("SELECT max(b), b, COUNT(*) FROM %s"), row(5, 1, 4L));
assertRows(execute("SELECT max(b), COUNT(1), b FROM %s"), row(5, 4L, 1));
// Makes sure that LIMIT does not affect the result of aggregates
assertRows(execute("SELECT max(b), COUNT(1), b FROM %s LIMIT 2"), row(5, 4L, 1));
}
@Test