Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1b9cba2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1b9cba2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1b9cba2
Branch: refs/heads/trunk
Commit: b1b9cba2a57878a104ab31854e1be6293fbd71ee
Parents: d66ae75 345e69e
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Dec 16 20:36:10 2014 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Dec 16 20:36:10 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/cql3/statements/CreateIndexStatement.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1b9cba2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 142d5aa,d429f2e..964de54
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,32 -1,5 +1,33 @@@
-2.0.12:
+2.1.3
+ * Add auth support to cassandra-stress (CASSANDRA-7985)
+ * Fix ArrayIndexOutOfBoundsException when generating error message
+ for some CQL syntax errors (CASSANDRA-8455)
+ * Scale memtable slab allocation logarithmically (CASSANDRA-7882)
+ * cassandra-stress simultaneous inserts over same seed (CASSANDRA-7964)
+ * Reduce cassandra-stress sampling memory requirements (CASSANDRA-7926)
+ * Ensure memtable flush cannot expire commit log entries from its future
(CASSANDRA-8383)
+ * Make read "defrag" async to reclaim memtables (CASSANDRA-8459)
+ * Remove tmplink files for offline compactions (CASSANDRA-8321)
+ * Reduce maxHintsInProgress (CASSANDRA-8415)
+ * BTree updates may call provided update function twice (CASSANDRA-8018)
+ * Release sstable references after anticompaction (CASSANDRA-8386)
+ * Handle abort() in SSTableRewriter properly (CASSANDRA-8320)
+ * Fix high size calculations for prepared statements (CASSANDRA-8231)
+ * Centralize shared executors (CASSANDRA-8055)
+ * 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)
+ * Support for frozen collections (CASSANDRA-7859)
+ * Fix overflow on histogram computation (CASSANDRA-8028)
+ * Have paxos reuse the timestamp generation of normal queries
(CASSANDRA-7801)
+ * Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
+ * Improve JBOD disk utilization (CASSANDRA-7386)
+ * Log failed host when preparing incremental repair (CASSANDRA-8228)
+Merged from 2.0:
+ * Fix validation of indexes in COMPACT tables (CASSANDRA-8156)
* Avoid StackOverflowError when a large list of IN values
is used for a clustering column (CASSANDRA-8410)
* Fix NPE when writetime() or ttl() calls are wrapped by
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1b9cba2/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
----------------------------------------------------------------------
diff --cc
src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
index 3032897,5710290..ac19f5c
--- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
@@@ -119,8 -85,8 +119,8 @@@ public class CreateIndexStatement exten
properties.validate();
// TODO: we could lift that limitation
- if (cfm.comparator.isDense() && cd.kind !=
ColumnDefinition.Kind.REGULAR)
- throw new InvalidRequestException(String.format("Secondary index
on %s column %s is not yet supported for compact table", cd.kind,
target.column));
- if ((cfm.getCfDef().isCompact || !cfm.getCfDef().isComposite) &&
cd.type != ColumnDefinition.Type.REGULAR)
++ if ((cfm.comparator.isDense() || !cfm.comparator.isCompound()) &&
cd.kind != ColumnDefinition.Kind.REGULAR)
+ throw new InvalidRequestException("Secondary indexes are not
supported on PRIMARY KEY columns in COMPACT STORAGE tables");
// It would be possible to support 2ndary index on static columns
(but not without modifications of at least ExtendedFilter and
// CompositesIndex) and maybe we should, but that means a query like:
