[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java src/java/org/apache/cassandra/db/compaction/LeveledManifest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef890455 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef890455 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef890455 Branch: refs/heads/cassandra-2.1 Commit: ef890455061dcbbda5d9d1cad187fc43a664f4d4 Parents: de62175 968ffd8 Author: Marcus Eriksson marc...@apache.org Authored: Mon Sep 1 15:41:57 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Sep 1 15:41:57 2014 +0200 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DataTracker.java | 12 .../apache/cassandra/db/compaction/LeveledManifest.java | 5 - .../org/apache/cassandra/io/sstable/SSTableReader.java | 5 + 4 files changed, 22 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef890455/CHANGES.txt -- diff --cc CHANGES.txt index c202586,6d77f3c..477a332 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -20,39 -14,24 +20,40 @@@ Merged from 2.0 * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753) * Fix ALTER clustering column type from DateType to TimestampType when using DESC clustering order (CASSANRDA-7797) - * Stop inheriting liveRatio and liveRatioComputedAt from previous - memtables (CASSANDRA-7796) * Throw EOFException if we run out of chunks in compressed datafile (CASSANDRA-7664) - * Throw InvalidRequestException when queries contain relations on entire - collection columns (CASSANDRA-7506) * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787) - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) * Fix dropping collection when it's the last regular column (CASSANDRA-7744) * Properly reject operations on list index with conditions (CASSANDRA-7499) - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * Make StreamReceiveTask thread safe and gc friendly (CASSANDRA-7795) + * Validate empty cell names from counter updates (CASSANDRA-7798) +Merged from 1.2: ++ * Don't allow compacted sstables to be marked as compacting (CASSANDRA-7145) + * Track expired tombstones (CASSANDRA-7810) + + +2.1.0-rc6 + * Fix OOM issue from netty caching over time (CASSANDRA-7743) + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477) + * Invalidate all caches on table drop (CASSANDRA-7561) + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765) + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) + * Add tracing entries about concurrent range requests (CASSANDRA-7599) + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) + * Remove netty buffer ref-counting (CASSANDRA-7735) + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) + * Include stress yaml example in release and deb (CASSANDRA-7717) + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) + * Fix UDT field selection with empty fields (CASSANDRA-7670) + * Bogus deserialization of static cells from sstable (CASSANDRA-7684) + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770) +Merged from 2.0: * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222) * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756) - * (cqlsh) cqlsh should automatically disable tracing when selecting - from system_traces (CASSANDRA-7641) - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) + * Clone token map outside of hot gossip loops (CASSANDRA-7758) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) * Do not flush on truncate if durable_writes is false (CASSANDRA-7750) * Give CRR a default input_cql Statement (CASSANDRA-7226) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef890455/src/java/org/apache/cassandra/db/DataTracker.java -- diff --cc src/java/org/apache/cassandra/db/DataTracker.java index 097d8cc,d41181b..857e8bd --- a/src/java/org/apache/cassandra/db/DataTracker.java +++
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/049762b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/049762b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/049762b3 Branch: refs/heads/cassandra-2.1 Commit: 049762b3e49ec54cadc0a353520487ea6c2d Parents: cb4bc27 29befa1 Author: Marcus Eriksson marc...@apache.org Authored: Wed Aug 27 13:06:54 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Wed Aug 27 13:06:54 2014 +0200 -- CHANGES.txt | 2 ++ .../org/apache/cassandra/db/ColumnIndex.java| 2 +- .../org/apache/cassandra/db/RangeTombstone.java | 8 +- .../db/compaction/LazilyCompactedRow.java | 3 ++- .../apache/cassandra/db/RangeTombstoneTest.java | 26 5 files changed, 38 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/049762b3/CHANGES.txt -- diff --cc CHANGES.txt index 32c46bf,abdd561..9c75426 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -16,37 -12,24 +16,39 @@@ Merged from 2.0 * Configure system.paxos with LeveledCompactionStrategy (CASSANDRA-7753) * Fix ALTER clustering column type from DateType to TimestampType when using DESC clustering order (CASSANRDA-7797) - * Stop inheriting liveRatio and liveRatioComputedAt from previous - memtables (CASSANDRA-7796) * Throw EOFException if we run out of chunks in compressed datafile (CASSANDRA-7664) - * Throw InvalidRequestException when queries contain relations on entire - collection columns (CASSANDRA-7506) * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787) - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) * Fix dropping collection when it's the last regular column (CASSANDRA-7744) * Properly reject operations on list index with conditions (CASSANDRA-7499) - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) + * Make StreamReceiveTask thread safe and gc friendly (CASSANDRA-7795) + * Validate empty cell names from counter updates (CASSANDRA-7798) ++Merged from 1.2: ++ * Track expired tombstones (CASSANDRA-7810) + + +2.1.0-rc6 + * Fix OOM issue from netty caching over time (CASSANDRA-7743) + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477) + * Invalidate all caches on table drop (CASSANDRA-7561) + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765) + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) + * Add tracing entries about concurrent range requests (CASSANDRA-7599) + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) + * Remove netty buffer ref-counting (CASSANDRA-7735) + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) + * Include stress yaml example in release and deb (CASSANDRA-7717) + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) + * Fix UDT field selection with empty fields (CASSANDRA-7670) + * Bogus deserialization of static cells from sstable (CASSANDRA-7684) + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770) +Merged from 2.0: * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222) * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756) - * (cqlsh) cqlsh should automatically disable tracing when selecting - from system_traces (CASSANDRA-7641) - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) + * Clone token map outside of hot gossip loops (CASSANDRA-7758) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) * Do not flush on truncate if durable_writes is false (CASSANDRA-7750) * Give CRR a default input_cql Statement (CASSANDRA-7226) http://git-wip-us.apache.org/repos/asf/cassandra/blob/049762b3/src/java/org/apache/cassandra/db/ColumnIndex.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/049762b3/src/java/org/apache/cassandra/db/RangeTombstone.java -- diff --cc src/java/org/apache/cassandra/db/RangeTombstone.java index ffae7ba,16fc27a..3f3d675 --- a/src/java/org/apache/cassandra/db/RangeTombstone.java +++
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java test/unit/org/apache/cassandra/db/RangeTombstoneTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1f38cd2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1f38cd2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1f38cd2 Branch: refs/heads/cassandra-2.1 Commit: d1f38cd27fc4c2ec7e74c70d174ca5a021f660bd Parents: 889f3ac 61543b4 Author: Marcus Eriksson marc...@apache.org Authored: Tue Aug 26 15:35:53 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Tue Aug 26 15:36:42 2014 +0200 -- CHANGES.txt | 1 + .../db/compaction/LazilyCompactedRow.java | 7 +-- .../apache/cassandra/db/RangeTombstoneTest.java | 56 3 files changed, 61 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1f38cd2/CHANGES.txt -- diff --cc CHANGES.txt index 80747dc,7a59744..a9ab462 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -183,46 -85,21 +183,47 @@@ Merged from 1.2 are thrown while handling native protocol messages (CASSANDRA-7470) * Fix row size miscalculation in LazilyCompactedRow (CASSANDRA-7543) * Fix race in background compaction check (CASSANDRA-7745) + * Don't clear out range tombstones during compaction (CASSANDRA-7808) -2.0.9 - * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) - * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364) - * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401) - * Fix native protocol CAS batches (CASSANDRA-7337) - * Add per-CF range read request latency metrics (CASSANDRA-7338) - * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) - * Add conditional CREATE/DROP USER support (CASSANDRA-7264) - * Swap local and global default read repair chances (CASSANDRA-7320) - * Add missing iso8601 patterns for date strings (CASSANDRA-6973) - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) +2.1.0-rc1 + * Revert flush directory (CASSANDRA-6357) + * More efficient executor service for fast operations (CASSANDRA-4718) + * Move less common tools into a new cassandra-tools package (CASSANDRA-7160) + * Support more concurrent requests in native protocol (CASSANDRA-7231) + * Add tab-completion to debian nodetool packaging (CASSANDRA-6421) + * Change concurrent_compactors defaults (CASSANDRA-7139) + * Add PowerShell Windows launch scripts (CASSANDRA-7001) + * Make commitlog archive+restore more robust (CASSANDRA-6974) + * Fix marking commitlogsegments clean (CASSANDRA-6959) + * Add snapshot manifest describing files included (CASSANDRA-6326) + * Parallel streaming for sstableloader (CASSANDRA-3668) + * Fix bugs in supercolumns handling (CASSANDRA-7138) + * Fix ClassClassException on composite dense tables (CASSANDRA-7112) + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107) + * Upgrade NBHM lib (CASSANDRA-7128) + * Optimize netty server (CASSANDRA-6861) + * Fix repair hang when given CF does not exist (CASSANDRA-7189) + * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635) + * Add server side batching to native transport (CASSANDRA-5663) + * Make batchlog replay asynchronous (CASSANDRA-6134) + * remove unused classes (CASSANDRA-7197) + * Limit user types to the keyspace they are defined in (CASSANDRA-6643) + * Add validate method to CollectionType (CASSANDRA-7208) + * New serialization format for UDT values (CASSANDRA-7209, CASSANDRA-7261) + * Fix nodetool netstats (CASSANDRA-7270) + * Fix potential ClassCastException in HintedHandoffManager (CASSANDRA-7284) + * Use prepared statements internally (CASSANDRA-6975) + * Fix broken paging state with prepared statement (CASSANDRA-7120) + * Fix IllegalArgumentException in CqlStorage (CASSANDRA-7287) + * Allow nulls/non-existant fields in UDT (CASSANDRA-7206) + * Backport Thrift MultiSliceRequest (CASSANDRA-7027) + * Handle overlapping MultiSlices (CASSANDRA-7279) + * Fix DataOutputTest on Windows (CASSANDRA-7265) + * Embedded sets in user defined data-types are not updating (CASSANDRA-7267) + * Add tuple type to CQL/native protocol (CASSANDRA-7248) + * Fix CqlPagingRecordReader on tables with few rows (CASSANDRA-7322) +Merged from 2.0: * Copy compaction options to make sure they are reloaded (CASSANDRA-7290) * Add option to do more aggressive tombstone compactions (CASSANDRA-6563) * Don't try to compact already-compacting files
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
build.xml
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8da13437
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8da13437
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8da13437
Branch: refs/heads/cassandra-2.1
Commit: 8da134377a04614a5343ccf3eb211e8c48dd90fa
Parents: a0923db 200b802
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Aug 22 16:15:50 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Aug 22 16:15:50 2014 +0200
--
build.xml | 2 +-
.../cassandra/cql3/statements/BatchStatement.java | 2 +-
.../cql3/statements/ModificationStatement.java| 2 +-
tools/lib/cassandra-driver-core-2.0.4.jar | Bin 544025 - 0 bytes
tools/lib/cassandra-driver-core-2.0.5.jar | Bin 0 - 544552 bytes
5 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8da13437/build.xml
--
diff --cc build.xml
index ae77274,dd59bd2..16ff03b
--- a/build.xml
+++ b/build.xml
@@@ -395,12 -384,10 +395,12 @@@
dependency groupId=org.apache.cassandra
artifactId=cassandra-thrift version=${version} /
dependency groupId=com.yammer.metrics artifactId=metrics-core
version=2.2.0 /
dependency groupId=com.addthis.metrics
artifactId=reporter-config version=2.1.0 /
- dependency groupId=edu.stanford.ppl artifactId=snaptree
version=0.1 /
dependency groupId=org.mindrot artifactId=jbcrypt
version=0.3m /
- dependency groupId=io.netty artifactId=netty
version=3.6.6.Final /
+ dependency groupId=io.airlift artifactId=airline version=0.6
/
+ dependency groupId=io.netty artifactId=netty-all
version=4.0.20.Final /
+ dependency groupId=com.google.code.findbugs artifactId=jsr305
version=2.0.2 /
+ dependency groupId=com.clearspring.analytics artifactId=stream
version=2.5.2 /
- dependency groupId=com.datastax.cassandra
artifactId=cassandra-driver-core version=2.0.4 /
+ dependency groupId=com.datastax.cassandra
artifactId=cassandra-driver-core version=2.0.5 /
dependency groupId=net.sf.supercsv artifactId=super-csv
version=2.1.0 /
/dependencyManagement
developer id=alakshman name=Avinash Lakshman/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8da13437/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
index 90be914,8a9a8f0..49617ee
--- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
@@@ -124,35 -124,10 +124,35 @@@ public class BatchStatement implements
if (timestampSet statement.isTimestampSet())
throw new InvalidRequestException(Timestamp must be set
either on BATCH or individual statements);
-statement.validate(state);
+if (type == Type.COUNTER !statement.isCounter())
+throw new InvalidRequestException(Cannot include non-counter
statement in a counter batch);
+
+if (type == Type.LOGGED statement.isCounter())
+throw new InvalidRequestException(Cannot include a counter
statement in a logged batch);
+
+if (statement.isCounter())
+hasCounters = true;
+else
+hasNonCounters = true;
+}
+
+if (hasCounters hasNonCounters)
+throw new InvalidRequestException(Counter and non-counter
mutations cannot exist in the same batch);
-if (hasConditions statement.requiresRead())
-throw new InvalidRequestException(Operations on lists
requiring a read (setting by index and deletions by index or value) are not
allowed with IF conditions);
+if (hasConditions)
+{
+String ksName = null;
+String cfName = null;
+for (ModificationStatement stmt : statements)
+{
+if (ksName != null (!stmt.keyspace().equals(ksName) ||
!stmt.columnFamily().equals(cfName)))
+throw new InvalidRequestException(Batch with conditions
cannot span multiple tables);
+ksName = stmt.keyspace();
+cfName = stmt.columnFamily();
+
+if (stmt.requiresRead())
- throw new
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58554dec Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58554dec Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58554dec Branch: refs/heads/cassandra-2.1 Commit: 58554decc22c6754cc6ce4492ada65b5d8fbfcf9 Parents: da45786 fe39eb7 Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 20 20:42:48 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 20 20:42:48 2014 +0300 -- --
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/Constants.java src/java/org/apache/cassandra/cql3/UpdateParameters.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af188ed3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af188ed3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af188ed3 Branch: refs/heads/cassandra-2.1 Commit: af188ed364e421a56b3181c040519701cbaf0624 Parents: 1811281 ecf1bae Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 20 02:39:00 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 20 02:39:00 2014 +0300 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/cql3/Constants.java| 4 ++-- src/java/org/apache/cassandra/cql3/UpdateParameters.java | 7 +++ 3 files changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af188ed3/CHANGES.txt -- diff --cc CHANGES.txt index 5113057,304d9bf..183d849 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,35 -1,18 +1,37 @@@ -2.0.10 - * Throw InvalidRequestException when queries contain relations on entire - collection columns (CASSANDRA-7506) +2.1.0 + * (cqlsh) Fix COPY FROM handling of null/empty primary key + values (CASSANDRA-7792) + * Fix ordering of static cells (CASSANDRA-7763) +Merged from 2.0: * Fix PRSI handling of CQL3 row markers for row cleanup (CASSANDRA-7787) - * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577) * Fix dropping collection when it's the last regular column (CASSANDRA-7744) * Properly reject operations on list index with conditions (CASSANDRA-7499) - * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252) ++Merged from 1.2: ++ * Validate empty cell names from counter updates (CASSANDRA-7798) + + +2.1.0-rc6 + * Fix OOM issue from netty caching over time (CASSANDRA-7743) + * json2sstable couldn't import JSON for CQL table (CASSANDRA-7477) + * Invalidate all caches on table drop (CASSANDRA-7561) + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765) + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) + * Add tracing entries about concurrent range requests (CASSANDRA-7599) + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) + * Remove netty buffer ref-counting (CASSANDRA-7735) + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) + * Include stress yaml example in release and deb (CASSANDRA-7717) + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) + * Fix UDT field selection with empty fields (CASSANDRA-7670) + * Bogus deserialization of static cells from sstable (CASSANDRA-7684) + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770) +Merged from 2.0: * (cqlsh) Wait up to 10 sec for a tracing session (CASSANDRA-7222) * Fix NPE in FileCacheService.sizeInBytes (CASSANDRA-7756) - * (cqlsh) cqlsh should automatically disable tracing when selecting - from system_traces (CASSANDRA-7641) - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) - * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) - * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) + * Clone token map outside of hot gossip loops (CASSANDRA-7758) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) * Do not flush on truncate if durable_writes is false (CASSANDRA-7750) * Give CRR a default input_cql Statement (CASSANDRA-7226) http://git-wip-us.apache.org/repos/asf/cassandra/blob/af188ed3/src/java/org/apache/cassandra/cql3/Constants.java -- diff --cc src/java/org/apache/cassandra/cql3/Constants.java index 48f62dc,5189517..a8f0120 --- a/src/java/org/apache/cassandra/cql3/Constants.java +++ b/src/java/org/apache/cassandra/cql3/Constants.java @@@ -329,8 -322,9 +329,8 @@@ public abstract class Constant if (bytes == null) throw new InvalidRequestException(Invalid null value for counter increment); long increment = ByteBufferUtil.toLong(bytes); -prefix = maybeUpdatePrefix(cf.metadata(), prefix); -ByteBuffer cname = columnName == null ? prefix.build() : prefix.add(columnName.key).build(); +CellName cname = cf.getComparator().create(prefix, column); -
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fabdd431 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fabdd431 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fabdd431 Branch: refs/heads/cassandra-2.1 Commit: fabdd431ae9cda53b6a274bff4644dd467a5a392 Parents: 055b896 36382e5 Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Aug 18 22:00:40 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Aug 18 22:00:40 2014 +0300 -- --
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ce96a2a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce96a2a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce96a2a1
Branch: refs/heads/cassandra-2.1
Commit: ce96a2a120508ba0a31cc35e44905eae808f4be3
Parents: 4c387e4 bd0bb6d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Aug 11 18:23:43 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Aug 11 18:23:43 2014 +0200
--
CHANGES.txt | 3 +
.../cql3/statements/AlterTableStatement.java| 23 +-
.../apache/cassandra/cql3/AlterTableTest.java | 86
3 files changed, 110 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce96a2a1/CHANGES.txt
--
diff --cc CHANGES.txt
index 910feb4,cd51e04..64b4d65
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,14 @@@
-2.0.10
+2.1.0-rc6
+ * Include stress yaml example in release and deb (CASSANDRA-7717)
+ * workaround for netty issue causing corrupted data off the wire
(CASSANDRA-7695)
+ * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
+ * Fix binding null values inside UDT (CASSANDRA-7685)
+ * Fix UDT field selection with empty fields (CASSANDRA-7670)
+ * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
+Merged from 2.0:
+ * Better error message when adding a collection with the same name
+than a previously dropped one (CASSANDRA-6276)
+ * Fix validation when adding static columns (CASSANDRA-7730)
* (Thrift) fix range deletion of supercolumns (CASSANDRA-7733)
* Fix potential AssertionError in RangeTombstoneList (CASSANDRA-7700)
* Validate arguments of blobAs* functions (CASSANDRA-7707)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce96a2a1/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 273ee11,136c430..be28943
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -85,16 -86,23 +85,23 @@@ public class AlterTableStatement extend
switch (oType)
{
case ADD:
-if (cfDef.isCompact)
+if (cfm.comparator.isDense())
throw new InvalidRequestException(Cannot add new column
to a COMPACT STORAGE table);
- if (isStatic !cfm.comparator.isCompound())
- throw new InvalidRequestException(Static columns are not
allowed in COMPACT STORAGE tables);
+
+ if (isStatic)
+ {
-if (!cfDef.isComposite)
++if (!cfm.comparator.isCompound())
+ throw new InvalidRequestException(Static columns are
not allowed in COMPACT STORAGE tables);
-if (cfDef.clusteringColumns().isEmpty())
++if (cfm.clusteringColumns().isEmpty())
+ throw new InvalidRequestException(Static columns are
only useful (and thus allowed) if the table has at least one clustering
column);
+ }
+
-if (name != null)
+if (def != null)
{
-switch (name.kind)
+switch (def.kind)
{
-case KEY_ALIAS:
-case COLUMN_ALIAS:
+case PARTITION_KEY:
+case CLUSTERING_COLUMN:
throw new
InvalidRequestException(String.format(Invalid column name %s because it
conflicts with a PRIMARY KEY part, columnName));
default:
throw new
InvalidRequestException(String.format(Invalid column name %s because it
conflicts with an existing column, columnName));
@@@ -104,18 -112,39 +111,30 @@@
AbstractType? type = validator.getType();
if (type instanceof CollectionType)
{
-if (!cfDef.isComposite)
+if (!cfm.comparator.supportCollections())
throw new InvalidRequestException(Cannot use
collection types with non-composite PRIMARY KEY);
-if (cfDef.cfm.isSuper())
+if
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7d950e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7d950e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7d950e3 Branch: refs/heads/cassandra-2.1 Commit: a7d950e36387ee46ff48b3e81f93d7a704aae874 Parents: cd84cc9 f498a94 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 6 12:13:20 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 6 12:13:20 2014 +0200 -- CHANGES.txt | 1 + conf/cassandra-env.sh | 4 +++ .../cassandra/locator/SimpleSeedProvider.java | 27 .../service/EmbeddedCassandraService.java | 5 4 files changed, 32 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7d950e3/CHANGES.txt -- diff --cc CHANGES.txt index e8a0f6f,30efd94..724dbc3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,68 -1,12 +1,69 @@@ -2.0.10 +2.1.0-final + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) + * Fix UDT field selection with empty fields (CASSANDRA-7670) + * Bogus deserialization of static cells from sstable (CASSANDRA-7684) +Merged from 2.0: ++ * Add stop method to EmbeddedCassandraService (CASSANDRA-7595) * Update java driver (for hadoop) (CASSANDRA-7618) - * Fix truncate to always flush (CASSANDRA-7511) + * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669) + + +2.1.0-rc5 + * Reject counters inside user types (CASSANDRA-7672) + * Switch to notification-based GCInspector (CASSANDRA-7638) + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656) + * Don't use strict consistency when replacing (CASSANDRA-7568) + * Fix min/max cell name collection on 2.0 SSTables with range + tombstones (CASSANDRA-7593) + * Tolerate min/max cell names of different lengths (CASSANDRA-7651) + * Filter cached results correctly (CASSANDRA-7636) + * Fix tracing on the new SEPExecutor (CASSANDRA-7644) * Remove shuffle and taketoken (CASSANDRA-7601) - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467) - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) - * Always merge ranges owned by a single node (CASSANDRA-6930) - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Clean up Windows batch scripts (CASSANDRA-7619) + * Fix native protocol drop user type notification (CASSANDRA-7571) + * Give read access to system.schema_usertypes to all authenticated users + (CASSANDRA-7578) + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580) + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572) + * Fix NPE when dropping index from non-existent keyspace, AssertionError when + dropping non-existent index with IF EXISTS (CASSANDRA-7590) + * Fix sstablelevelresetter hang (CASSANDRA-7614) + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603) + * Use keyspace updated schema change message for UDT changes in v1 and + v2 protocols (CASSANDRA-7617) + * Fix tracing of range slices and secondary index lookups that are local + to the coordinator (CASSANDRA-7599) + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587) + * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596) + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625) + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626) + * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626) + * Fix scrub against collection type (CASSANDRA-7665) +Merged from 2.0: + * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668) + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663) + * Always flush on truncate (CASSANDRA-7511) * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * Always merge ranges owned by a single node (CASSANDRA-6930) + * Track max/min timestamps for range tombstones (CASSANDRA-7647) + * Fix NPE when listing saved caches dir (CASSANDRA-7632) + + +2.1.0-rc4 + * Fix word count hadoop example (CASSANDRA-7200) + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults + (CASSANDRA-7551) + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) + * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539) + * Bump CQL version
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a09e53cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a09e53cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a09e53cd Branch: refs/heads/cassandra-2.1 Commit: a09e53cdadb0be17ef4c27e194a387c239a532a2 Parents: a2c91d7 63a1e98 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Aug 1 15:46:59 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Aug 1 15:46:59 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 10 +- 2 files changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a09e53cd/CHANGES.txt -- diff --cc CHANGES.txt index a8299c6,68d40b0..6ab8a73 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,53 -1,11 +1,54 @@@ -2.0.10 - * Fix truncate to always flush (CASSANDRA-7511) +2.1.0-final + * Don't use strict consistency when replacing (CASSANDRA-7568) + * Fix min/max cell name collection on 2.0 SSTables with range + tombstones (CASSANDRA-7593) + * Tolerate min/max cell names of different lengths (CASSANDRA-7651) + * Filter cached results correctly (CASSANDRA-7636) + * Fix tracing on the new SEPExecutor (CASSANDRA-7644) * Remove shuffle and taketoken (CASSANDRA-7601) - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467) - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) - * Always merge ranges owned by a single node (CASSANDRA-6930) - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Clean up Windows batch scripts (CASSANDRA-7619) + * Fix native protocol drop user type notification (CASSANDRA-7571) + * Give read access to system.schema_usertypes to all authenticated users + (CASSANDRA-7578) + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580) + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572) + * Fix NPE when dropping index from non-existent keyspace, AssertionError when + dropping non-existent index with IF EXISTS (CASSANDRA-7590) + * Fix sstablelevelresetter hang (CASSANDRA-7614) + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603) + * Use keyspace updated schema change message for UDT changes in v1 and + v2 protocols (CASSANDRA-7617) + * Fix tracing of range slices and secondary index lookups that are local + to the coordinator (CASSANDRA-7599) + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587) + * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596) + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625) + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626) + * Fix tracing of concurrent range slices and 2ary index queries (CASSANDRA-7626) +Merged from 2.0: ++ * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668) + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663) + * Always flush on truncate (CASSANDRA-7511) * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * Always merge ranges owned by a single node (CASSANDRA-6930) + * Track max/min timestamps for range tombstones (CASSANDRA-7647) + * Fix NPE when listing saved caches dir (CASSANDRA-7632) + + +2.1.0-rc4 + * Fix word count hadoop example (CASSANDRA-7200) + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults + (CASSANDRA-7551) + * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505) + * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521) + * Add missing table name to DROP INDEX responses and notifications (CASSANDRA-7539) + * Bump CQL version to 3.2.0 and update CQL documentation (CASSANDRA-7527) + * Fix configuration error message when running nodetool ring (CASSANDRA-7508) + * Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509) + * Handle queries on multiple secondary index types (CASSANDRA-7525) + * Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) +Merged from 2.0: * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541) * Fix range merging when DES scores are zero (CASSANDRA-7535) * Warn when SSL certificates have expired (CASSANDRA-7528) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a09e53cd/src/java/org/apache/cassandra/config/CFMetaData.java -- diff --cc
