Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bd5c64b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bd5c64b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bd5c64b Branch: refs/heads/trunk Commit: 1bd5c64ba108ded9c0e7fc3d5f7b8315ece48798 Parents: 9075918 e3862bc Author: Tyler Hobbs <[email protected]> Authored: Wed Nov 19 11:38:17 2014 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Wed Nov 19 11:38:17 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++ .../cql3/statements/SelectStatement.java | 8 +-- .../org/apache/cassandra/cql3/CQLTester.java | 7 +++ .../cassandra/cql3/FrozenCollectionsTest.java | 56 ++++++++++++++++++-- 4 files changed, 67 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bd5c64b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 749fdd2,c00e671..f41e7c3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,7 +1,41 @@@ +3.0 + * Fix aggregate fn results on empty selection, result column name, + and cqlsh parsing (CASSANDRA-8229) + * Mark sstables as repaired after full repair (CASSANDRA-7586) + * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443) + * Integrate JMH for microbenchmarks (CASSANDRA-8151) + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063, 7813) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455, 8208) + 2.1.3 + * Fix filtering for CONTAINS (KEY) relations on frozen collection + clustering columns when the query is restricted to a single + partition (CASSANDRA-8203) * Do more aggressive entire-sstable TTL expiry checks (CASSANDRA-8243) * Add more log info if readMeter is null (CASSANDRA-8238) * add check of the system wall clock time at startup (CASSANDRA-8305) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bd5c64b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index e042578,de3d67c..99c2297 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@@ -1944,15 -1976,17 +1944,15 @@@ public class SelectStatement implement } else if (restriction.isIN()) { - if (!restriction.isMultiColumn() && i != stmt.columnRestrictions.length - 1) - throw new InvalidRequestException(String.format("Clustering column \"%s\" cannot be restricted by an IN relation", cdef.name)); - else if (stmt.selectACollection()) + if (stmt.selectACollection()) throw new InvalidRequestException(String.format("Cannot restrict column \"%s\" by IN relation as a collection is selected by the query", cdef.name)); } - /* - else if (restriction.isContains() && !hasQueriableIndex) + else if (restriction.isContains()) { - throw new InvalidRequestException(String.format("Cannot restrict column \"%s\" by a CONTAINS relation without a secondary index", cdef.name)); + if (!hasQueriableIndex) + throw new InvalidRequestException(String.format("Cannot restrict column \"%s\" by a CONTAINS relation without a secondary index", cdef.name)); + stmt.usesSecondaryIndexing = true; } - */ previous = cdef; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bd5c64b/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
