[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/968ffd8d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/968ffd8d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/968ffd8d Branch: refs/heads/cassandra-2.1 Commit: 968ffd8dd33a315e687208a6ab8e0d8b83e68603 Parents: e48e6f3 8bef260 Author: Marcus Eriksson marc...@apache.org Authored: Mon Sep 1 15:37:23 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Sep 1 15:37:23 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/968ffd8d/CHANGES.txt -- diff --cc CHANGES.txt index 5b52471,6c601e5..6d77f3c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,82 -1,5 +1,83 @@@ -1.2.19 +2.0.11: + * Better error message when condition is set on PK column (CASSANDRA-7804) + * Forbid re-adding dropped counter columns (CASSANDRA-7831) + * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832) + * Always reject inequality on the partition key without token() + (CASSANDRA-7722) + * Always send Paxos commit to all replicas (CASSANDRA-7479) + + +2.0.10 + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * 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) + * (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) + * 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) + * 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) + * 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) + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * Update java driver (for hadoop) (CASSANDRA-7618) + * Fix truncate to always flush (CASSANDRA-7511) + * 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) + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541) + * Fix range merging when DES scores are zero (CASSANDRA-7535) + * Warn when SSL
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnIndex.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29befa18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29befa18 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29befa18 Branch: refs/heads/cassandra-2.1 Commit: 29befa180be1b20ff404c29108f9bf3385f51855 Parents: 9219361 7f9e9a8 Author: Marcus Eriksson marc...@apache.org Authored: Wed Aug 27 13:00:55 2014 +0200 Committer: Marcus Eriksson marc...@apache.org Committed: Wed Aug 27 13:00:55 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnIndex.java| 2 +- .../org/apache/cassandra/db/RangeTombstone.java | 8 +- .../db/compaction/LazilyCompactedRow.java | 3 ++- .../apache/cassandra/db/RangeTombstoneTest.java | 27 5 files changed, 38 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29befa18/CHANGES.txt -- diff --cc CHANGES.txt index 9c6bd61,d27be1f..abdd561 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,80 -1,5 +1,81 @@@ -1.2.19 +2.0.11: + * Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832) + * Always reject inequality on the partition key without token() + (CASSANDRA-7722) + * Always send Paxos commit to all replicas (CASSANDRA-7479) + + +2.0.10 + * Don't send schema change responses and events for no-op DDL + statements (CASSANDRA-7600) + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774) + * 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) + * (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) + * 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) + * 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) + * 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) + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * Update java driver (for hadoop) (CASSANDRA-7618) + * Fix truncate to always flush (CASSANDRA-7511) + * 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) + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * (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) + *
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/61543b4c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61543b4c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61543b4c
Branch: refs/heads/cassandra-2.1
Commit: 61543b4c0080e1c2048ff43ae33d4cfc240accbb
Parents: 2015072 1cf9863
Author: Marcus Eriksson marc...@apache.org
Authored: Tue Aug 26 15:28:28 2014 +0200
Committer: Marcus Eriksson marc...@apache.org
Committed: Tue Aug 26 15:30:34 2014 +0200
--
CHANGES.txt | 1 +
.../db/compaction/LazilyCompactedRow.java | 7 ++-
.../apache/cassandra/db/RangeTombstoneTest.java | 58
3 files changed, 63 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61543b4c/CHANGES.txt
--
diff --cc CHANGES.txt
index e716cb5,badb45e..7a59744
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -85,37 -11,15 +85,38 @@@ 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)
-1.2.18
- * Support Thrift tables clustering columns on CqlPagingInputFormat
(CASSANDRA-7445)
- * Fix compilation with java 6 broke by CASSANDRA-7147
-
-
-1.2.17
+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)
+ * 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 in HHOM (CASSANDRA-7288)
+ * Add authentication support to shuffle (CASSANDRA-6484)
+ * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
+ * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
+ * Fix infinite loop on exception while streaming (CASSANDRA-7330)
+ * Reference sstables before populating key cache (CASSANDRA-7234)
+ * Account for range tombstones in min/max column names (CASSANDRA-7235)
+ * Improve sub range repair validation (CASSANDRA-7317)
+ * Accept subtypes for function results, type casts (CASSANDRA-6766)
+ * Support DISTINCT for static columns and fix behaviour when DISTINC is
+ not use (CASSANDRA-7305).
+ * Refuse range queries with strict bounds on compact tables since they
+ are broken (CASSANDRA-7059)
+Merged from 1.2:
+ * Expose global ColumnFamily metrics (CASSANDRA-7273)
* cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
* Expose global ColumnFamily metrics (CASSANDRA-7273)
* Handle possible integer overflow in FastByteArrayOutputStream
(CASSANDRA-7373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61543b4c/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index 1da1757,4360b0b..e3f18bd
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@@ -192,14 -220,26 +192,14 @@@ public class LazilyCompactedRow extend
private class Reducer extends MergeIterator.ReducerOnDiskAtom,
OnDiskAtom
{
// all columns reduced together will have the same name, so there
will only be one column
-// in the container; we just want to leverage the conflict resolution
code from CF
-ColumnFamily container = emptyColumnFamily.cloneMeShallow();
+// in the container; we just want to leverage the conflict resolution
code from CF.
+// (Note that we add the row tombstone in getReduced.)
-
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/Constants.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecf1baeb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecf1baeb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecf1baeb Branch: refs/heads/cassandra-2.1 Commit: ecf1baebbe783854c6f153449cf71038d2f032fb Parents: 31d5193 62642fa Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Aug 20 02:31:45 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Aug 20 02:31:45 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Constants.java| 4 ++-- src/java/org/apache/cassandra/cql3/UpdateParameters.java | 6 ++ 3 files changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecf1baeb/CHANGES.txt -- diff --cc CHANGES.txt index 1de5b33,7fb6de9..304d9bf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,62 -1,5 +1,63 @@@ -1.2.19 +2.0.10 + * 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) + * (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) + * 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) + * 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) + * 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) + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * Update java driver (for hadoop) (CASSANDRA-7618) + * Fix truncate to always flush (CASSANDRA-7511) + * 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) + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * (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) + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM + operations to incorrect become full QUORUM (CASSANDRA-7345) + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) + * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns + (CASSANDRA-7455) + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596) + * Add option to disable STCS in L0 (CASSANDRA-6621) + * Fix error when doing reversed queries with static columns (CASSANDRA-7490) + * Backport CASSNADRA-3569/CASSANDRA-6747 (CASSANDRA-7560) + * Track max/min timestamps for range tombstones (CASSANDRA-7647) + * Fix
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47d27d53 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47d27d53 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47d27d53 Branch: refs/heads/cassandra-2.1.0 Commit: 47d27d5319c9a8edcd69fffb34d56b382e0f9c46 Parents: b3bb7fc b55f38b Author: Aleksey Yeschenko alek...@apache.org Authored: Sun Aug 10 23:55:33 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Sun Aug 10 23:55:33 2014 +0300 -- test/system/test_thrift_server.py | 40 +- 1 file changed, 20 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/47d27d53/test/system/test_thrift_server.py --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/f498a94c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f498a94c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f498a94c Branch: refs/heads/cassandra-2.1 Commit: f498a94cec0acb1d254bc266f408f1642d206207 Parents: f92291c 266f6b7 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Aug 6 12:12:21 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Aug 6 12:12:21 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/service/EmbeddedCassandraService.java | 5 + 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f498a94c/CHANGES.txt -- diff --cc CHANGES.txt index 20330f8,2c95a52..30efd94 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,5 +1,32 @@@ -1.2.19 +2.0.10 + * Update java driver (for hadoop) (CASSANDRA-7618) + * Fix truncate to always flush (CASSANDRA-7511) + * 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) + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * (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) + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM + operations to incorrect become full QUORUM (CASSANDRA-7345) + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) + * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns + (CASSANDRA-7455) + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596) + * Add option to disable STCS in L0 (CASSANDRA-6621) + * Fix error when doing reversed queries with static columns (CASSANDRA-7490) + * Backport CASSANDRA-6747 (CASSANDRA-7560) + * Track max/min timestamps for range tombstones (CASSANDRA-7647) + * Fix NPE when listing saved caches dir (CASSANDRA-7632) +Merged from 1.2: + * Add stop method to EmbeddedCassandraService (CASSANDRA-7595) * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669) * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668) * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63a1e987 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63a1e987 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63a1e987 Branch: refs/heads/cassandra-2.1 Commit: 63a1e987f75ce9ef2c5d0ca2f35965c43ee086f7 Parents: 5c0ddfb 0dd39c6 Author: Tyler Hobbs ty...@datastax.com Authored: Fri Aug 1 15:44:33 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Fri Aug 1 15:44:33 2014 -0500 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 8 2 files changed, 5 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63a1e987/CHANGES.txt -- diff --cc CHANGES.txt index a5b49c5,b60d1d9..68d40b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,5 +1,31 @@@ -1.2.19 +2.0.10 + * Fix truncate to always flush (CASSANDRA-7511) + * 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) + * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) + * (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) + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) + * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) + * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM + operations to incorrect become full QUORUM (CASSANDRA-7345) + * Properly handle unrecognized opcodes and flags (CASSANDRA-7440) + * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459) + * Make sure high level sstables get compacted (CASSANDRA-7414) + * Fix AssertionError when using empty clustering columns and static columns + (CASSANDRA-7455) + * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596) + * Add option to disable STCS in L0 (CASSANDRA-6621) + * Fix error when doing reversed queries with static columns (CASSANDRA-7490) + * Backport CASSANDRA-6747 (CASSANDRA-7560) + * Track max/min timestamps for range tombstones (CASSANDRA-7647) + * Fix NPE when listing saved caches dir (CASSANDRA-7632) +Merged from 1.2: + * Set gc_grace_seconds to seven days for system schema tables (CASSANDRA-7668) * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663) * Set correct stream ID on responses when non-Exception Throwables are thrown while handling native protocol messages (CASSANDRA-7470) http://git-wip-us.apache.org/repos/asf/cassandra/blob/63a1e987/src/java/org/apache/cassandra/config/CFMetaData.java -- diff --cc src/java/org/apache/cassandra/config/CFMetaData.java index 04b99e4,31e17ed..650d6c4 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@@ -89,81 -79,79 +89,81 @@@ public final class CFMetaDat public final static boolean DEFAULT_POPULATE_IO_CACHE_ON_FLUSH = false; // Note that this is the default only for user created tables -public final static String DEFAULT_COMPRESSOR = SnappyCompressor.isAvailable() ? SnappyCompressor.class.getCanonicalName() : null; - -@Deprecated -public static final CFMetaData OldStatusCf = newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_STATUS_CF, 0, unused, BytesType.instance, null); -@Deprecated -public static final CFMetaData OldHintsCf = newSystemMetadata(Table.SYSTEM_KS, SystemTable.OLD_HINTS_CF, 1, unused, BytesType.instance, BytesType.instance); -@Deprecated -public static final CFMetaData OldMigrationsCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_MIGRATIONS_CF, 2, unused, TimeUUIDType.instance, null); -@Deprecated -public static final CFMetaData OldSchemaCf = newSystemMetadata(Table.SYSTEM_KS, DefsTable.OLD_SCHEMA_CF, 3, unused, UTF8Type.instance, null); - -public static final CFMetaData IndexCf = compile(5, CREATE TABLE \ + SystemTable.INDEX_CF + \ ( -+ table_name text, -+ index_name text, -
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
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/7801aab8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7801aab8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7801aab8
Branch: refs/heads/trunk
Commit: 7801aab8c0945005735d81f64e248c85d057a4ec
Parents: cee1f67 febf385
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jun 17 17:15:31 2014 -0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jun 17 17:15:31 2014 -0700
--
CHANGES.txt | 4 +-
.../db/index/SecondaryIndexManager.java | 25 -
.../cassandra/db/ColumnFamilyStoreTest.java | 55
3 files changed, 82 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7801aab8/CHANGES.txt
--
diff --cc CHANGES.txt
index e3bd64b,18929d5..6a50186
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,8 +1,25 @@@
-1.2.17
+2.0.9
+ * 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)
+ * 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 in HHOM (CASSANDRA-7288)
+ * Add authentication support to shuffle (CASSANDRA-6484)
+ * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325)
+ * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
+ * Fix infinite loop on exception while streaming (CASSANDRA-7330)
+ * Reference sstables before populating key cache (CASSANDRA-7234)
+Merged from 1.2:
+ * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)
* Track metrics at a keyspace level (CASSANDRA-6539)
- * Add replace_address_first_boot flag to only replace if not bootstrapped
(CASSANDRA-7356)
+ * Add replace_address_first_boot flag to only replace if not bootstrapped
+(CASSANDRA-7356)
* Enable keepalive for native protocol (CASSANDRA-7380)
* Check internal addresses for seeds (CASSANDRA-6523)
* Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7801aab8/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 9600099,7fefa13..2c0d611
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -623,17 -638,25 +623,24 @@@ public class SecondaryIndexManage
{
if (oldColumn.equals(column))
return;
-
-SecondaryIndex index = indexFor(column.name());
-if (index == null)
-return;
-
-if (index instanceof PerColumnSecondaryIndex)
+
+for (SecondaryIndex index : indexFor(column.name()))
{
-// insert the new value before removing the old one, so we
never have a period
-// where the row is invisible to both queries (the opposite
seems preferable); see CASSANDRA-5540
-if (!column.isMarkedForDelete())
-((PerColumnSecondaryIndex) index).insert(key.key, column);
-
-// Usually we want to delete the old value from the index,
except when
-// name/value/timestamp are all equal, but the columns
themselves
-// are not (as is the case when overwriting expiring columns
with
-// identical values and ttl) Then, we don't want to delete as
the
-// tombstone will hide the new value we just inserted; see
CASSANDRA-7268
-if (shouldCleanupOldValue(oldColumn, column))
-((PerColumnSecondaryIndex) index).delete(key.key,
oldColumn);
+if (index instanceof PerColumnSecondaryIndex)
+{
+// insert the new value before
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bb58d80d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb58d80d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb58d80d Branch: refs/heads/trunk Commit: bb58d80d1790facb554501bbee6a9d00fcae2381 Parents: aa9894d 19a2077 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Mon Jun 9 21:15:29 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Mon Jun 9 21:15:29 2014 -0400 -- .gitignore | 2 ++ 1 file changed, 2 insertions(+) --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e5f2bd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e5f2bd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e5f2bd6 Branch: refs/heads/trunk Commit: 3e5f2bd64eb094c9a69eb99c73318629e5102bb6 Parents: bb58d80 f40ddba Author: Dave Brosius dbros...@mebigfatguy.com Authored: Mon Jun 9 21:41:29 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Mon Jun 9 21:41:29 2014 -0400 -- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e5f2bd6/src/java/org/apache/cassandra/gms/Gossiper.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/1e77219f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e77219f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e77219f Branch: refs/heads/trunk Commit: 1e77219f78860e1b2d622faaf99d1989628e2672 Parents: 00b5c36 1e49aba Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Jun 6 00:56:50 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Jun 6 00:56:50 2014 +0300 -- CHANGES.txt | 1 + .../cassandra/db/HintedHandOffManager.java | 19 +-- 2 files changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e77219f/CHANGES.txt -- diff --cc CHANGES.txt index 0d716a6,a6ea188..38a3e4b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,63 -1,8 +1,64 @@@ -1.2.17 +2.0.9 + * 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) + * 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 in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325) + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) +Merged from 1.2: + * Fix rare potential NPE in HHOM page size calculation (CASSANDRA-7354) - * Fix handling of empty counter replication mutations (CASSANDRA-7144) + * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) - * Set keepalive on MessagingService connections (CASSANDRA-7170) + * Fix handling of empty counter replication mutations (CASSANDRA-7144) + + +2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Correctly delete scheduled range xfers (CASSANDRA-7143) + * Make batchlog replica selection rack-aware (CASSANDRA-6551) + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) + * Fix writetime/ttl functions for static columns (CASSANDRA-7081) + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/c54958a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c54958a9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c54958a9 Branch: refs/heads/trunk Commit: c54958a9d4be5fe17ad726850a59abf42ab2fbbc Parents: 1e77219 2b002b4 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Jun 6 01:10:55 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Jun 6 01:10:55 2014 +0300 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c54958a9/CHANGES.txt -- diff --cc CHANGES.txt index 38a3e4b,6bd3aba..016a612 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,64 -1,8 +1,64 @@@ -1.2.17 +2.0.9 + * 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) + * 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 in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325) + * Make StreamSession#closeSession() idempotent (CASSANDRA-7262) + * Fix infinite loop on exception while streaming (CASSANDRA-7330) +Merged from 1.2: - * Fix rare potential NPE in HHOM page size calculation (CASSANDRA-7354) + * Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354) - * Fix handling of empty counter replication mutations (CASSANDRA-7144) + * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) - * Set keepalive on MessagingService connections (CASSANDRA-7170) + * Fix handling of empty counter replication mutations (CASSANDRA-7144) + + +2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Correctly delete scheduled range xfers (CASSANDRA-7143) + * Make batchlog replica selection rack-aware (CASSANDRA-6551) + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) + * Fix writetime/ttl functions for static columns (CASSANDRA-7081) + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag deserialization (CASSANDRA-7244) + * Proper
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2563dbc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2563dbc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2563dbc Branch: refs/heads/trunk Commit: c2563dbc8b83437dc825ac6c0969ccb5b8e5d55e Parents: 7216639 2f497ed Author: Jason Brown jasobr...@apple.com Authored: Fri May 30 05:47:05 2014 -0700 Committer: Jason Brown jasobr...@apple.com Committed: Fri May 30 05:47:05 2014 -0700 -- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2563dbc/CHANGES.txt -- diff --cc CHANGES.txt index 28c2ad6,ef5f72a..75e6759 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -71,61 -25,11 +71,63 @@@ Merged from 1.2 * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191) * exit CQLSH with error status code if script fails (CASSANDRA-6344) * Fix bug with some IN queries missig results (CASSANDRA-7105) + * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) + * Hint streaming can cause decommission to fail (CASSANDRA-7219) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892) + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966) + * Fix bad skip of sstables on slice query with composite start/finish (CASSANDRA-6825) + * Fix unintended update with conditional statement (CASSANDRA-6893) + * Fix map element access in IF (CASSANDRA-6914) + * Avoid costly range calculations for range queries on system keyspaces + (CASSANDRA-6906) + * Fix SSTable not released if stream session fails (CASSANDRA-6818) + * Avoid build failure due to ANTLR timeout (CASSANDRA-6991) +Merged from 1.2: * Add
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/auth/CassandraAuthorizer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8480fa7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8480fa7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8480fa7b Branch: refs/heads/trunk Commit: 8480fa7be1bbf54c526d76aeee7ecb07c417db6d Parents: e2c74d5 d48a187 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri May 30 21:16:42 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri May 30 21:16:42 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/auth/Auth.java | 2 +- src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +- src/java/org/apache/cassandra/auth/PasswordAuthenticator.java | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8480fa7b/CHANGES.txt -- diff --cc CHANGES.txt index c3145eb,e45cc72..14b43e5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,57 -1,6 +1,58 @@@ -1.2.17 +2.0.9 + * 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) + * 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 in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) + * Cqlsh counts non-empty lines for Blank lines warning (CASSANDRA-7325) +Merged from 1.2: + * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) + * Use LOCAL_ONE for non-superuser auth queries (CASSANDRA-7328) - * Set keepalive on MessagingService connections (CASSANDRA-7170) + + +2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Correctly delete scheduled range xfers (CASSANDRA-7143) + * Make batchlog replica selection rack-aware (CASSANDRA-6551) + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) + * Fix writetime/ttl functions for static columns (CASSANDRA-7081) + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag deserialization (CASSANDRA-7244) + * Proper null handle for IF with map element access (CASSANDRA-7155) + * Improve compaction visibility (CASSANDRA-7242) + * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950) + * Invalid key cache entries on DROP (CASSANDRA-6525) +
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/975145c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/975145c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/975145c2 Branch: refs/heads/trunk Commit: 975145c2779a5d99c9f5f192f0693bfb40a9001c Parents: 50599d2 7bbeb5a Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu May 29 12:49:19 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu May 29 12:49:19 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/statements/SelectStatement.java| 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/975145c2/CHANGES.txt -- diff --cc CHANGES.txt index 523dda3,619c219..d83b5af --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -66,61 -24,10 +66,62 @@@ Merged from 1.2 * raise streaming phi convict threshold level (CASSANDRA-7063) * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191) * exit CQLSH with error status code if script fails (CASSANDRA-6344) + * Fix bug with some IN queries missig results (CASSANDRA-7105) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892) + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966) + * Fix bad skip of sstables on slice query with composite start/finish (CASSANDRA-6825) + * Fix unintended update with conditional statement (CASSANDRA-6893) + * Fix map element access in IF (CASSANDRA-6914) + * Avoid costly range calculations for range queries on system keyspaces + (CASSANDRA-6906) + * Fix SSTable not released if stream session fails (CASSANDRA-6818) + * Avoid build failure due to ANTLR timeout (CASSANDRA-6991) +Merged from 1.2: * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) * add extra SSL cipher suites (CASSANDRA-6613) * fix nodetool getsstables for
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/824ed37f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/824ed37f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/824ed37f Branch: refs/heads/trunk Commit: 824ed37fccc132482c2883f04e878c4571fb85fa Parents: 975145c ea26dbd Author: Aleksey Yeschenko alek...@apache.org Authored: Thu May 29 19:04:01 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Thu May 29 19:05:21 2014 +0300 -- CHANGES.txt| 2 ++ src/java/org/apache/cassandra/db/ConsistencyLevel.java | 4 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/824ed37f/CHANGES.txt -- diff --cc CHANGES.txt index d83b5af,ba3a675..0ed0bee --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,52 -1,5 +1,54 @@@ -1.2.17 - * Set keepalive on MessagingService connections (CASSANDRA-7170) +2.0.9 + * Add missing iso8601 patterns for date strings (6973) + * Support selecting multiple rows in a partition using IN (CASSANDRA-6875) + * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274) + * 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 in HHOM (CASSANDRA-7288) + * Add authentication support to shuffle (CASSANDRA-6484) ++Merged from 1.2: ++ * Fix availability validation for LOCAL_ONE CL (CASSANDRA-7319) + + +2.0.8 + * Always reallocate buffers in HSHA (CASSANDRA-6285) + * (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221) + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) + * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) + * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) + * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183) + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162) + * Fix disabling autocompaction (CASSANDRA-7187) + * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) + * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) + * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) + * Fix the InvertedIndex trigger example (CASSANDRA-7211) + * Correctly delete scheduled range xfers (CASSANDRA-7143) + * Make batchlog replica selection rack-aware (CASSANDRA-6551) + * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) + * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) + * Fix writetime/ttl functions for static columns (CASSANDRA-7081) + * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) + * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) + * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag deserialization (CASSANDRA-7244) + * Proper null handle for IF with map element access (CASSANDRA-7155) + * Improve compaction visibility (CASSANDRA-7242) + * Fix 2ndary index queries with DESC clustering order (CASSANDRA-6950) + * Invalid key cache entries on DROP (CASSANDRA-6525) + * Fix flapping RecoveryManagerTest (CASSANDRA-7084) +Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) * Add Google Compute Engine snitch (CASSANDRA-7132) http://git-wip-us.apache.org/repos/asf/cassandra/blob/824ed37f/src/java/org/apache/cassandra/db/ConsistencyLevel.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f4b5dd1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f4b5dd1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f4b5dd1
Branch: refs/heads/trunk
Commit: 4f4b5dd1ec32b986aaad9ffec5b7313624b418fa
Parents: b9802ff de1f7ee
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon May 19 21:19:41 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon May 19 21:19:41 2014 -0400
--
src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f4b5dd1/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index fbc1a72,9a6e67a..567bb19
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -629,63 -597,48 +629,64 @@@ public class StorageService extends Not
}
}
-private void joinTokenRing(int delay) throws ConfigurationException
+private boolean shouldBootstrap()
{
-joined = true;
+return DatabaseDescriptor.isAutoBootstrap()
!SystemKeyspace.bootstrapComplete()
!DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress());
+}
-CollectionToken tokens = null;
-MapApplicationState, VersionedValue appStates = new
HashMapApplicationState, VersionedValue();
-
-if (DatabaseDescriptor.getReplaceTokens().size() 0 ||
DatabaseDescriptor.getReplaceNode() != null)
-throw new RuntimeException(Replace method removed; use
cassandra.replace_address instead);
-if (DatabaseDescriptor.isReplacing())
-{
-if (!DatabaseDescriptor.isAutoBootstrap())
-throw new RuntimeException(Trying to replace_address with
auto_bootstrap disabled will not work, check your configuration);
-tokens = prepareReplacementInfo();
-appStates.put(ApplicationState.STATUS,
valueFactory.hibernate(true));
-appStates.put(ApplicationState.TOKENS,
valueFactory.tokens(tokens));
-}
-// have to start the gossip service before we can see any info on
other nodes. this is necessary
-// for bootstrap to get the load info it needs.
-// (we won't be part of the storage ring though until we add a
counterId to our state, below.)
-// Seed the host ID-to-endpoint map with our own ID.
-UUID localHostId = SystemTable.getLocalHostId();
-getTokenMetadata().updateHostId(localHostId,
FBUtilities.getBroadcastAddress());
-appStates.put(ApplicationState.NET_VERSION,
valueFactory.networkVersion());
-appStates.put(ApplicationState.HOST_ID,
valueFactory.hostId(localHostId));
-appStates.put(ApplicationState.RPC_ADDRESS,
valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));
-appStates.put(ApplicationState.RELEASE_VERSION,
valueFactory.releaseVersion());
-logger.info(Starting up server gossip);
-Gossiper.instance.register(this);
-Gossiper.instance.start(SystemTable.incrementAndGetGeneration(),
appStates); // needed for node-ring gathering.
-// gossip snitch infos (local DC and rack)
-gossipSnitchInfo();
-// gossip Schema.emptyVersion forcing immediate check for schema
updates (see MigrationManager#maybeScheduleSchemaPull)
-Schema.instance.updateVersionAndAnnounce(); // Ensure we know our own
actual Schema UUID in preparation for updates
+private void prepareToJoin() throws ConfigurationException
+{
+if (!joined)
+{
+MapApplicationState, VersionedValue appStates = new
HashMapApplicationState, VersionedValue();
+if (DatabaseDescriptor.isReplacing()
!(Boolean.parseBoolean(System.getProperty(cassandra.join_ring, true
+throw new ConfigurationException(Cannot set both
join_ring=false and attempt to replace a node);
+if (DatabaseDescriptor.getReplaceTokens().size() 0 ||
DatabaseDescriptor.getReplaceNode() != null)
+throw new RuntimeException(Replace method removed; use
cassandra.replace_address instead);
+if (DatabaseDescriptor.isReplacing())
+{
+if (!DatabaseDescriptor.isAutoBootstrap())
+throw new RuntimeException(Trying to replace_address
with auto_bootstrap disabled will not work, check your configuration);
+bootstrapTokens =
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/streaming/AbstractStreamSession.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea7d0c82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea7d0c82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea7d0c82 Branch: refs/heads/trunk Commit: ea7d0c827aeeca8e9f6a318290bd501ed23ada48 Parents: 05bacae 21b3a67 Author: Jake Luciani j...@apache.org Authored: Wed May 7 15:10:14 2014 -0400 Committer: Jake Luciani j...@apache.org Committed: Wed May 7 15:10:14 2014 -0400 -- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea7d0c82/CHANGES.txt -- diff --cc CHANGES.txt index 65ee6cf,8533e64..20fd115 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -30,66 -15,15 +30,66 @@@ Merged from 1.2 * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058) - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * Always clean up references in SerializingCache (CASSANDRA-6994) + * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751) * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831) - * fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149) * remove duplicate query for local tokens (CASSANDRA-7182) - + * raise streaming phi convict threshold level (CASSANDRA-7063) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892) + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966) + * Fix bad skip of sstables on slice query with composite start/finish (CASSANDRA-6825) + * Fix unintended update with conditional statement
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb0a78a2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb0a78a2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb0a78a2 Branch: refs/heads/trunk Commit: fb0a78a23ac09019944f267049501c697bfa1539 Parents: c4fcb16 d839350 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Wed May 7 21:19:00 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Wed May 7 21:19:00 2014 -0400 -- CHANGES.txt| 1 + .../cassandra/service/PendingRangeCalculatorService.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb0a78a2/CHANGES.txt -- diff --cc CHANGES.txt index 8df7d95,312cf06..6c8f1fb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -31,66 -15,16 +31,67 @@@ Merged from 1.2 * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058) - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * Always clean up references in SerializingCache (CASSANDRA-6994) + * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751) * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831) - * fix time conversion to milliseconds in SimpleCondition.await (CASSANDRA-7149) * remove duplicate query for local tokens (CASSANDRA-7182) * raise streaming phi convict threshold level (CASSANDRA-7063) + * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892) + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966) + * Fix bad skip
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e955d48
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e955d48
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e955d48
Branch: refs/heads/trunk
Commit: 2e955d4818708ff865898bd0f57a29cb4e93f0a8
Parents: 4233ee4 c454807
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun May 4 00:20:21 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun May 4 00:20:21 2014 -0400
--
.../cassandra/locator/CloudstackSnitch.java | 78 +---
1 file changed, 51 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e955d48/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
--
diff --cc src/java/org/apache/cassandra/locator/CloudstackSnitch.java
index 43ae996,57c973b..0200f0f
--- a/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
+++ b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
@@@ -83,9 -85,10 +85,10 @@@ public class CloudstackSnitch extends A
if (endpoint.equals(FBUtilities.getBroadcastAddress()))
return csZoneRack;
EndpointState state =
Gossiper.instance.getEndpointStateForEndpoint(endpoint);
- if (state == null || state.getApplicationState(ApplicationState.RACK)
== null) {
+ if (state == null || state.getApplicationState(ApplicationState.RACK)
== null)
+ {
if (savedEndpoints == null)
-savedEndpoints = SystemTable.loadDcRackInfo();
+savedEndpoints = SystemKeyspace.loadDcRackInfo();
if (savedEndpoints.containsKey(endpoint))
return savedEndpoints.get(endpoint).get(rack);
return DEFAULT_RACK;
@@@ -98,9 -101,10 +101,10 @@@
if (endpoint.equals(FBUtilities.getBroadcastAddress()))
return csZoneDc;
EndpointState state =
Gossiper.instance.getEndpointStateForEndpoint(endpoint);
- if (state == null || state.getApplicationState(ApplicationState.DC)
== null) {
+ if (state == null || state.getApplicationState(ApplicationState.DC)
== null)
+ {
if (savedEndpoints == null)
-savedEndpoints = SystemTable.loadDcRackInfo();
+savedEndpoints = SystemKeyspace.loadDcRackInfo();
if (savedEndpoints.containsKey(endpoint))
return savedEndpoints.get(endpoint).get(data_center);
return DEFAULT_DC;
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57fc8fd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57fc8fd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57fc8fd6 Branch: refs/heads/trunk Commit: 57fc8fd6d2ece80f5221a5f08241bf6487a8356e Parents: 4ca1a4d ad40451 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu May 1 18:53:08 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu May 1 18:53:08 2014 -0500 -- --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/thrift/CassandraServer.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4337228 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4337228 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4337228 Branch: refs/heads/trunk Commit: b4337228df7178183a643a8f201e9389cab36ab3 Parents: 90d086a 1052749 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Apr 30 11:24:21 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Apr 30 11:24:21 2014 +0200 -- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 47 +--- .../cassandra/thrift/CassandraServer.java | 3 +- .../unit/org/apache/cassandra/SchemaLoader.java | 16 ++- .../apache/cassandra/config/CFMetaDataTest.java | 32 - 5 files changed, 65 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4337228/CHANGES.txt -- diff --cc CHANGES.txt index 428f8fc,fa9a156..e25e71f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -23,64 -11,13 +23,65 @@@ Merged from 1.2 * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058) - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * Always clean up references in SerializingCache (CASSANDRA-6994) + * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751) + * Preserves CQL metadata when updating table from thrift (CASSANDRA-6831) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892) + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966) + * Fix bad skip of sstables on slice
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b322937 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b322937 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b322937 Branch: refs/heads/trunk Commit: 2b3229370bb5f7d0e5271fd5964fc6f374874756 Parents: 9002e76 7f01980 Author: Dave Brosius dbros...@mebigfatguy.com Authored: Mon Apr 28 19:56:56 2014 -0400 Committer: Dave Brosius dbros...@mebigfatguy.com Committed: Mon Apr 28 19:56:56 2014 -0400 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b322937/CHANGES.txt -- diff --cc CHANGES.txt index 376ad87,e8d6a8d..50d5896 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -21,63 -11,12 +21,64 @@@ Merged from 1.2 * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058) - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) * Always clean up references in SerializingCache (CASSANDRA-6994) + * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) + * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892) + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966) + * Fix bad skip of sstables on slice query with composite start/finish (CASSANDRA-6825) + * Fix unintended update with conditional statement (CASSANDRA-6893) + * Fix map element access in IF (CASSANDRA-6914) + * Avoid costly range calculations for range queries on system keyspaces + (CASSANDRA-6906) + * Fix SSTable not released if stream session fails (CASSANDRA-6818) + * Avoid
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/082bfc9e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/082bfc9e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/082bfc9e
Branch: refs/heads/trunk
Commit: 082bfc9ee6dc6db5314b0262430d3c8b8435a3a3
Parents: 86382f6 c0c2de5
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Apr 25 12:28:04 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Apr 25 12:28:04 2014 +0200
--
src/java/org/apache/cassandra/cql3/ColumnIdentifier.java | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/082bfc9e/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
--
diff --cc src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 330eec0,b4cb9e0..a8a25cf
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@@ -27,7 -26,9 +27,7 @@@ import org.apache.cassandra.utils.ByteB
/**
* Represents an identifer for a CQL column definition.
*/
- public class ColumnIdentifier implements Selectable,
ComparableColumnIdentifier
-public class ColumnIdentifier implements RawSelector
++public class ColumnIdentifier implements Selectable
{
public final ByteBuffer key;
private final String text;
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/e974b6f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e974b6f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e974b6f9 Branch: refs/heads/trunk Commit: e974b6f9359bf66225155b1547e99c5ca8492321 Parents: 98dcde1 63ba588 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Apr 25 16:51:35 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Apr 25 16:51:35 2014 -0500 -- CHANGES.txt | 8 src/java/org/apache/cassandra/tools/NodeCmd.java | 8 2 files changed, 12 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e974b6f9/CHANGES.txt -- diff --cc CHANGES.txt index 73c5034,aad3721..cd6443e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,12 +1,21 @@@ -1.2.17 +2.0.8 + * Set JMX RMI port to 7199 (CASSANDRA-7087) + * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) + * Log a warning for large batches (CASSANDRA-6487) + * Queries on compact tables can return more rows that requested (CASSANDRA-7052) + * USING TIMESTAMP for batches does not work (CASSANDRA-7053) + * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) + * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) +Merged from 1.2: + * Fix nodetool display with vnodes (CASSANDRA-7082) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix BatchlogManager#deleteBatch() use of millisecond timsestamps +(CASSANDRA-6822) + * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787) + * Schedule schema pulls on change (CASSANDRA-6971) + * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980) + * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) * Fix batchlog to account for CF truncation records (CASSANDRA-6999) * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e974b6f9/src/java/org/apache/cassandra/tools/NodeCmd.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/871a6030 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/871a6030 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/871a6030 Branch: refs/heads/trunk Commit: 871a6030bc6ed475e652e67a8631338010c607dc Parents: b9bb2c8 72203c5 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Apr 25 03:19:17 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Apr 25 03:19:17 2014 +0300 -- CHANGES.txt | 2 + .../cassandra/cache/RefCountedMemory.java | 7 ++- .../cassandra/cache/SerializingCache.java | 53 +++- 3 files changed, 49 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/871a6030/CHANGES.txt -- diff --cc CHANGES.txt index 0b6aeaa,b3470bf..73c5034 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -12,61 -10,11 +12,63 @@@ Merged from 1.2 * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) * Require nodetool rebuild_index to specify index names (CASSANDRA-7038) * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058) - * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) + * Always clean up references in SerializingCache (CASSANDRA-6994) ++ * Don't shut MessagingService down when replacing a node (CASSANDRA-6476) -1.2.16 +2.0.7 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961) + * Avoid early loading of non-system keyspaces before compaction-leftovers + cleanup at startup (CASSANDRA-6913) + * Restrict Windows to parallel repairs (CASSANDRA-6907) + * (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436) + * Fix NPE in MeteredFlusher (CASSANDRA-6820) + * Fix race processing range scan responses (CASSANDRA-6820) + * Allow deleting snapshots from dropped keyspaces (CASSANDRA-6821) + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) + * Fix paging with SELECT DISTINCT (CASSANDRA-6857) + * Fix UnsupportedOperationException on CAS timeout (CASSANDRA-6923) + * Improve MeteredFlusher handling of MF-unaffected column families + (CASSANDRA-6867) + * Add CqlRecordReader using native pagination (CASSANDRA-6311) + * Add QueryHandler interface (CASSANDRA-6659) + * Track liveRatio per-memtable, not per-CF (CASSANDRA-6945) + * Make sure upgradesstables keeps sstable level (CASSANDRA-6958) + * Fix LIMIT with static columns (CASSANDRA-6956) + * Fix clash with CQL column name in thrift validation (CASSANDRA-6892) + * Fix error with super columns in mixed 1.2-2.0 clusters (CASSANDRA-6966) + * Fix bad skip of sstables on slice query with composite start/finish (CASSANDRA-6825) + * Fix unintended update with conditional statement (CASSANDRA-6893) + * Fix map element access in IF (CASSANDRA-6914) + * Avoid costly range calculations for range queries on system keyspaces + (CASSANDRA-6906) + * Fix SSTable not released if stream session fails
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/4596a078 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4596a078 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4596a078 Branch: refs/heads/trunk Commit: 4596a0781ba3ed5f0ea755a8a11c041f6614b735 Parents: 167af2b d0b41d0 Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Apr 21 09:46:04 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Apr 21 09:46:04 2014 +0200 -- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4596a078/CHANGES.txt -- diff --cc CHANGES.txt index 0605f87,b4498fa..972f65a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -59,56 -13,10 +59,57 @@@ Merged from 1.2 * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) * add extra SSL cipher suites (CASSANDRA-6613) * fix nodetool getsstables for blob PK (CASSANDRA-6803) + * Fix BatchlogManager#deleteBatch() use of millisecond timestamps + (CASSANDRA-6822) + * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787) + * Schedule schema pulls on change (CASSANDRA-6971) + * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980) + * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) ++ * Properly load trustore in the native protocol (CASSANDRA-6847) + + +2.0.6 + * Avoid race-prone second scrub of system keyspace (CASSANDRA-6797) + * Pool CqlRecordWriter clients by inetaddress rather than Range + (CASSANDRA-6665) + * Fix compaction_history timestamps (CASSANDRA-6784) + * Compare scores of full replica ordering in DES (CASSANDRA-6683) + * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577) + * Allow repairing between specific replicas (CASSANDRA-6440) + * Allow per-dc enabling of hints (CASSANDRA-6157) + * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201) + * Fix EstimatedHistogram races (CASSANDRA-6682) + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) + * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445) + * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) + * Improve nodetool cfhistograms formatting (CASSANDRA-6360) + * Expose bulk loading progress over JMX (CASSANDRA-4757) + * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) + * Account for range/row tombstones in tombstone drop + time histogram (CASSANDRA-6522) + * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652) + * Make commitlog failure handling configurable (CASSANDRA-6364) + * Avoid overlaps in LCS (CASSANDRA-6688) + * Improve support for paginating over composites (CASSANDRA-4851) + * Fix count(*) queries in a mixed cluster (CASSANDRA-6707) + * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566) + * Fix replaying pre-2.0 commit logs (CASSANDRA-6714) + * Add static columns to CQL3 (CASSANDRA-6561) + * Optimize single partition batch statements (CASSANDRA-6737) + * Disallow post-query re-ordering when paging (CASSANDRA-6722) + * Fix potential paging bug with deleted columns (CASSANDRA-6748) + * Fix NPE on BulkLoader caused by losing StreamEvent (CASSANDRA-6636) + * Fix truncating compression metadata (CASSANDRA-6791) + * Fix UPDATE updating PRIMARY KEY columns implicitly (CASSANDRA-6782) + * Fix IllegalArgumentException when updating from 1.2 with SuperColumns + (CASSANDRA-6733) + * FBUtilities.singleton() should use the CF comparator (CASSANDRA-6778) + * Fix CQLSStableWriter.addRow(MapString, Object) (CASSANDRA-6526) + * Fix HSHA server introducing corrupt data (CASSANDRA-6285) + * Fix CAS conditions for COMPACT STORAGE tables (CASSANDRA-6813) +Merged from 1.2: * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541) * Catch memtable flush exceptions during shutdown (CASSANDRA-6735) - * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1 - (CASSANDRA-6732) * Fix broken streams when replacing with same IP (CASSANDRA-6622) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8845c510 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8845c510 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8845c510 Branch: refs/heads/trunk Commit: 8845c5108f12677134f784467c72f8c6050dbc15 Parents: 47ace44 fe94e90 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Apr 11 20:58:21 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Apr 11 20:58:21 2014 +0300 -- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8845c510/CHANGES.txt -- diff --cc CHANGES.txt index e71f1af,07c09cf..9edd705 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -58,50 -4,17 +58,51 @@@ Merged from 1.2 * Continue assassinating even if the endpoint vanishes (CASSANDRA-6787) * Schedule schema pulls on change (CASSANDRA-6971) * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980) + * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025) -1.2.16 - * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) - * add extra SSL cipher suites (CASSANDRA-6613) - * fix nodetool getsstables for blob PK (CASSANDRA-6803) +2.0.6 + * Avoid race-prone second scrub of system keyspace (CASSANDRA-6797) + * Pool CqlRecordWriter clients by inetaddress rather than Range + (CASSANDRA-6665) + * Fix compaction_history timestamps (CASSANDRA-6784) + * Compare scores of full replica ordering in DES (CASSANDRA-6883) + * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577) + * Allow repairing between specific replicas (CASSANDRA-6440) + * Allow per-dc enabling of hints (CASSANDRA-6157) + * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201) + * Fix EstimatedHistogram races (CASSANDRA-6682) + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) + * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445) + * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) + * Improve nodetool cfhistograms formatting (CASSANDRA-6360) + * Expose bulk loading progress over JMX (CASSANDRA-4757) + * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) + * Account for range/row tombstones in tombstone drop + time histogram (CASSANDRA-6522) + * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652) + * Make commitlog failure handling configurable (CASSANDRA-6364) + * Avoid overlaps in LCS (CASSANDRA-6688) + * Improve support for paginating over composites (CASSANDRA-4851) + * Fix count(*) queries in a mixed cluster (CASSANDRA-6707) + * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566) + * Fix replaying pre-2.0 commit logs (CASSANDRA-6714) + * Add static columns to CQL3 (CASSANDRA-6561) + * Optimize single partition batch statements (CASSANDRA-6737) + * Disallow post-query re-ordering when paging (CASSANDRA-6722) + * Fix potential paging bug with deleted columns (CASSANDRA-6748) + * Fix NPE on BulkLoader caused by losing StreamEvent (CASSANDRA-6636) + * Fix truncating compression metadata (CASSANDRA-6791) + * Fix UPDATE updating PRIMARY KEY columns implicitly (CASSANDRA-6782) + * Fix IllegalArgumentException when updating from 1.2 with SuperColumns + (CASSANDRA-6733) + * FBUtilities.singleton() should use the CF comparator (CASSANDRA-6778) + * Fix CQLSStableWriter.addRow(MapString, Object) (CASSANDRA-6526) + * Fix HSHA server introducing corrupt data (CASSANDRA-6285) + * Fix CAS conditions for COMPACT STORAGE tables (CASSANDRA-6813) +Merged from 1.2: * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541) * Catch memtable flush exceptions during shutdown (CASSANDRA-6735) - * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1 - (CASSANDRA-6732) * Fix broken streams when replacing with same IP (CASSANDRA-6622) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8845c510/src/java/org/apache/cassandra/db/BatchlogManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8845c510/src/java/org/apache/cassandra/service/StorageService.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fbdb480 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fbdb480 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fbdb480 Branch: refs/heads/cassandra-2.1 Commit: 1fbdb4805bd18f60a9a0df05b5c81051ed840064 Parents: 535c56f 26b8f4a Author: Vijay vijay2...@gmail.com Authored: Sat Mar 22 13:51:58 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sat Mar 22 13:51:58 2014 -0700 -- src/java/org/apache/cassandra/tools/NodeCmd.java | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fbdb480/src/java/org/apache/cassandra/tools/NodeCmd.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7231ff8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7231ff8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7231ff8
Branch: refs/heads/cassandra-2.1
Commit: b7231ff8a66160e223f259488609023805582c2e
Parents: 1fbdb48 b7bb2fb
Author: Vijay vijay2...@gmail.com
Authored: Sat Mar 22 19:02:05 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Sat Mar 22 19:02:05 2014 -0700
--
.../org/apache/cassandra/tools/NodeCmd.java | 35 ++--
1 file changed, 18 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7231ff8/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 3404082,6c02877..8c6b4c9
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -314,10 -304,15 +314,10 @@@ public class NodeCm
for (HostStat stat : hoststats)
{
- tokens.addAll(endpointsToTokens.get(stat.ip));
+
tokens.addAll(endpointsToTokens.get(stat.endpoint.getHostAddress()));
lastToken = tokens.get(tokens.size() - 1);
-if (stat.owns != null)
-totalReplicas += stat.owns;
}
-if (keyspaceSelected)
-outs.print(Replicas: + (int) totalReplicas + \n\n);
-
outs.printf(format, Address, Rack, Status, State, Load,
Owns, Token);
if (hoststats.size() 1)
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.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/c80f61b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c80f61b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c80f61b6 Branch: refs/heads/trunk Commit: c80f61b682e4528b5d6f58b2ec0260138799da53 Parents: 32c15c2 7e87001 Author: Tyler Hobbs ty...@datastax.com Authored: Wed Mar 19 11:40:40 2014 -0500 Committer: Tyler Hobbs ty...@datastax.com Committed: Wed Mar 19 11:40:40 2014 -0500 -- CHANGES.txt | 1 + doc/cql3/CQL.textile | 19 +++ 2 files changed, 16 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c80f61b6/CHANGES.txt -- diff --cc CHANGES.txt index 41ec1d7,960b0e9..f3f16e8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,76 -1,11 +1,77 @@@ -1.2.16 +2.0.7 + * Add uuid() function (CASSANDRA-6473) + * Omit tombstones from schema digests (CASSANDRA-6862) + * Include correct consistencyLevel in LWT timeout (CASSANDRA-6884) + * Lower chances for losing new SSTables during nodetool refresh and + ColumnFamilyStore.loadNewSSTables (CASSANDRA-6514) + * Add support for DELETE ... IF EXISTS to CQL3 (CASSANDRA-5708) + * Update hadoop_cql3_word_count example (CASSANDRA-6793) + * Fix handling of RejectedExecution in sync Thrift server (CASSANDRA-6788) + * Log more information when exceeding tombstone_warn_threshold (CASSANDRA-6865) + * Fix truncate to not abort due to unreachable fat clients (CASSANDRA-6864) + * Fix schema concurrency exceptions (CASSANDRA-6841) + * Fix leaking validator FH in StreamWriter (CASSANDRA-6832) + * Fix saving triggers to schema (CASSANDRA-6789) + * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) + * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) + * Fix static counter columns (CASSANDRA-6827) + * Restore expiring-deleted (cell) compaction optimization (CASSANDRA-6844) + * Fix CompactionManager.needsCleanup (CASSANDRA-6845) + * Correctly compare BooleanType values other than 0 and 1 (CASSANDRA-6779) + * Read message id as string from earlier versions (CASSANDRA-6840) + * Properly use the Paxos consistency for (non-protocol) batch (CASSANDRA-6837) + * Add paranoid disk failure option (CASSANDRA-6646) + * Improve PerRowSecondaryIndex performance (CASSANDRA-6876) + * Extend triggers to support CAS updates (CASSANDRA-6882) + * Static columns with IF NOT EXISTS don't always work as expected (CASSANDRA-6873) +Merged from 1.2: + * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816) * add extra SSL cipher suites (CASSANDRA-6613) * fix nodetool getsstables for blob PK (CASSANDRA-6803) + + +2.0.6 + * Avoid race-prone second scrub of system keyspace (CASSANDRA-6797) + * Pool CqlRecordWriter clients by inetaddress rather than Range + (CASSANDRA-6665) + * Fix compaction_history timestamps (CASSANDRA-6784) + * Compare scores of full replica ordering in DES (CASSANDRA-6883) + * fix CME in SessionInfo updateProgress affecting netstats (CASSANDRA-6577) + * Allow repairing between specific replicas (CASSANDRA-6440) + * Allow per-dc enabling of hints (CASSANDRA-6157) + * Add compatibility for Hadoop 0.2.x (CASSANDRA-5201) + * Fix EstimatedHistogram races (CASSANDRA-6682) + * Failure detector correctly converts initial value to nanos (CASSANDRA-6658) + * Add nodetool taketoken to relocate vnodes (CASSANDRA-4445) + * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) + * Improve nodetool cfhistograms formatting (CASSANDRA-6360) + * Expose bulk loading progress over JMX (CASSANDRA-4757) + * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) + * Account for range/row tombstones in tombstone drop + time histogram (CASSANDRA-6522) + * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652) + * Make commitlog failure handling configurable (CASSANDRA-6364) + * Avoid overlaps in LCS (CASSANDRA-6688) + * Improve support for paginating over composites (CASSANDRA-4851) + * Fix count(*) queries in a mixed cluster (CASSANDRA-6707) + * Improve repair tasks(snapshot, differencing) concurrency (CASSANDRA-6566) + * Fix replaying pre-2.0 commit logs (CASSANDRA-6714) + * Add static columns to CQL3 (CASSANDRA-6561) + * Optimize single partition batch statements (CASSANDRA-6737) + * Disallow post-query re-ordering when paging (CASSANDRA-6722) + * Fix potential paging bug with deleted columns (CASSANDRA-6748) + * Fix NPE on BulkLoader caused by losing StreamEvent (CASSANDRA-6636) + * Fix truncating compression metadata (CASSANDRA-6791) + * Fix
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/tools/NodeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc9cad90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc9cad90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc9cad90
Branch: refs/heads/cassandra-2.1
Commit: fc9cad90d532a3af89dbbf1b004bfd333a85b33e
Parents: f7eca98 91d220b
Author: Vijay vijay2...@gmail.com
Authored: Tue Mar 11 20:32:07 2014 -0700
Committer: Vijay vijay2...@gmail.com
Committed: Tue Mar 11 20:32:07 2014 -0700
--
.../org/apache/cassandra/tools/NodeCmd.java | 194 +--
1 file changed, 93 insertions(+), 101 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc9cad90/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 89cfb94,85afdc1..0e7ff2a
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -27,22 -27,25 +27,23 @@@ import java.text.SimpleDateFormat
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
+import javax.management.openmbean.TabularData;
import com.google.common.base.Joiner;
+ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Maps;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.commons.cli.*;
-import org.yaml.snakeyaml.Loader;
-import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
-
import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutorMBean;
import org.apache.cassandra.db.ColumnFamilyStoreMBean;
-import org.apache.cassandra.db.Table;
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.compaction.CompactionManagerMBean;
import org.apache.cassandra.db.compaction.OperationType;
-import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.locator.EndpointSnitchInfoMBean;
import org.apache.cassandra.net.MessagingServiceMBean;
@@@ -318,18 -299,23 +310,17 @@@ public class NodeCm
// get the total amount of replicas for this dc and the last token in
this dc's ring
ListString tokens = new ArrayListString();
-float totalReplicas = 0f;
String lastToken = ;
- for (Map.EntryInetAddress, Float entry :
filteredOwnerships.entrySet())
+ for (HostStat stat : hoststats)
{
-
tokens.addAll(endpointsToTokens.get(entry.getKey().getHostAddress()));
+ tokens.addAll(endpointsToTokens.get(stat.ip));
lastToken = tokens.get(tokens.size() - 1);
-if (stat.owns != null)
-totalReplicas += stat.owns;
}
-
-if (keyspaceSelected)
-outs.print(Replicas: + (int) totalReplicas + \n\n);
-
outs.printf(format, Address, Rack, Status, State, Load,
Owns, Token);
- if (filteredOwnerships.size() 1)
+ if (hoststats.size() 1)
outs.printf(format, , , , , , , lastToken);
else
outs.println();
@@@ -584,7 -508,70 +513,70 @@@
}
}
+ private MapString, SetHostStat getOwnershipByDc(boolean resolveIp,
MapString, String tokenToEndpoint,
+ MapInetAddress, Float
ownerships) throws UnknownHostException
+ {
+ MapString, SetHostStat ownershipByDc = Maps.newLinkedHashMap();
+ EndpointSnitchInfoMBean epSnitchInfo =
probe.getEndpointSnitchInfoProxy();
+
+ for (EntryString, String tokenAndEndPoint :
tokenToEndpoint.entrySet())
+ {
+ String dc =
epSnitchInfo.getDatacenter(tokenAndEndPoint.getValue());
+ if (!ownershipByDc.containsKey(dc))
+ ownershipByDc.put(dc, new SetHostStat(resolveIp));
+ ownershipByDc.get(dc).add(tokenAndEndPoint.getKey(),
tokenAndEndPoint.getValue(), ownerships);
+ }
+
+ return ownershipByDc;
+ }
+
+ static class SetHostStat implements IterableHostStat {
+ final ListHostStat hostStats = new ArrayListHostStat();
+ final boolean resolveIp;
+
+ public SetHostStat(boolean resolveIp)
+ {
+ this.resolveIp = resolveIp;
+ }
+
+ public int size()
+ {
+ return hostStats.size();
+ }
+
+
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d2c3fe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d2c3fe6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d2c3fe6 Branch: refs/heads/cassandra-2.1 Commit: 8d2c3fe6737c208a889f8516eb86a8568a5916c5 Parents: 8f0952e 57f6f92 Author: Vijay vijay2...@gmail.com Authored: Sun Mar 9 14:00:17 2014 -0700 Committer: Vijay vijay2...@gmail.com Committed: Sun Mar 9 14:00:17 2014 -0700 -- .../org/apache/cassandra/tools/NodeCmd.java | 71 +++- 1 file changed, 39 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2c3fe6/src/java/org/apache/cassandra/tools/NodeCmd.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ef20671c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef20671c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef20671c Branch: refs/heads/trunk Commit: ef20671c2c99ab40362785f4718c9e2c13edbda2 Parents: 41d8a5f 64098f7 Author: Marcus Eriksson marc...@apache.org Authored: Mon Mar 3 15:04:00 2014 +0100 Committer: Marcus Eriksson marc...@apache.org Committed: Mon Mar 3 15:04:00 2014 +0100 -- --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/service/MigrationManager.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2125165 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a2125165 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a2125165 Branch: refs/heads/trunk Commit: a212516548316c958b9ce034f39d13f1c7169357 Parents: 84103bb 5e40a3b Author: Aleksey Yeschenko alek...@apache.org Authored: Wed Feb 19 22:25:28 2014 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Wed Feb 19 22:25:28 2014 +0300 -- CHANGES.txt| 1 + .../org/apache/cassandra/service/MigrationManager.java | 13 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2125165/CHANGES.txt -- diff --cc CHANGES.txt index 2cacbaa,51dec14..83b03de --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -31,34 -15,24 +31,35 @@@ Merged from 1.2 * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711) * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713) * Support negative timestamps for CQL3 dates in query string (CASSANDRA-6718) + * Avoid NPEs when receiving table changes for an unknown keyspace (CASSANDRA-5631) -1.2.15 - * Move handling of migration event source to solve bootstrap race (CASSANDRA-6648) - * Make sure compaction throughput value doesn't overflow with int math (CASSANDRA-6647) - - -1.2.14 - * Reverted code to limit CQL prepared statement cache by size (CASSANDRA-6592) - * add cassandra.default_messaging_version property to allow easier - upgrading from 1.1 (CASSANDRA-6619) - * Allow executing CREATE statements multiple times (CASSANDRA-6471) - * Don't send confusing info with timeouts (CASSANDRA-6491) - * Don't resubmit counter mutation runnables internally (CASSANDRA-6427) - * Don't drop local mutations without a hint (CASSANDRA-6510) - * Don't allow null max_hint_window_in_ms (CASSANDRA-6419) - * Validate SliceRange start and finish lengths (CASSANDRA-6521) +2.0.5 + * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) + * Add ks.cf names to tombstone logging (CASSANDRA-6597) + * Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495) + * Wait for gossip to settle before accepting client connections (CASSANDRA-4288) + * Delete unfinished compaction incrementally (CASSANDRA-6086) + * Allow specifying custom secondary index options in CQL3 (CASSANDRA-6480) + * Improve replica pinning for cache efficiency in DES (CASSANDRA-6485) + * Fix LOCAL_SERIAL from thrift (CASSANDRA-6584) + * Don't special case received counts in CAS timeout exceptions (CASSANDRA-6595) + * Add support for 2.1 global counter shards (CASSANDRA-6505) + * Fix NPE when streaming connection is not yet established (CASSANDRA-6210) + * Avoid rare duplicate read repair triggering (CASSANDRA-6606) + * Fix paging discardFirst (CASSANDRA-6555) + * Fix ArrayIndexOutOfBoundsException in 2ndary index query (CASSANDRA-6470) + * Release sstables upon rebuilding 2i (CASSANDRA-6635) + * Add AbstractCompactionStrategy.startup() method (CASSANDRA-6637) + * SSTableScanner may skip rows during cleanup (CASSANDRA-6638) + * sstables from stalled repair sessions can resurrect deleted data (CASSANDRA-6503) + * Switch stress to use ITransportFactory (CASSANDRA-6641) + * Fix IllegalArgumentException during prepare (CASSANDRA-6592) + * Fix possible loss of 2ndary index entries during compaction (CASSANDRA-6517) + * Fix direct Memory on architectures that do not support unaligned long access + (CASSANDRA-6628) + * Let scrub optionally skip broken counter partitions (CASSANDRA-5930) +Merged from 1.2: * fsync compression metadata (CASSANDRA-6531) * Validate CF existence on execution for prepared statement (CASSANDRA-6535) * Add ability to throttle batchlog replay (CASSANDRA-6550) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a2125165/src/java/org/apache/cassandra/service/MigrationManager.java -- diff --cc src/java/org/apache/cassandra/service/MigrationManager.java index 7185813,9f6113c..0e36234 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@@ -236,7 -236,7 +236,7 @@@ public class MigrationManage oldCfm.validateCompatility(cfm); logger.info(String.format(Update ColumnFamily '%s/%s' From %s To %s, cfm.ksName, cfm.cfName, oldCfm, cfm)); - announce(oldCfm.toSchemaUpdate(cfm,
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd91cf97 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd91cf97 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd91cf97 Branch: refs/heads/trunk Commit: cd91cf9746adf93788aa2cca76f8430e33216300 Parents: 39bdb2b 852e27f Author: Jonathan Ellis jbel...@apache.org Authored: Thu Jan 30 10:16:27 2014 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Jan 30 10:16:27 2014 -0600 -- --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/thrift/ThriftValidation.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03f4c92d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03f4c92d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03f4c92d
Branch: refs/heads/trunk
Commit: 03f4c92d14ec7bbdac7524f531423c79015c8061
Parents: b5c9b49 a58a95d
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Dec 22 20:09:18 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Dec 22 20:09:18 2013 +0300
--
CHANGES.txt | 1 +
.../org/apache/cassandra/thrift/ThriftValidation.java | 12 +---
2 files changed, 10 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03f4c92d/CHANGES.txt
--
diff --cc CHANGES.txt
index b80c821,4eee4ee..f38b58f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,50 -28,9 +34,51 @@@ Merged from 1.2
(CASSANDRA-6413)
* (Hadoop) add describe_local_ring (CASSANDRA-6268)
* Fix handling of concurrent directory creation failure (CASSANDRA-6459)
+ * Allow executing CREATE statements multiple times (CASSANDRA-6471)
+ * Don't send confusing info with timeouts (CASSANDRA-6491)
+ * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
+ * Don't drop local mutations without a trace (CASSANDRA-6510)
+ * Don't allow null max_hint_window_in_ms (CASSANDRA-6419)
++ * Validate SliceRange start and finish lengths (CASSANDRA-6521)
-1.2.12
+2.0.3
+ * Fix FD leak on slice read path (CASSANDRA-6275)
+ * Cancel read meter task when closing SSTR (CASSANDRA-6358)
+ * free off-heap IndexSummary during bulk (CASSANDRA-6359)
+ * Recover from IOException in accept() thread (CASSANDRA-6349)
+ * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338)
+ * Fix trying to hint timed out counter writes (CASSANDRA-6322)
+ * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
+ * Avoid flushing compaction_history after each operation (CASSANDRA-6287)
+ * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
+ * Skip loading corrupt key cache (CASSANDRA-6260)
+ * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
+ * Compact hottest sstables first and optionally omit coldest from
+ compaction entirely (CASSANDRA-6109)
+ * Fix modifying column_metadata from thrift (CASSANDRA-6182)
+ * cqlsh: fix LIST USERS output (CASSANDRA-6242)
+ * Add IRequestSink interface (CASSANDRA-6248)
+ * Update memtable size while flushing (CASSANDRA-6249)
+ * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
+ * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
+ * New CQL-aware SSTableWriter (CASSANDRA-5894)
+ * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
+ * Correctly throw error when frame too large (CASSANDRA-5981)
+ * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299)
+ * Fix CQL3 table validation in Thrift (CASSANDRA-6140)
+ * Fix bug missing results with IN clauses (CASSANDRA-6327)
+ * Fix paging with reversed slices (CASSANDRA-6343)
+ * Set minTimestamp correctly to be able to drop expired sstables
(CASSANDRA-6337)
+ * Support NaN and Infinity as float literals (CASSANDRA-6003)
+ * Remove RF from nodetool ring output (CASSANDRA-6289)
+ * Fix attempting to flush empty rows (CASSANDRA-6374)
+ * Fix potential out of bounds exception when paging (CASSANDRA-6333)
+Merged from 1.2:
+ * Optimize FD phi calculation (CASSANDRA-6386)
+ * Improve initial FD phi estimate when starting up (CASSANDRA-6385)
+ * Don't list CQL3 table in CLI describe even if named explicitely
+ (CASSANDRA-5750)
* Invalidate row cache when dropping CF (CASSANDRA-6351)
* add non-jamm path for cached statements (CASSANDRA-6293)
* (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/03f4c92d/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index 3a831f4,442ea4e..f2efc03
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -268,7 -228,16 +268,16 @@@ public class ThriftValidatio
public static void validateRange(CFMetaData metadata, ColumnParent
column_parent, SliceRange range) throws
org.apache.cassandra.exceptions.InvalidRequestException
{
+ if (range.count 0)
+
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
src/java/org/apache/cassandra/cql3/QueryProcessor.java
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1435ffd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1435ffd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1435ffd
Branch: refs/heads/cassandra-2.0
Commit: b1435ffd1dcdeab9f0ebc52cf1ed3cddafa13c4e
Parents: 4d36bbf b97c523
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Dec 20 20:14:07 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Dec 20 20:14:07 2013 +0300
--
.../org/apache/cassandra/cql3/CQLStatement.java | 2 +-
.../apache/cassandra/cql3/QueryProcessor.java | 20 ++--
.../statements/AuthenticationStatement.java | 2 +-
.../cql3/statements/AuthorizationStatement.java | 2 +-
.../cql3/statements/BatchStatement.java | 4 ++--
.../cql3/statements/ModificationStatement.java | 4 ++--
.../cql3/statements/ParsedStatement.java| 2 +-
.../statements/SchemaAlteringStatement.java | 2 +-
.../cql3/statements/SelectStatement.java| 4 ++--
.../cql3/statements/TruncateStatement.java | 2 +-
.../cassandra/cql3/statements/UseStatement.java | 2 +-
.../cassandra/thrift/CassandraServer.java | 2 +-
.../transport/messages/BatchMessage.java| 5 ++---
13 files changed, 26 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1435ffd/src/java/org/apache/cassandra/cql3/CQLStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1435ffd/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index ad3c4b4,332aea1..02361a8
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -209,22 -152,10 +209,22 @@@ public class QueryProcesso
public static ResultMessage process(String queryString, ConsistencyLevel
cl, QueryState queryState)
throws RequestExecutionException, RequestValidationException
{
+return process(queryString, queryState, new QueryOptions(cl,
Collections.ByteBufferemptyList()));
+}
+
+public static ResultMessage process(String queryString, QueryState
queryState, QueryOptions options)
+throws RequestExecutionException, RequestValidationException
+{
CQLStatement prepared = getStatement(queryString,
queryState.getClientState()).statement;
- if (prepared.getBoundsTerms() != options.getValues().size())
-if (prepared.getBoundTerms() 0)
-throw new InvalidRequestException(Cannot execute query with bind
variables);
-return processStatement(prepared, cl, queryState,
Collections.ByteBufferemptyList());
++if (prepared.getBoundTerms() != options.getValues().size())
+throw new InvalidRequestException(Invalid amount of bind
variables);
+
+return processStatement(prepared, queryState, options, queryString);
+}
+
+public static CQLStatement parseStatement(String queryStr, QueryState
queryState) throws RequestValidationException
+{
+return getStatement(queryStr, queryState.getClientState()).statement;
}
public static UntypedResultSet process(String query, ConsistencyLevel cl)
throws RequestExecutionException
@@@ -286,20 -218,12 +286,20 @@@
throws RequestValidationException
{
ParsedStatement.Prepared prepared = getStatement(queryString,
clientState);
- int bountTerms = prepared.statement.getBoundsTerms();
- if (bountTerms FBUtilities.MAX_UNSIGNED_SHORT)
- throw new InvalidRequestException(String.format(Too many
markers(?). %d markers exceed the allowed maximum of %d, bountTerms,
FBUtilities.MAX_UNSIGNED_SHORT));
- assert bountTerms == prepared.boundNames.size();
++int boundTerms = prepared.statement.getBoundTerms();
++if (boundTerms FBUtilities.MAX_UNSIGNED_SHORT)
++throw new InvalidRequestException(String.format(Too many
markers(?). %d markers exceed the allowed maximum of
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3bd65965 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bd65965 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bd65965 Branch: refs/heads/trunk Commit: 3bd65965fd4049614676b6b13ca349401d4e034e Parents: 22d8744 1b4c9b4 Author: Jason Brown jasedbr...@gmail.com Authored: Tue Dec 17 11:04:03 2013 -0800 Committer: Jason Brown jasedbr...@gmail.com Committed: Tue Dec 17 11:04:03 2013 -0800 -- doc/native_protocol_v1.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3bd65965/doc/native_protocol_v1.spec -- diff --cc doc/native_protocol_v1.spec index 0d2ff05,000..08cb91e mode 100644,00..100644 --- a/doc/native_protocol_v1.spec +++ b/doc/native_protocol_v1.spec @@@ -1,636 -1,0 +1,636 @@@ + + CQL BINARY PROTOCOL v1 + + +Table of Contents + + 1. Overview + 2. Frame header +2.1. version +2.2. flags +2.3. stream +2.4. opcode +2.5. length + 3. Notations + 4. Messages +4.1. Requests + 4.1.1. STARTUP + 4.1.2. CREDENTIALS + 4.1.3. OPTIONS + 4.1.4. QUERY + 4.1.5. PREPARE + 4.1.6. EXECUTE + 4.1.7. REGISTER +4.2. Responses + 4.2.1. ERROR + 4.2.2. READY + 4.2.3. AUTHENTICATE + 4.2.4. SUPPORTED + 4.2.5. RESULT +4.2.5.1. Void +4.2.5.2. Rows +4.2.5.3. Set_keyspace +4.2.5.4. Prepared +4.2.5.5. Schema_change + 4.2.6. EVENT + 5. Compression + 6. Collection types + 7. Error codes + + +1. Overview + + The CQL binary protocol is a frame based protocol. Frames are defined as: + + 0 8162432 + +-+-+-+-+ + | version | flags | stream | opcode | + +-+-+-+-+ + |length | + +-+-+-+-+ + | | + .... body ... . + . . + . . + + + + The protocol is big-endian (network byte order). + + Each frame contains a fixed size header (8 bytes) followed by a variable size + body. The header is described in Section 2. The content of the body depends + on the header opcode value (the body can in particular be empty for some + opcode values). The list of allowed opcode is defined Section 2.3 and the + details of each corresponding message is described Section 4. + + The protocol distinguishes 2 types of frames: requests and responses. Requests + are those frame sent by the clients to the server, response are the ones sent + by the server. Note however that while communication are initiated by the + client with the server responding to request, the protocol may likely add + server pushes in the future, so responses does not obligatory come right after + a client request. + + Note to client implementors: clients library should always assume that the + body of a given frame may contain more data than what is described in this + document. It will however always be safe to ignore the remaining of the frame + body in such cases. The reason is that this may allow to sometimes extend the + protocol with optional features without needing to change the protocol + version. + + +2. Frame header + +2.1. version + + The version is a single byte that indicate both the direction of the message + (request or response) and the version of the protocol in use. The up-most bit + of version is used to define the direction of the message: 0 indicates a + request, 1 indicates a responses. This can be useful for protocol analyzers to + distinguish the nature of the packet from the direction which it is moving. + The rest of that byte is the protocol version (1 for the protocol defined in + this document). In other words, for this version of the protocol, version will + have one of: +0x01Request frame for this protocol version +0x81Response frame for this protocol version + + +2.2. flags + + Flags applying to this frame. The flags have the following meaning (described + by the mask that allow to select them): +0x01: Compression flag. If set, the frame body is compressed. The actual + compression to use should have been set up beforehand through the + Startup message (which thus
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2da839f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2da839f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2da839f Branch: refs/heads/trunk Commit: b2da839f076f14f35c5591b39736c8d7241974ee Parents: 6724964 f634ac7 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Dec 3 14:54:41 2013 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Dec 3 14:54:41 2013 +0100 -- CHANGES.txt| 1 + .../cassandra/db/marshal/CollectionType.java | 17 + .../org/apache/cassandra/db/marshal/ListType.java | 2 ++ .../org/apache/cassandra/db/marshal/MapType.java | 2 ++ .../org/apache/cassandra/db/marshal/SetType.java | 2 ++ 5 files changed, 24 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2da839f/CHANGES.txt -- diff --cc CHANGES.txt index 11f4c09,8e6cffa..a7ab215 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,44 -8,10 +13,45 @@@ Merged from 1.2 * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598) * Expose Thread metrics for the native protocol server (CASSANDRA-6234) * Change snapshot response message verb (CASSANDRA-6415) + * Warn when collection read has 65K elements (CASSANDRA-5428) -1.2.12 +2.0.3 + * Fix FD leak on slice read path (CASSANDRA-6275) + * Cancel read meter task when closing SSTR (CASSANDRA-6358) + * free off-heap IndexSummary during bulk (CASSANDRA-6359) + * Recover from IOException in accept() thread (CASSANDRA-6349) + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338) + * Fix trying to hint timed out counter writes (CASSANDRA-6322) + * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809) + * Avoid flushing compaction_history after each operation (CASSANDRA-6287) + * Fix repair assertion error when tombstones expire (CASSANDRA-6277) + * Skip loading corrupt key cache (CASSANDRA-6260) + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274) + * Compact hottest sstables first and optionally omit coldest from + compaction entirely (CASSANDRA-6109) + * Fix modifying column_metadata from thrift (CASSANDRA-6182) + * cqlsh: fix LIST USERS output (CASSANDRA-6242) + * Add IRequestSink interface (CASSANDRA-6248) + * Update memtable size while flushing (CASSANDRA-6249) + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252) + * Require Permission.SELECT for CAS updates (CASSANDRA-6247) + * New CQL-aware SSTableWriter (CASSANDRA-5894) + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270) + * Correctly throw error when frame too large (CASSANDRA-5981) + * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299) + * Fix CQL3 table validation in Thrift (CASSANDRA-6140) + * Fix bug missing results with IN clauses (CASSANDRA-6327) + * Fix paging with reversed slices (CASSANDRA-6343) + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337) + * Support NaN and Infinity as float literals (CASSANDRA-6003) + * Remove RF from nodetool ring output (CASSANDRA-6289) + * Fix attempting to flush empty rows (CASSANDRA-6374) + * Fix potential out of bounds exception when paging (CASSANDRA-6333) +Merged from 1.2: + * Optimize FD phi calculation (CASSANDRA-6386) + * Improve initial FD phi estimate when starting up (CASSANDRA-6385) + * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750) * Invalidate row cache when dropping CF (CASSANDRA-6351) * add non-jamm path for cached statements (CASSANDRA-6293) * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2da839f/src/java/org/apache/cassandra/db/marshal/CollectionType.java -- diff --cc src/java/org/apache/cassandra/db/marshal/CollectionType.java index f922d56,a34a2b7..9408980 --- a/src/java/org/apache/cassandra/db/marshal/CollectionType.java +++ b/src/java/org/apache/cassandra/db/marshal/CollectionType.java @@@ -20,9 -20,11 +20,12 @@@ package org.apache.cassandra.db.marshal import java.nio.ByteBuffer; import java.util.List; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.db.IColumn; +import org.apache.cassandra.db.Column; +import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair;
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86b32704 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86b32704 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86b32704 Branch: refs/heads/trunk Commit: 86b32704b4e1cac8552461224a6dfd24e11b4df7 Parents: d2c67a1 742e5ba Author: Vijay Parthasarathy vijay2...@gmail.com Authored: Sat Sep 14 16:08:18 2013 -0700 Committer: Vijay Parthasarathy vijay2...@gmail.com Committed: Sat Sep 14 16:08:18 2013 -0700 -- conf/commitlog_archiving.properties | 7 +++-- .../db/commitlog/CommitLogArchiver.java | 12 +++- .../db/commitlog/CommitLogReplayer.java | 2 +- test/conf/commitlog_archiving.properties| 19 + .../cassandra/db/RecoveryManagerTest.java | 29 5 files changed, 65 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b32704/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/86b32704/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java --
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14e7895e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14e7895e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14e7895e
Branch: refs/heads/cassandra-2.0
Commit: 14e7895e59c63f510a586e2847226e3aa5c8a30b
Parents: c7a835d 196038b
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Sep 3 16:35:27 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Sep 3 16:35:27 2013 +0200
--
build.xml | 2 +-
lib/netty-3.5.9.Final.jar | Bin 1128961 - 0 bytes
lib/netty-3.6.6.Final.jar | Bin 0 - 1206119 bytes
3 files changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/14e7895e/build.xml
--
diff --cc build.xml
index 291b603,9e1de8d..74b3d0b
--- a/build.xml
+++ b/build.xml
@@@ -372,10 -379,14 +372,10 @@@
dependency groupId=log4j artifactId=log4j version=1.2.16 /
dependency groupId=org.apache.cassandra
artifactId=cassandra-all version=${version} /
dependency groupId=org.apache.cassandra
artifactId=cassandra-thrift version=${version} /
- dependency groupId=com.yammer.metrics artifactId=metrics-core
version=2.0.3 /
+ dependency groupId=com.yammer.metrics artifactId=metrics-core
version=2.2.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.5.9.Final /
+ dependency groupId=io.netty artifactId=netty
version=3.6.6.Final /
/dependencyManagement
developer id=alakshman name=Avinash Lakshman/
developer id=antelder name=Anthony Elder/
