[3/5] 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/5d5401d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d5401d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d5401d6 Branch: refs/heads/trunk Commit: 5d5401d67d8e3fc42eb5a2b6d404fb193863c36d Parents: c1dc378 e6f307f Author: Jason Brown jasobr...@apple.com Authored: Fri Sep 5 16:47:06 2014 -0700 Committer: Jason Brown jasobr...@apple.com Committed: Fri Sep 5 16:47:06 2014 -0700 -- --
[3/5] 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/trunk 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/5] 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/b8be49b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8be49b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8be49b5 Branch: refs/heads/cassandra-2.1 Commit: b8be49b5e943b7f76cefc133f8945446c2433a59 Parents: 35e4e77 e48e6f3 Author: Tyler Hobbs ty...@datastax.com Authored: Thu Aug 28 10:40:18 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Thu Aug 28 10:40:18 2014 -0500 -- --
[3/5] 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/trunk 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/5] 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/trunk
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/5] 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/trunk 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/5] 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/trunk 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/5] 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/trunk 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/5] 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/cb772e54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb772e54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb772e54 Branch: refs/heads/trunk Commit: cb772e54461e79146e79d677b8721941a936f954 Parents: d087317 b87741c Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Aug 17 20:49:00 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Aug 17 20:49:00 2014 +0300 -- --
[3/5] 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/index/AbstractSimplePerColumnSecondaryIndex.java
src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8eff03d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8eff03d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8eff03d
Branch: refs/heads/trunk
Commit: d8eff03df0bbfa9066855bc49e18d76f609508a0
Parents: 33de6dc 3970c65
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Aug 7 18:32:36 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Aug 7 18:32:36 2014 +0200
--
CHANGES.txt | 1 +
.../db/index/AbstractSimplePerColumnSecondaryIndex.java | 6 ++
.../org/apache/cassandra/db/index/SecondaryIndex.java | 10 ++
.../apache/cassandra/db/index/SecondaryIndexManager.java | 4 ++--
4 files changed, 19 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8eff03d/CHANGES.txt
--
diff --cc CHANGES.txt
index dfeca21,df40933..26b39e0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
-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:
+ * Fix potential AssertionError with 2ndary indexes (CASSANDRA-6612)
* Avoid logging CompactionInterrupted at ERROR (CASSANDRA-7694)
* Minor leak in sstable2jon (CASSANDRA-7709)
* Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8eff03d/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
--
diff --cc
src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
index a2011b6,87e87cb..d8c03fb
---
a/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
+++
b/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
@@@ -60,20 -55,15 +60,26 @@@ public abstract class AbstractSimplePer
indexedCfMetadata);
}
+protected AbstractType? getIndexKeyComparator()
+{
+return columnDef.type;
+}
+
+@Override
+public DecoratedKey getIndexKeyFor(ByteBuffer value)
+{
+return new BufferDecoratedKey(new LocalToken(getIndexKeyComparator(),
value), value);
+}
+
+ @Override
+ String indexTypeForGrouping()
+ {
+ return _internal_;
+ }
+
-protected abstract ByteBuffer makeIndexColumnName(ByteBuffer rowKey,
Column column);
+protected abstract CellName makeIndexColumnName(ByteBuffer rowKey, Cell
cell);
-protected abstract ByteBuffer getIndexedValue(ByteBuffer rowKey, Column
column);
+protected abstract ByteBuffer getIndexedValue(ByteBuffer rowKey, Cell
cell);
protected abstract AbstractType getExpressionComparator();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8eff03d/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8eff03d/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index edb9126,a15464a..339af8f
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -547,10 -518,10 +547,10 @@@ public class SecondaryIndexManage
if (columns == null)
{
columns = new HashSet();
- groupByIndexType.put(index.getClass().getCanonicalName(),
columns);
+ groupByIndexType.put(index.indexTypeForGrouping(), columns);
}
-columns.add(ix.column_name);
+columns.add(ix.column);
}
ListSecondaryIndexSearcher indexSearchers = new
ArrayList(groupByIndexType.size());
[3/5] 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/trunk 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 to 3.2.0
[3/5] 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/trunk 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
