subject:"\[2\/3\] git commit\: Merge branch 'cassandra\-1.2' into cassandra\-2.0"

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-09-01 Thread marcuse

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.0
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-08-27 Thread marcuse

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.0
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-08-26 Thread marcuse

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.0
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-08-19 Thread aleksey

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/31d5193a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31d5193a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/31d5193a

Branch: refs/heads/cassandra-2.1.0
Commit: 31d5193a7ab73d6dfaa2ec2367c24296755c5584
Parents: 296903b 48d6950
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Aug 20 02:05:17 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Aug 20 02:05:17 2014 +0300

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/auth/Auth.java| 25 --
 .../cassandra/auth/PasswordAuthenticator.java   | 27 +---
 3 files changed, 24 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/31d5193a/CHANGES.txt
--
diff --cc CHANGES.txt
index de45376,db5fa3a..1de5b33
--- 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 NPE when listing saved caches dir (CASSANDRA-7632)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-08-19 Thread aleksey

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.0
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)
 + *

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-08-10 Thread aleksey

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.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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-08-01 Thread tylerhobbs

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.0
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-25 Thread tylerhobbs

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
bin/cqlsh


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c656ffe4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c656ffe4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c656ffe4

Branch: refs/heads/cassandra-2.1
Commit: c656ffe4d32db92bd95be001745b857cc6c0962b
Parents: 94ff639 66e1e46
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jun 25 09:54:20 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jun 25 09:54:20 2014 -0500

--
 CHANGES.txt | 1 +
 bin/cqlsh   | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c656ffe4/CHANGES.txt
--
diff --cc CHANGES.txt
index d23ce37,6adef97..1ff5675
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,6 +1,28 @@@
 -1.2.17
 +2.0.9
 + * 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)
 +Merged from 1.2:
 + * Expose global ColumnFamily metrics (CASSANDRA-7273)
+  * cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
 - * Expose global ColmunFamily metrics (CASSANDRA-7273)
   * Handle possible integer overflow in FastByteArrayOutputStream 
(CASSANDRA-7373)
   * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
   * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c656ffe4/bin/cqlsh
--
diff --cc bin/cqlsh
index 5484021,bb0ffdf..360c64e
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -524,9 -551,9 +524,11 @@@ class Shell(cmd.Cmd)
  self.show_line_nums = True
  self.stdin = stdin
  self.query_out = sys.stdout
 +self.empty_lines = 0
  self.statement_error = False
 +self.single_statement = single_statement
+ # see CASSANDRA-7399
+ cql.cqltypes.CompositeType.cql_parameterized_type = 
classmethod(lambda cls: '%s' % cls.cass_parameterized_type_with(cls.subtypes, 
True))
  
  def set_expanded_cql_version(self, ver):
  ver, vertuple = full_cql_version(ver)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-25 Thread tylerhobbs

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
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/2ab7b07a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ab7b07a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ab7b07a

Branch: refs/heads/cassandra-2.1
Commit: 2ab7b07accf43c6831339ad80646220d9c1821ae
Parents: c656ffe d84b692
Author: Tyler Hobbs ty...@datastax.com
Authored: Wed Jun 25 10:40:35 2014 -0500
Committer: Tyler Hobbs ty...@datastax.com
Committed: Wed Jun 25 10:40:35 2014 -0500

--
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 2 --
 src/java/org/apache/cassandra/service/StorageService.java| 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab7b07a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ab7b07a/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 13dd3b7,1f3d1e1..77ad4f0
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -627,64 -597,50 +627,66 @@@ 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 (SystemTable.bootstrapComplete())
 -throw new RuntimeException(Cannot replace address with a 
node that is already bootstrapped);
 -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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-17 Thread aleksey

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/cassandra-2.1
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-09 Thread dbrosius

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-09 Thread dbrosius

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-05 Thread aleksey

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/cassandra-2.1
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-06-05 Thread aleksey

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/cassandra-2.1
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) 
 + *

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-05-30 Thread jasobrown

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/cassandra-2.1
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:
   *

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-05-30 Thread aleksey

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/cassandra-2.1
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-05-29 Thread slebresne

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/cassandra-2.1
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-05-29 Thread aleksey

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-05-19 Thread dbrosius

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-05-10 Thread dbrosius

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/cassandra-2.1
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-05-03 Thread dbrosius

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-30 Thread slebresne

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/cassandra-2.1
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-28 Thread dbrosius

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/cassandra-2.1
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)
 + *

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-25 Thread slebresne

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-25 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/cql3/CFDefinition.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/98dcde10
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/98dcde10
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/98dcde10

Branch: refs/heads/cassandra-2.1
Commit: 98dcde10320d3b4b57cdd73b86d21178eab1c8cb
Parents: 082bfc9 08a9d38
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Apr 25 15:40:57 2014 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Apr 25 15:40:57 2014 +0200

--
 src/java/org/apache/cassandra/cql3/CFDefinition.java | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/98dcde10/src/java/org/apache/cassandra/cql3/CFDefinition.java
--
diff --cc src/java/org/apache/cassandra/cql3/CFDefinition.java
index b589a95,47de4dd..3266c95
--- a/src/java/org/apache/cassandra/cql3/CFDefinition.java
+++ b/src/java/org/apache/cassandra/cql3/CFDefinition.java
@@@ -39,15 -39,23 +39,23 @@@ public class CFDefinition implements It
  {
  public static final AbstractType? definitionType = UTF8Type.instance;
  
 -private static final String DEFAULT_KEY_ALIAS = key;
 -private static final String DEFAULT_COLUMN_ALIAS = column;
 -private static final String DEFAULT_VALUE_ALIAS = value;
 -
 -public final CFMetaData cfm;
 -// LinkedHashMap because the order does matter (it is the order in the 
composite type)
 -public final LinkedHashMapColumnIdentifier, Name keys = new 
LinkedHashMapColumnIdentifier, Name();
 -public final LinkedHashMapColumnIdentifier, Name columns = new 
LinkedHashMapColumnIdentifier, Name();
 -public final Name value;
 -// Keep metadata lexicographically ordered so that wildcard expansion 
have a deterministic order
 -public final MapColumnIdentifier, Name metadata = new 
TreeMapColumnIdentifier, Name(new ComparatorColumnIdentifier()
++// Keep static and regular columns lexicographically ordered so that 
wildcard expansion have a deterministic order
++private static final ComparatorColumnIdentifier identifierComparator = 
new ComparatorColumnIdentifier()
+ {
+ public int compare(ColumnIdentifier id1, ColumnIdentifier id2)
+ {
+ return ByteBufferUtil.compareUnsigned(id1.key, id2.key);
+ }
 -});;
++};
 +
 +public final CFMetaData cfm;
 +// LinkedHashMap because the order does matter (it is the order in the 
composite type)
 +private final LinkedHashMapColumnIdentifier, Name partitionKeys = new 
LinkedHashMapColumnIdentifier, Name();
 +private final LinkedHashMapColumnIdentifier, Name clusteringColumns = 
new LinkedHashMapColumnIdentifier, Name();
 +private final Name compactValue;
 +// Keep metadata lexicographically ordered so that wildcard expansion 
have a deterministic order
- private final MapColumnIdentifier, Name staticColumns = new 
TreeMapColumnIdentifier, Name();
- private final MapColumnIdentifier, Name regularColumns = new 
TreeMapColumnIdentifier, Name();
++private final MapColumnIdentifier, Name staticColumns = new 
TreeMapColumnIdentifier, Name(identifierComparator);
++private final MapColumnIdentifier, Name regularColumns = new 
TreeMapColumnIdentifier, Name(identifierComparator);
  
  public final boolean isComposite;
  public final boolean hasCompositeKey;

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-24 Thread aleksey

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/cassandra-2.1
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-22 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/net/MessagingService.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a73e392
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a73e392
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a73e392

Branch: refs/heads/cassandra-2.1
Commit: 3a73e392fa424bff5378d4bb72117cfa28f9b0b7
Parents: 1c2a812 2890cc5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Apr 22 19:47:42 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Apr 22 19:47:42 2014 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/BatchlogManager.java|  2 +-
 .../cassandra/db/HintedHandOffManager.java  |  4 +--
 .../apache/cassandra/net/MessagingService.java  | 27 ++--
 .../apache/cassandra/net/WriteCallbackInfo.java | 16 +---
 .../apache/cassandra/service/StorageProxy.java  |  7 -
 6 files changed, 41 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a73e392/CHANGES.txt
--
diff --cc CHANGES.txt
index 9b73c89,74ddcfd..dbed949
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,61 -9,10 +8,62 @@@ Merged from 1.2
   * 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)
+  * Ensure that batchlog and hint timeouts do not produce hints 
(CASSANDRA-7058)
  
  
 -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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-21 Thread slebresne

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-21 Thread dbrosius

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/bc6f4d00
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc6f4d00
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc6f4d00

Branch: refs/heads/cassandra-2.1
Commit: bc6f4d0033e5e391137f9db5fe0ac4c41bb05f20
Parents: 1104653 8d1acd9
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Apr 22 01:37:28 2014 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Apr 22 01:37:28 2014 -0400

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/tools/NodeCmd.java   | 5 +
 src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc6f4d00/CHANGES.txt
--
diff --cc CHANGES.txt
index bcbde4a,8cfffad..5d47cfa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,63 -1,16 +1,64 @@@
 -1.2.17
 - * 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)
 +2.0.8
 + * Queries on compact tables can return more rows that requested 
(CASSANDRA-7052)
 + * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 +Merged from 1.2:
   * 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)
  
  
 -1.2.16
 +2.0.7
 + * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
 + * Allow compaction of system tables during 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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-04-11 Thread aleksey

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-19 Thread tylerhobbs

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/cassandra-2.1
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)
 + *

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail

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/dce55999
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dce55999
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dce55999

Branch: refs/heads/cassandra-2.1
Commit: dce5599953adfabb5a6ecace37a5c4c6de3e7885
Parents: da2d971 173df48
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 13:05:52 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 13:05:52 2014 -0700

--
 src/java/org/apache/cassandra/transport/Server.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce55999/src/java/org/apache/cassandra/transport/Server.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-13 Thread mishail

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/3dcc8c25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dcc8c25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dcc8c25

Branch: refs/heads/cassandra-2.1
Commit: 3dcc8c25e542d5473a78404a027ca6acb3cc065f
Parents: dce5599 972d3da
Author: Mikhail Stepura mish...@apache.org
Authored: Thu Mar 13 14:07:04 2014 -0700
Committer: Mikhail Stepura mish...@apache.org
Committed: Thu Mar 13 14:07:04 2014 -0700

--
 bin/cqlsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dcc8c25/bin/cqlsh
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-09 Thread vijay

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/trunk
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-03-03 Thread marcuse

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-19 Thread slebresne

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/0520aeb7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0520aeb7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0520aeb7

Branch: refs/heads/trunk
Commit: 0520aeb7e751626b62268c1495c941d33b01cdfb
Parents: e67a0a9 e787b7a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Feb 19 11:42:25 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Feb 19 11:42:25 2014 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/marshal/DateType.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0520aeb7/CHANGES.txt
--
diff --cc CHANGES.txt
index 95faf18,47fc3a3..2cacbaa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,34 -10,24 +30,35 @@@ Merged from 1.2
   * IN on the last clustering columns + ORDER BY DESC yield no results 
(CASSANDRA-6701)
   * 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)
  
  
 -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/0520aeb7/src/java/org/apache/cassandra/db/marshal/DateType.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-19 Thread aleksey

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/cassandra-2.1
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-14 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44f9c868
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44f9c868
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44f9c868

Branch: refs/heads/trunk
Commit: 44f9c8689507b6aabeeac4943d4aff4634117b73
Parents: 78df8a3 c9ade9d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Feb 14 13:48:46 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Feb 14 13:48:46 2014 +0100

--
 CHANGES.txt   | 1 +
 .../org/apache/cassandra/cql3/statements/SelectStatement.java | 7 +--
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44f9c868/CHANGES.txt
--
diff --cc CHANGES.txt
index 7425625,492cc2d..57eefac
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -21,33 -7,24 +21,34 @@@ Merged from 1.2
   * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
   * Don't exchange schema between nodes with different versions 
(CASSANDRA-6695)
   * Use real node messaging versions for schema exchange decisions 
(CASSANDRA-6700)
+  * IN on the last clustering columns + ORDER BY DESC yield no results 
(CASSANDRA-6701)
  
 -
 -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/44f9c868/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 29cafa2,e058cff..307e668
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -19,11 -19,12 +19,12 @@@ package org.apache.cassandra.cql3.state
  
  import java.nio.ByteBuffer;
  import java.util.*;
 -import java.util.concurrent.ExecutionException;
  
 +import com.google.common.base.Objects;
 +import

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-14 Thread aleksey

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/15fd82cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15fd82cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15fd82cb

Branch: refs/heads/trunk
Commit: 15fd82cb912edac6c6301d7175797ae2ea7976e6
Parents: 44f9c86 7937ee3
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Feb 14 20:40:10 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Feb 14 20:40:10 2014 +0300

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15fd82cb/CHANGES.txt
--
diff --cc CHANGES.txt
index 57eefac,964e10c..571b8dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,33 -8,24 +22,34 @@@ Merged from 1.2
   * Don't exchange schema between nodes with different versions 
(CASSANDRA-6695)
   * Use real node messaging versions for schema exchange decisions 
(CASSANDRA-6700)
   * IN on the last clustering columns + ORDER BY DESC yield no results 
(CASSANDRA-6701)
+  * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
  
 -
 -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/15fd82cb/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 1838c03,c4e4129..7bfed33
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -436,9 -462,10 +436,10 @@@ public class SecondaryIndexManage
  // Update entire row only once per row level index
  SetClass? extends SecondaryIndex cleanedRowLevelIndexes = null;
  
 -for (IColumn column : indexedColumnsInRow)
 +for (Column column : indexedColumnsInRow)
  {
-

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-13 Thread aleksey

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/78df8a33
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78df8a33
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78df8a33

Branch: refs/heads/trunk
Commit: 78df8a33caf864c51ba2a10cb04f77ac6b043bfc
Parents: 15ee948 de72e7f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Feb 13 19:32:03 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Feb 13 19:32:03 2014 +0300

--
 CHANGES.txt |  1 +
 .../cassandra/net/IncomingTcpConnection.java|  4 +--
 .../apache/cassandra/net/MessagingService.java  | 28 +---
 .../cassandra/service/MigrationManager.java |  4 +--
 4 files changed, 23 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78df8a33/CHANGES.txt
--
diff --cc CHANGES.txt
index 9509a76,872934a..7425625
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,33 -6,24 +20,34 @@@ Merged from 1.2
   * Compact hints after partial replay to clean out tombstones (CASSANDRA-)
   * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
   * Don't exchange schema between nodes with different versions 
(CASSANDRA-6695)
+  * Use real node messaging versions for schema exchange decisions 
(CASSANDRA-6700)
  
 -
 -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/78df8a33/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78df8a33/src/java/org/apache/cassandra/net/MessagingService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78df8a33/src/java/org/apache/cassandra/service/MigrationManager.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-12 Thread aleksey

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/babc2de3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/babc2de3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/babc2de3

Branch: refs/heads/trunk
Commit: babc2de3e58e41b0dc2b9534c4514adfdd54be37
Parents: 80cebec b2dfaed
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Feb 12 19:40:46 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Feb 12 19:40:46 2014 +0300

--
 CHANGES.txt   |  1 +
 .../cassandra/service/MigrationManager.java   | 18 --
 2 files changed, 9 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/babc2de3/CHANGES.txt
--
diff --cc CHANGES.txt
index f9b2032,de7c307..a4dc8fd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,33 -5,24 +17,34 @@@ Merged from 1.2
   * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667)
   * Compact hints after partial replay to clean out tombstones (CASSANDRA-)
   * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
+  * Don't exchange schema between nodes with different versions 
(CASSANDRA-6695)
  
 -
 -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/babc2de3/src/java/org/apache/cassandra/service/MigrationManager.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-10 Thread marcuse

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
test/unit/org/apache/cassandra/db/CleanupTest.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6ae96a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6ae96a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a6ae96a

Branch: refs/heads/trunk
Commit: 9a6ae96af725e307d05332554f221c97e10647d1
Parents: b5321d5 4b83a6f
Author: Marcus Eriksson marc...@apache.org
Authored: Mon Feb 10 18:34:43 2014 +0100
Committer: Marcus Eriksson marc...@apache.org
Committed: Mon Feb 10 18:34:43 2014 +0100

--
 test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6ae96a/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java
index 562df1e,d5c2b07..9914c90
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@@ -64,10 -64,9 +64,10 @@@ public class CleanupTest extends Schema
  @Test
  public void testCleanup() throws IOException, ExecutionException, 
InterruptedException, ConfigurationException
  {
- StorageService.instance.initServer(0);
+ StorageService.instance.getTokenMetadata().clearUnsafe();
 -Table table = Table.open(TABLE1);
 -ColumnFamilyStore cfs = table.getColumnFamilyStore(CF2);
 +
 +Keyspace keyspace = Keyspace.open(KEYSPACE1);
 +ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF2);
  
  ListRow rows;

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-07 Thread aleksey

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/800e45f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/800e45f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/800e45f4

Branch: refs/heads/trunk
Commit: 800e45f48c8860696559d896f28be1f3bd2ca86f
Parents: 130d135 887558f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Feb 8 04:12:04 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Feb 8 04:12:04 2014 +0300

--
 src/java/org/apache/cassandra/db/Memtable.java | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/800e45f4/src/java/org/apache/cassandra/db/Memtable.java
--
diff --cc src/java/org/apache/cassandra/db/Memtable.java
index 01170d6,b6fceda..1d26779
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@@ -180,22 -190,19 +180,18 @@@ public class Memtabl
  
  private void resolve(DecoratedKey key, ColumnFamily cf, 
SecondaryIndexManager.Updater indexer)
  {
 -ColumnFamily previous = columnFamilies.get(key);
 +AtomicSortedColumns previous = rows.get(key);
  
- long sizeDelta = 0;
  if (previous == null)
  {
 -// AtomicSortedColumns doesn't work for super columns (see #3821)
 -ColumnFamily empty = cf.cloneMeShallow(cf.isSuper() ? 
ThreadSafeSortedColumns.factory() : AtomicSortedColumns.factory(), false);
 +AtomicSortedColumns empty = 
cf.cloneMeShallow(AtomicSortedColumns.factory, false);
  // We'll add the columns later. This avoids wasting works if we 
get beaten in the putIfAbsent
 -previous = columnFamilies.putIfAbsent(new DecoratedKey(key.token, 
allocator.clone(key.key)), empty);
 +previous = rows.putIfAbsent(new DecoratedKey(key.token, 
allocator.clone(key.key)), empty);
  if (previous == null)
- {
  previous = empty;
- sizeDelta += empty.deletionInfo().dataSize();
- }
  }
  
- sizeDelta = previous.addAllWithSizeDelta(cf, allocator, 
localCopyFunction, indexer);
+ long sizeDelta = previous.addAllWithSizeDelta(cf, allocator, 
localCopyFunction, indexer);
  currentSize.addAndGet(sizeDelta);
  currentOperations.addAndGet(cf.getColumnCount() + 
(cf.isMarkedForDelete() ? 1 : 0) + cf.deletionInfo().rangeCount());
  }

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-05 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/AtomicSortedColumns.java
src/java/org/apache/cassandra/db/DeletionInfo.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58e94818
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58e94818
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58e94818

Branch: refs/heads/trunk
Commit: 58e948185e214dbdc68e4ce533edb4dfa5430b51
Parents: 49bb972 adcb713
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Feb 5 18:42:00 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Feb 5 18:42:00 2014 +0100

--
 CHANGES.txt   |  5 +
 .../org/apache/cassandra/db/AtomicSortedColumns.java  |  7 ++-
 src/java/org/apache/cassandra/db/DeletionInfo.java| 14 ++
 src/java/org/apache/cassandra/db/Memtable.java| 10 ++
 4 files changed, 31 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58e94818/CHANGES.txt
--
diff --cc CHANGES.txt
index 9599e56,cfdd148..bba5f20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,29 -1,21 +1,34 @@@
 -1.2.16
++2.0.6
++Merged from 1.2:
+  * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
+ 
 -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/58e94818/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
--
diff --cc src/java/org/apache/cassandra/db/AtomicSortedColumns.java
index 1c0bf1b,d6c861b..d3a979c
--- a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java
@@@ -178,19 -194,15 +178,24 @@@ public class AtomicSortedColumns extend
  {
  sizeDelta = 0;
  current = ref.get();
- DeletionInfo newDelInfo = 
current.deletionInfo.copy().add(cm.deletionInfo());
+ DeletionInfo newDelInfo = current.deletionInfo;
 -

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-04 Thread dbrosius

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/79b36261
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79b36261
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79b36261

Branch: refs/heads/trunk
Commit: 79b3626160d91cd7c09001bf1c3a19600944349b
Parents: 93bd89f 511787d
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Feb 4 20:16:56 2014 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Feb 4 20:16:56 2014 -0500

--
 CHANGES.txt   | 3 ++-
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79b36261/CHANGES.txt
--
diff --cc CHANGES.txt
index d3a78f7,75c7104..7e0a89e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,17 +1,35 @@@
 -1.2.15
 - * Move handling of migration event source to solve bootstrap race 
(CASSANDRA-6648)
 +2.0.6
 + * 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:
 + * 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)
 +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/79b36261/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-02-03 Thread aleksey

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/066d00ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/066d00ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/066d00ba

Branch: refs/heads/trunk
Commit: 066d00ba5183a3a37b962334d0442edaaf9bebc8
Parents: 728c4fa 814a912
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Feb 4 01:01:42 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Feb 4 01:01:42 2014 +0300

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/066d00ba/CHANGES.txt
--
diff --cc CHANGES.txt
index a1a58a3,981f977..4440942
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -77,51 -45,9 +77,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 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)
  
  
 -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)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-30 Thread jasobrown

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/b5a2b650
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5a2b650
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5a2b650

Branch: refs/heads/trunk
Commit: b5a2b65076f86ee03ccd6083a6ccafae0c4c6f1d
Parents: 81fcc33 6ad995e
Author: Jason Brown jasedbr...@gmail.com
Authored: Thu Jan 30 09:58:36 2014 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Thu Jan 30 09:58:36 2014 -0800

--

--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-28 Thread aleksey

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/d9f9c5b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9f9c5b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9f9c5b2

Branch: refs/heads/trunk
Commit: d9f9c5b21174f8599f3013d7098c35c7fa8baa82
Parents: 41ffca1 2e95a4f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Jan 28 17:23:47 2014 -0600
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Jan 28 17:23:47 2014 -0600

--
 src/java/org/apache/cassandra/db/DataTracker.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f9c5b2/src/java/org/apache/cassandra/db/DataTracker.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-28 Thread aleksey

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/479bf8a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/479bf8a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/479bf8a1

Branch: refs/heads/trunk
Commit: 479bf8a1103df7ae3fa6f260df08177b30da3452
Parents: 09ab439 d43f84b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Jan 29 00:11:49 2014 -0600
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Jan 29 00:16:05 2014 -0600

--
 CHANGES.txt |  1 +
 .../cassandra/db/ArrayBackedSortedColumns.java  |  7 -
 .../db/ArrayBackedSortedColumnsTest.java| 28 
 3 files changed, 35 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/479bf8a1/CHANGES.txt
--
diff --cc CHANGES.txt
index 8e757b2,ec546db..ac75587
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -23,29 -16,10 +23,30 @@@ Merged from 1.2
   * Improve error message when schema doesn't match loaded sstable 
(CASSANDRA-6262)
   * Add properties to adjust FD initial value and max interval (CASSANDRA-4375)
   * Fix preparing with batch and delete from collection (CASSANDRA-6607)
+  * Fix ABSC reverse iterator's remove() method (CASSANDRA-6629)
  
  
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/479bf8a1/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
--
diff --cc src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
index d2825c1,662af62..389e0f8
--- a/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
+++ b/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
@@@ -352,19 -383,21 +352,21 @@@ public class ArrayBackedSortedColumns e
  return columns.size();
  }
  
 -public IteratorIColumn iterator()
 +public IteratorColumn iterator()
  {
 -return new IteratorIColumn()
 +return new IteratorColumn()
  {
  int idx = size() - 1;
+ boolean shouldCallNext = true;
  
  public boolean hasNext()
  {
  return idx = 0;
  }
  
 -public IColumn next()
 +public Column next()
  {
+ shouldCallNext = false;
  return columns.get(idx--);
  }
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/479bf8a1/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
--
diff --cc test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
index c720d28,00455d6..06e2e75
--- a/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
+++ b/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
@@@ -165,4 -186,32 +165,32 @@@ public class ArrayBackedSortedColumnsTe
  assert name == value : Expected  + name +  but got  + value;
  }
  }
+ 
+ @Test
+ public

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-27 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/cql3/statements/BatchStatement.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bbb6eda
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bbb6eda
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bbb6eda

Branch: refs/heads/trunk
Commit: 8bbb6eda66412bdf347e302d5677538b82d26948
Parents: 1b858be 09563ab
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Jan 27 18:46:54 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Jan 27 18:46:54 2014 +0100

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bbb6eda/CHANGES.txt
--
diff --cc CHANGES.txt
index 6aa944d,c690150..6acbc87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,29 -15,10 +19,30 @@@ Merged from 1.2
   * skip blocking on streaming during drain (CASSANDRA-6603)
   * Improve error message when schema doesn't match loaded sstable 
(CASSANDRA-6262)
   * Add properties to adjust FD initial value and max interval (CASSANDRA-4375)
+  * Fix preparing with batch and delete from collection (CASSANDRA-6607)
  
  
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-23 Thread jbellis

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/7ae61784
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ae61784
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ae61784

Branch: refs/heads/trunk
Commit: 7ae617845609153cdb28a25ed7c725d03724d00c
Parents: f7f9de5 9771cea
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Jan 24 08:19:57 2014 +0900
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Jan 24 08:19:57 2014 +0900

--
 .../org/apache/cassandra/locator/AbstractReplicationStrategy.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ae61784/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-19 Thread aleksey

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/66a8a557
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a8a557
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a8a557

Branch: refs/heads/trunk
Commit: 66a8a55754a8e0dfb56bcbcf42c8cf420812dda7
Parents: 24af352 9be437b
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Jan 19 11:14:07 2014 -0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Jan 19 11:14:07 2014 -0800

--
 src/java/org/apache/cassandra/net/MessagingService.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a8a557/src/java/org/apache/cassandra/net/MessagingService.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-17 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/db/BatchlogManager.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88146236
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88146236
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88146236

Branch: refs/heads/trunk
Commit: 88146236988eb66c7396897abe66c05dd6a255f9
Parents: 14c6f70 b0b168f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Jan 17 19:40:50 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Jan 17 19:40:50 2014 +0300

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/BatchlogManager.java| 78 ++-
 .../cassandra/db/BatchlogManagerTest.java   | 82 
 3 files changed, 143 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/88146236/CHANGES.txt
--
diff --cc CHANGES.txt
index 2095be7,f550863..80bc626
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,29 -11,10 +15,30 @@@ Merged from 1.2
   * Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
   * Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
   * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
+  * Paginate batchlog replay (CASSANDRA-6569)
  
  
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/88146236/src/java/org/apache/cassandra/db/BatchlogManager.java
--
diff --cc src/java/org/apache/cassandra/db/BatchlogManager.java
index cfa049a,90dfd47..23cacca
--- a/src/java/org/apache/cassandra/db/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/db/BatchlogManager.java
@@@ -124,16 -126,23 +125,21 @@@ public class BatchlogManager implement
  
  public static RowMutation getBatchlogMutationFor(CollectionRowMutation 
mutations, UUID uuid)
  {
- long timestamp = FBUtilities.timestampMicros();
- ByteBuffer writtenAt = LongType.instance.decompose(timestamp / 1000);
+ return getBatchlogMutationFor(mutations, uuid, 
FBUtilities.timestampMicros());
+ }
+ 
+ @VisibleForTesting
+ static RowMutation getBatchlogMutationFor(CollectionRowMutation 
mutations, UUID uuid, long now)
+ {
+ ByteBuffer writtenAt = LongType.instance.decompose(now / 1000);
  ByteBuffer data = serializeRowMutations(mutations);
  
 -ColumnFamily cf = ColumnFamily.create(CFMetaData.BatchlogCf);
 +ColumnFamily cf = 
ArrayBackedSortedColumns.factory.create(CFMetaData.BatchlogCf);
- cf.addColumn(new Column(columnName(), 
ByteBufferUtil.EMPTY_BYTE_BUFFER, timestamp));
- cf.addColumn(new Column(columnName(data), data, timestamp));
- cf.addColumn(new Column(columnName(written_at), writtenAt, 
timestamp));
+ cf.addColumn(new Column(columnName(), 
ByteBufferUtil.EMPTY_BYTE_BUFFER, now));
 -cf.addColumn(new Column(columnName(written_at), writtenAt, now));
+ cf.addColumn(new Column(columnName(data), data, now));
 -RowMutation rm = new RowMutation(Table.SYSTEM_KS,

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-13 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71a5127a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71a5127a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71a5127a

Branch: refs/heads/trunk
Commit: 71a5127ae530ae2dd436db1b93b3d8e88ba42a46
Parents: 5c86f36 3405878
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Jan 13 10:33:24 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Jan 13 10:33:24 2014 +0100

--
 CHANGES.txt   |  1 +
 .../cassandra/cql3/statements/SelectStatement.java| 11 +++
 .../cassandra/service/LeaveAndBootstrapTest.java  | 14 +++---
 3 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a5127a/CHANGES.txt
--
diff --cc CHANGES.txt
index e96a8e0,25c105c..1bf5615
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -7,29 -9,10 +7,30 @@@ Merged from 1.2
   * Validate CF existence on execution for prepared statement (CASSANDRA-6535)
   * Add ability to throttle batchlog replay (CASSANDRA-6550)
   * Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
+  * Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
  
  
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/71a5127a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 133444a,001c77a..c3671be
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -798,32 -710,33 +798,35 @@@ public class SelectStatement implement
  
  ColumnNameBuilder builder = cfDef.getColumnNameBuilder();
  for (int i = 0; i  columnRestrictions.length - 1; i++)
 -
builder.add(columnRestrictions[i].eqValues.get(0).bindAndGet(variables));
 +builder.add(columnRestrictions[i].values(variables).get(0));
 +
  
 -final ListByteBuffer requested = new 
ArrayListByteBuffer(last.eqValues.size());
 -IteratorTerm iter = last.eqValues.iterator();
 +ListByteBuffer values = last.values(variables);
 +final ListByteBuffer requested = new 
ArrayListByteBuffer(values.size());
 +IteratorByteBuffer iter = values.iterator();
  while (iter.hasNext())
  {
 -Term t = iter.next();
 +ByteBuffer t = iter.next();
  ColumnNameBuilder b = iter.hasNext() ? builder.copy() : builder;
 -requested.add(b.add(t.bindAndGet(variables)).build());
 +requested.add(b.add(t).build());
  }
  
 -return new IterableIColumn()
 +return new IterableColumn()
  {
 -public IteratorIColumn iterator()
 +public IteratorColumn iterator()
  {
 -return new AbstractIteratorIColumn()
 +

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-04 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
NEWS.txt
src/java/org/apache/cassandra/db/BatchlogManager.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95f1b5f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95f1b5f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95f1b5f2

Branch: refs/heads/trunk
Commit: 95f1b5f29822fb2893dc7a100fb026729030a70e
Parents: be9a70e 2a7c20e
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Jan 5 03:18:49 2014 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Jan 5 03:18:49 2014 +0300

--
 CHANGES.txt |  1 +
 NEWS.txt| 10 +++
 conf/cassandra.yaml |  4 +++
 .../org/apache/cassandra/config/Config.java |  1 +
 .../cassandra/config/DatabaseDescriptor.java|  5 
 .../apache/cassandra/db/BatchlogManager.java| 29 +---
 6 files changed, 40 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f1b5f2/CHANGES.txt
--
diff --cc CHANGES.txt
index 7946927,5a85977..df564dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,16 +1,32 @@@
 -1.2.14
 - * 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)
 +2.0.5
 +* Delete unfinished compaction incrementally (CASSANDRA-6086)
 +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)
  
  
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f1b5f2/NEWS.txt
--
diff --cc NEWS.txt
index fdc29ad,214fd05..2e40e9c
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,13 -13,27 +13,23 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
+ 
 -1.2.14
 -==
++2.0.5
++=
+ 
 -Features
++New features
+ 
+ - Batchlog replay can be, and is throttled by default now.
+   See batchlog_replay_throttle_in_kb setting in cassandra.yaml.
+ 
+ 
 -1.2.13
 -==
 -
 -Upgrading
 --
 -- Nothing specific to this release, but please see 1.2.12 if you are 
upgrading
 -  from a previous version.
 +2.0.3
 +=
  
 -
 -1.2.12
 -==
 +New features
 +
 +- It's now possible to configure the maximum allowed size of the native
 +  protocol frames (native_transport_max_frame_size_in_mb in the yaml 
file).
  
  Upgrading
  -

http://git-wip-us.apache.org/repos/asf/cassandra/blob/95f1b5f2/conf/cassandra.yaml
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2014-01-02 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/service/ClientState.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5284e129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5284e129
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5284e129

Branch: refs/heads/trunk
Commit: 5284e129f65ed737897e06af1d79cc6ce9bc4645
Parents: 4ed2234 7171b7a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Jan 2 14:18:29 2014 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Jan 2 14:18:29 2014 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/service/ClientState.java | 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5284e129/CHANGES.txt
--
diff --cc CHANGES.txt
index 958369a,64146c1..7946927
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,15 +1,31 @@@
 -1.2.14
 - * 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)
 +2.0.5
 +* Delete unfinished compaction incrementally (CASSANDRA-6086)
 +Merged from 1.2:
   * fsync compression metadata (CASSANDRA-6531)
+  * Validate CF existence on execution for prepared statement (CASSANDRA-6535)
  
  
 -1.2.13
 +2.0.4
 + * Allow removing snapshots of no-longer-existing CFs (CASSANDRA-6418)
 + * add StorageService.stopDaemon() (CASSANDRA-4268)
 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 + * Fix assertion error in AbstractQueryPager.discardFirst (CASSANDRA-6447)
 + * Fix streaming older SSTable yields unnecessary tombstones (CASSANDRA-6527)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5284e129/src/java/org/apache/cassandra/service/ClientState.java
--
diff --cc src/java/org/apache/cassandra/service/ClientState.java
index 472fe53,87ccfda..7f312a9
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@@ -36,7 -36,7 +36,8 @@@ import org.apache.cassandra.db.SystemKe
  import org.apache.cassandra.exceptions.AuthenticationException;
  import org.apache.cassandra.exceptions.InvalidRequestException;
  import org.apache.cassandra.exceptions.UnauthorizedException;
 +import org.apache.cassandra.tracing.Tracing;
+ import org.apache.cassandra.thrift.ThriftValidation;
  import org.apache.cassandra.utils.Pair;
  import org.apache.cassandra.utils.SemanticVersion;

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-28 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/db/ColumnFamilyStore.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e0884f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e0884f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e0884f5

Branch: refs/heads/trunk
Commit: 0e0884f50338d83de7779d8b5ddd8d66e281586b
Parents: 6a211f4 8a51a72
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Dec 28 20:58:55 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Dec 28 20:58:55 2013 +0300

--
 .../apache/cassandra/db/ColumnFamilyStore.java  | 23 ++--
 1 file changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e0884f5/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index a04c9e2,3841397..cbd9d2e
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -340,6 -300,16 +331,16 @@@ public class ColumnFamilyStore implemen
  // this shouldn't block anything.
  logger.warn(Failed unregistering mbean:  + mbeanName, e);
  }
+ 
+ compactionStrategy.shutdown();
+ 
 -SystemTable.removeTruncationRecord(metadata.cfId);
++SystemKeyspace.removeTruncationRecord(metadata.cfId);
+ data.unreferenceSSTables();
+ indexManager.invalidate();
+ 
+ for (RowCacheKey key : CacheService.instance.rowCache.getKeySet())
+ if (key.cfId == metadata.cfId)
+ invalidateCachedRow(key);
  }
  
  /**

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-19 Thread aleksey

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/d9dac014
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9dac014
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9dac014

Branch: refs/heads/trunk
Commit: d9dac014ecea13bf52071c2d27d974c811d02a9f
Parents: 4a6f8a6 38642c5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Dec 19 16:57:14 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Dec 19 16:57:14 2013 +0300

--
 CHANGES.txt |  3 +-
 .../cassandra/config/DatabaseDescriptor.java|  1 +
 .../apache/cassandra/service/StorageProxy.java  | 42 ++--
 3 files changed, 42 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9dac014/CHANGES.txt
--
diff --cc CHANGES.txt
index d6223be,3488cde..622a1a9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,10 +1,19 @@@
 -1.2.14
 - * 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)
 -
 -1.2.13
 +2.0.4
 + * add client encryption support to sstableloader (CASSANDRA-6378)
 + * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
 + * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
 + * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
 + * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
 + * Fix cleanup ClassCastException (CASSANDRA-6462)
 + * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
 + * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add millisecond precision formats to the timestamp parser (CASSANDRA-6395)
 + * Expose a total memtable size metric for a CF (CASSANDRA-6391)
 + * cqlsh: handle symlinks properly (CASSANDRA-6425)
-  * Don't resubmit counter mutation runnables internally (CASSANDRA-6427)
 + * Fix potential infinite loop when paging query with IN (CASSANDRA-6464)
 +Merged from 1.2:
   * Improved error message on bad properties in DDL queries (CASSANDRA-6453)
   * Randomize batchlog candidates selection (CASSANDRA-6481)
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345, 6485)
@@@ -31,47 -25,9 +30,49 @@@
 (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)
  
  
 -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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-18 Thread slebresne

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/f7255b5f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7255b5f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7255b5f

Branch: refs/heads/cassandra-2.0
Commit: f7255b5ffa2edb30e909220ccc3f7308b9f65475
Parents: 53af91e 079f1e8
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Dec 18 11:15:30 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Dec 18 11:15:30 2013 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/cql3/CFPropDefs.java | 5 +
 src/java/org/apache/cassandra/cql3/KSPropDefs.java | 5 +
 3 files changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7255b5f/CHANGES.txt
--
diff --cc CHANGES.txt
index b8757d7,5086440..80ed481
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -29,45 -22,9 +29,46 @@@ 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)
  
  
 -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/f7255b5f/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7255b5f/src/java/org/apache/cassandra/cql3/KSPropDefs.java
--
diff --cc src/java/org/apache/cassandra/cql3/KSPropDefs.java
index c10a79b,e2b0de8..12fbc51
--- a/src/java/org/apache/cassandra/cql3/KSPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/KSPropDefs.java
@@@ -40,8 -42,13 +40,13 @@@ public class KSPropDefs extends Propert
  
  private String strategyClass;
  
 -public void validate() throws ConfigurationException, SyntaxException
 +public void validate() throws SyntaxException
  {
+ // Skip validation if the strategy class is already set as it means 
we've alreayd
+ // prepared (and redoing it would set strategyClass back to null, 
which we don't want)
+ if (strategyClass != null)
+

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-18 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/service/ReadCallback.java
src/java/org/apache/cassandra/service/StorageProxy.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1727ea77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1727ea77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1727ea77

Branch: refs/heads/trunk
Commit: 1727ea773324b9a8afd41b5d5d238aee1dd8f441
Parents: 7c32ffb b73178d
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Dec 18 13:51:23 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Dec 18 13:51:23 2013 +0100

--
 CHANGES.txt  |  1 +
 .../cassandra/service/AbstractWriteResponseHandler.java  | 11 ++-
 src/java/org/apache/cassandra/service/ReadCallback.java  |  4 
 src/java/org/apache/cassandra/service/StorageProxy.java  |  4 ++--
 4 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1727ea77/CHANGES.txt
--
diff --cc CHANGES.txt
index 5a124ab,a1514d0..10c9c33
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,46 -23,9 +30,47 @@@ 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)
  
  
 -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/1727ea77/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1727ea77/src/java/org/apache/cassandra/service/ReadCallback.java
--
diff --cc src/java/org/apache/cassandra/service/ReadCallback.java
index d4cc7f5,7889039..d665242
--- a/src/java/org/apache/cassandra/service/ReadCallback.java
+++ b/src/java/org/apache/cassandra/service/ReadCallback.java
@@@ -89,16 -95,14 +89,20 @@@ public class ReadCallbackTMessage, TRe
  {
  throw new AssertionError(ex);
  }
 +}
  
 -

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-17 Thread aleksey

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/22d87444
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22d87444
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22d87444

Branch: refs/heads/trunk
Commit: 22d87444cef2a0fe4f9a01eea313526e69c70521
Parents: 3590275 13348c4
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Dec 17 18:26:10 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Dec 17 18:26:10 2013 +0300

--
 .../apache/cassandra/locator/TokenMetadata.java   | 18 --
 1 file changed, 4 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/22d87444/src/java/org/apache/cassandra/locator/TokenMetadata.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-17 Thread jasobrown

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/cassandra-2.0
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

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-15 Thread aleksey

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/bdff106a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bdff106a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bdff106a

Branch: refs/heads/trunk
Commit: bdff106aa9698849ba4a82d8a19715e2dbbb7f62
Parents: bb09d3c 4be9e67
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Dec 15 13:36:18 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Dec 15 13:36:18 2013 +0300

--
 CHANGES.txt |  1 +
 .../locator/AbstractReplicationStrategy.java| 35 --
 .../apache/cassandra/locator/TokenMetadata.java | 35 +-
 .../apache/cassandra/service/StorageProxy.java  | 39 +---
 4 files changed, 53 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdff106a/CHANGES.txt
--
diff --cc CHANGES.txt
index a54231e,b55393b..89ef6e1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -25,46 -17,10 +25,47 @@@ Merged from 1.2
 (CASSANDRA-6413)
   * (Hadoop) add describe_local_ring (CASSANDRA-6268)
   * Fix handling of concurrent directory creation failure (CASSANDRA-6459)
 + * Randomize batchlog candidates selection (CASSANDRA-6481)
+  * Improve batchlog write performance with vnodes (CASSANDRA-6488)
  
  
 -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/bdff106a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdff106a/src/java/org/apache/cassandra/locator/TokenMetadata.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdff106a/src/java/org/apache/cassandra/service/StorageProxy.java
--
diff --cc src/java/org/apache/cassandra/service/StorageProxy.java
index 9957a37,376edb6..7f97da9
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@@ -767,30 -415,32 +768,32 @@@ public class StorageProxy implements St
   * - replicas

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-12 Thread aleksey

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/e6eb5506
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6eb5506
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6eb5506

Branch: refs/heads/trunk
Commit: e6eb5506ae82cf7f6558e3b39fccbb3a7b90cce0
Parents: ca7335e f7c9144
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Dec 12 21:16:53 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Dec 12 21:16:53 2013 +0300

--

--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-07 Thread aleksey

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/3c15ff2e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c15ff2e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c15ff2e

Branch: refs/heads/trunk
Commit: 3c15ff2e44aa06491366eb4a4a4021c9ba4e535b
Parents: f2a82ee 510eabf
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Dec 7 13:31:37 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Dec 7 13:31:37 2013 +0300

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/db/Directories.java|  2 +-
 .../apache/cassandra/db/DirectoriesTest.java| 22 
 3 files changed, 24 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c15ff2e/CHANGES.txt
--
diff --cc CHANGES.txt
index fc512cd,6f5f23b..e72e5d2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,45 -15,10 +20,46 @@@ Merged from 1.2
   * Fix cache persistence when both row and key cache are enabled 
 (CASSANDRA-6413)
   * (Hadoop) add describe_local_ring (CASSANDRA-6268)
+  * Fix handling of concurrent directory creation failure (CASSANDRA-6459)
  
  
 -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/3c15ff2e/src/java/org/apache/cassandra/db/Directories.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c15ff2e/test/unit/org/apache/cassandra/db/DirectoriesTest.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-07 Thread aleksey

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/2ccb3da7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ccb3da7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ccb3da7

Branch: refs/heads/trunk
Commit: 2ccb3da7cd238110403d03bfebe46d6e4ed1be23
Parents: 3c15ff2 faa9d51
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Dec 7 13:55:59 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Dec 7 13:55:59 2013 +0300

--
 test/unit/org/apache/cassandra/db/DirectoriesTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ccb3da7/test/unit/org/apache/cassandra/db/DirectoriesTest.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-04 Thread marcuse

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/32dbe582
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32dbe582
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32dbe582

Branch: refs/heads/trunk
Commit: 32dbe58254115b8a92a97e95566bb4374bb9c051
Parents: 1334f94 d8c4e89
Author: Marcus Eriksson marc...@spotify.com
Authored: Wed Dec 4 20:17:38 2013 +0100
Committer: Marcus Eriksson marc...@spotify.com
Committed: Wed Dec 4 20:17:38 2013 +0100

--
 test/unit/org/apache/cassandra/service/MoveTest.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/32dbe582/test/unit/org/apache/cassandra/service/MoveTest.java
--
diff --cc test/unit/org/apache/cassandra/service/MoveTest.java
index f239671,07a9590..6ecd500
--- a/test/unit/org/apache/cassandra/service/MoveTest.java
+++ b/test/unit/org/apache/cassandra/service/MoveTest.java
@@@ -197,12 -198,13 +198,13 @@@ public class MoveTes
  ss.onChange(boot2,
  ApplicationState.STATUS,
  
valueFactory.bootstrapping(Collections.Tokensingleton(keyTokens.get(7;
+ PendingRangeCalculatorService.instance.blockUntilFinished();
  
  // don't require test update every time a new keyspace is added to 
test/conf/cassandra.yaml
 -MapString, AbstractReplicationStrategy tableStrategyMap = new 
HashMapString, AbstractReplicationStrategy();
 +MapString, AbstractReplicationStrategy keyspaceStrategyMap = new 
HashMapString, AbstractReplicationStrategy();
  for (int i = 1; i = 4; i++)
  {
 -tableStrategyMap.put(Keyspace + i, getStrategy(Keyspace + i, 
tmd));
 +keyspaceStrategyMap.put(Keyspace + i, getStrategy(Keyspace + 
i, tmd));
  }
  
 /**

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-03 Thread slebresne

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/cassandra-2.0
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/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-12-02 Thread slebresne

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/e4fc8771
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4fc8771
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4fc8771

Branch: refs/heads/trunk
Commit: e4fc8771e1b3ff3e3598cf1ebcd88084fc2f1ded
Parents: b687195 f393504
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Dec 2 09:24:54 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Dec 2 09:24:54 2013 +0100

--
 CHANGES.txt |  1 +
 .../transport/RequestThreadPoolExecutor.java| 31 ++--
 2 files changed, 29 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4fc8771/CHANGES.txt
--
diff --cc CHANGES.txt
index 4e77faa,2119f77..bdd6da4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,44 -3,13 +10,45 @@@ Merged from 1.2
   * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
   * Improve gossip performance for typical messages (CASSANDRA-6409)
   * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
+  * Expose Thread metrics for the native protocol server (CASSANDRA-6234)
  
  
 -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)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-28 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/cql3/QueryProcessor.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43e61e8a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43e61e8a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43e61e8a

Branch: refs/heads/trunk
Commit: 43e61e8af704b3353c354629254fb7c16e6a218a
Parents: 28658dd a322b64
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Nov 28 09:10:16 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Nov 28 09:10:16 2013 +0100

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/cql3/QueryProcessor.java | 6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/43e61e8a/CHANGES.txt
--
diff --cc CHANGES.txt
index 2bafb90,f84ffec..bd8dd1c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,14 +1,50 @@@
 -1.2.13
 +2.0.4
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
 +Merged from 1.2:
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345)
 - * 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)
   * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
   * Improve gossip performance for typical messages (CASSANDRA-6409)
+  * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
  
  
 -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/43e61e8a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 2a18230,a62b248..335da4b
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -286,16 -218,12 +286,20 @@@ public class QueryProcesso
  throws RequestValidationException
  {
  ParsedStatement.Prepared prepared =

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-27 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/tools/SSTableImport.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8ec971b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ec971b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ec971b8

Branch: refs/heads/trunk
Commit: 8ec971b89a256dc33cde366229f2bfbe67fd4109
Parents: 4fae76c 69c1ee9
Author: Aleksey Yeschenko alek...@apache.org
Authored: Thu Nov 28 05:16:06 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Thu Nov 28 05:16:06 2013 +0300

--
 src/java/org/apache/cassandra/tools/SSTableImport.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ec971b8/src/java/org/apache/cassandra/tools/SSTableImport.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-27 Thread dbrosius

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/28658ddb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28658ddb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28658ddb

Branch: refs/heads/trunk
Commit: 28658ddb207d344f212fc81bc1cc0079398bf93a
Parents: 8ec971b 4bdd7f8
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Wed Nov 27 23:57:57 2013 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Wed Nov 27 23:57:57 2013 -0500

--
 src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28658ddb/src/java/org/apache/cassandra/dht/BootStrapper.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-25 Thread aleksey

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/6c68b30f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c68b30f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c68b30f

Branch: refs/heads/trunk
Commit: 6c68b30fef95f8f4a621969f5d0434bc2326c2e2
Parents: 5eaa216 fce1735
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Nov 26 02:30:00 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Nov 26 02:30:00 2013 +0300

--
 doc/cql3/CQL.textile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c68b30f/doc/cql3/CQL.textile
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-24 Thread aleksey

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/5eaa2164
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5eaa2164
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5eaa2164

Branch: refs/heads/trunk
Commit: 5eaa2164e168b0d3a02d3fa4310c3e051a5cac5e
Parents: 9aebf9d aec8f16
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sun Nov 24 21:54:57 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sun Nov 24 21:54:57 2013 +0300

--
 CHANGES.txt  | 2 ++
 pylib/cqlshlib/formatting.py | 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5eaa2164/CHANGES.txt
--
diff --cc CHANGES.txt
index 46f592e,57c1896..34dc7a5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,11 +1,47 @@@
 -1.2.13
 - * 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)
 +2.0.4
 + * Fix divide-by-zero in PCI (CASSANDRA-6403)
 + * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
 + * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
++Merged from 1.2:
+  * cqlsh: quote single quotes in strings inside collections (CASSANDRA-6172)
  
  
 -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/5eaa2164/pylib/cqlshlib/formatting.py
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-18 Thread dbrosius

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/ade99b91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ade99b91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ade99b91

Branch: refs/heads/trunk
Commit: ade99b918f8902b735219f2b2434cca2cccf7698
Parents: fd6 b678035
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Nov 18 21:32:46 2013 -0500
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Nov 18 21:32:46 2013 -0500

--
 src/java/org/apache/cassandra/dht/Murmur3Partitioner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ade99b91/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-18 Thread slebresne

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/f6515673
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6515673
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6515673

Branch: refs/heads/trunk
Commit: f65156733a11e05e313d9e0a53edf5bf3b120180
Parents: ade99b9 582a16e
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Nov 19 08:31:53 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Nov 19 08:31:53 2013 +0100

--

--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-15 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/db/ConsistencyLevel.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09b2470b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09b2470b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09b2470b

Branch: refs/heads/trunk
Commit: 09b2470b33c47d14e4f6ef6befd4eb8f9ec5aacf
Parents: 6fe83cd 9d7b567
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Nov 15 15:41:38 2013 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Nov 15 15:41:38 2013 +0100

--
 CHANGES.txt| 2 ++
 src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/09b2470b/CHANGES.txt
--
diff --cc CHANGES.txt
index 17e97d5,9ee6657..b6d2e73
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -42,42 -18,11 +42,44 @@@ Merged from 1.2
   * Fix missing one row in reverse query (CASSANDRA-6330)
   * Fix reading expired row value from row cache (CASSANDRA-6325)
   * Fix AssertionError when doing set element deletion (CASSANDRA-6341)
+  * Make CL code for the native protocol match the one in C* 2.0
+(CASSANDRA-6347)
  
  
 -1.2.11
 +2.0.2
 + * Update FailureDetector to use nanontime (CASSANDRA-4925)
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows 
(CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full 
startup (CASSANDRA-6166)
 + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
 + * Add reloadtriggers command to nodetool (CASSANDRA-4949)
 + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
 + * Fix sstable loader (CASSANDRA-6205)
 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
 + * Fix NPE while loading paxos state (CASSANDRA-6211)
 + * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228)
 +Merged from 1.2:
 + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
   * Add a warning for small LCS sstable size (CASSANDRA-6191)
   * Add ability to list specific KS/CF combinations in nodetool cfstats 
(CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty 
(CASSANDRA-5946)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/09b2470b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
--
diff --cc src/java/org/apache/cassandra/db/ConsistencyLevel.java
index 4fffc8a,4d72767..cbb4bb1
--- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java
+++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
@@@ -37,7 -37,7 +37,6 @@@ import org.apache.cassandra.locator.Abs
  import org.apache.cassandra.locator.NetworkTopologyStrategy;
  import org.apache.cassandra.transport.ProtocolException;
  
--
  public enum ConsistencyLevel
  {
  ANY (0),

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-08 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
pylib/cqlshlib/tracing.py


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5522a18a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5522a18a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5522a18a

Branch: refs/heads/trunk
Commit: 5522a18a72ac9de3c77a7a96e3412a00bb6d1d74
Parents: d52e7e6 3102765
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Nov 9 03:07:03 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Nov 9 03:07:03 2013 +0300

--
 CHANGES.txt   | 1 +
 pylib/cqlshlib/tracing.py | 9 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5522a18a/CHANGES.txt
--
diff --cc CHANGES.txt
index 6ff2799,0532a45..6f28e88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,42 -13,10 +32,43 @@@ Merged from 1.2
   * Remove blocking flushes in gossip thread (CASSANDRA-6297)
   * Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
   * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238)
+  * cqlsh: handle 'null' as session duration (CASSANDRA-6317)
  
  
 -1.2.11
 +2.0.2
 + * Update FailureDetector to use nanontime (CASSANDRA-4925)
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows 
(CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full 
startup (CASSANDRA-6166)
 + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
 + * Add reloadtriggers command to nodetool (CASSANDRA-4949)
 + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
 + * Fix sstable loader (CASSANDRA-6205)
 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
 + * Fix NPE while loading paxos state (CASSANDRA-6211)
 + * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228)
 +Merged from 1.2:
 + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
   * Add a warning for small LCS sstable size (CASSANDRA-6191)
   * Add ability to list specific KS/CF combinations in nodetool cfstats 
(CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty 
(CASSANDRA-5946)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5522a18a/pylib/cqlshlib/tracing.py
--
diff --cc pylib/cqlshlib/tracing.py
index 02d3296,3dc0ba7..fe0f71e
--- a/pylib/cqlshlib/tracing.py
+++ b/pylib/cqlshlib/tracing.py
@@@ -45,11 -42,7 +45,10 @@@ def fetch_trace_session(cursor, session
 FROM %s.%s 
 WHERE session_id = %s % (TRACING_KS, SESSIONS_CF, 
session_id),
 consistency_level='ONE')
 -(request, coordinator, started_at, duration) = cursor.fetchone()
 +session = cursor.fetchone()
 +if not session:
 +return []
 +(request, coordinator, started_at, duration) = session
- 
  cursor.execute(SELECT activity, event_id, source, source_elapsed 
 FROM %s.%s 
 WHERE session_id = %s % (TRACING_KS, EVENTS_CF, 
session_id),

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-07 Thread aleksey

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/00a68398
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00a68398
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00a68398

Branch: refs/heads/trunk
Commit: 00a68398f576a0cb32dd7f1435ff1b7808256dea
Parents: 66df206 eb57745
Author: Aleksey Yeschenko alek...@apache.org
Authored: Fri Nov 8 00:54:29 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Fri Nov 8 00:54:29 2013 +0300

--
 src/java/org/apache/cassandra/db/context/CounterContext.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a68398/src/java/org/apache/cassandra/db/context/CounterContext.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-11-06 Thread jasobrown

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/db/ConsistencyLevel.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e9906e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e9906e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e9906e6

Branch: refs/heads/trunk
Commit: 0e9906e6d068f6236996093220563dc8cee54ed6
Parents: b402097 e5715f4
Author: Jason Brown jasedbr...@gmail.com
Authored: Wed Nov 6 22:08:12 2013 -0800
Committer: Jason Brown jasedbr...@gmail.com
Committed: Wed Nov 6 22:08:12 2013 -0800

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/db/ConsistencyLevel.java | 6 --
 2 files changed, 1 insertion(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e9906e6/CHANGES.txt
--
diff --cc CHANGES.txt
index 4a1fd05,d27c495..77749d6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,42 -12,10 +30,43 @@@ Merged from 1.2
   * make calculatePendingRanges asynchronous (CASSANDRA-6244)
   * Remove blocking flushes in gossip thread (CASSANDRA-6297)
   * Fix potential socket leak in connectionpool creation (CASSANDRA-6308)
+  * Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleSrrategy (CASSANDRA-6238)
  
  
 -1.2.11
 +2.0.2
 + * Update FailureDetector to use nanontime (CASSANDRA-4925)
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows 
(CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full 
startup (CASSANDRA-6166)
 + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
 + * Add reloadtriggers command to nodetool (CASSANDRA-4949)
 + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
 + * Fix sstable loader (CASSANDRA-6205)
 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
 + * Fix NPE while loading paxos state (CASSANDRA-6211)
 + * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228)
 +Merged from 1.2:
 + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
   * Add a warning for small LCS sstable size (CASSANDRA-6191)
   * Add ability to list specific KS/CF combinations in nodetool cfstats 
(CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty 
(CASSANDRA-5946)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e9906e6/src/java/org/apache/cassandra/db/ConsistencyLevel.java
--
diff --cc src/java/org/apache/cassandra/db/ConsistencyLevel.java
index 5f17907,25fb25b..4fffc8a
--- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java
+++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
@@@ -286,46 -280,10 +282,44 @@@ public enum ConsistencyLeve
  }
  }
  
 -public void validateForWrite(String table) throws InvalidRequestException
 +public void validateForWrite(String keyspaceName) throws 
InvalidRequestException
  {
 -if(this == EACH_QUORUM)
 -requireNetworkTopologyStrategy(table);
 +switch (this)
 +{
 +case LOCAL_QUORUM:
 +case EACH_QUORUM:
 +case LOCAL_ONE:
 +requireNetworkTopologyStrategy(keyspaceName);
 +break;
 +case SERIAL:
 +case LOCAL_SERIAL:
 +throw

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-28 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
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/fcd657cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fcd657cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fcd657cd

Branch: refs/heads/trunk
Commit: fcd657cde77c6a8dd2a2accba614e4055be0ab92
Parents: 46f7186 47896c8
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Oct 28 16:27:28 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Oct 28 16:27:28 2013 +0300

--
 CHANGES.txt |  2 ++
 .../org/apache/cassandra/thrift/CassandraServer.java| 12 
 2 files changed, 10 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd657cd/CHANGES.txt
--
diff --cc CHANGES.txt
index 0ba6584,8d47047..0d60fae
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,14 +1,48 @@@
 -1.2.12
 - * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
 - * Fix altering column types (CASSANDRA-6185)
 - * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
 - * add windows bat files for shell commands (CASSANDRA-6145)
 - * Fix potential stack overflow during range tombstones insertion 
(CASSANDRA-6181)
 - * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214)
 +2.0.3
 + * 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)
++Merged from 1.2:
+  * Require logging in for Thrift CQL2/3 statement preparation (CASSANDRA-6254)
  
  
 -1.2.11
 +2.0.2
 + * Update FailureDetector to use nanontime (CASSANDRA-4925)
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932, CASSANDRA-6194)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows 
(CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full 
startup (CASSANDRA-6166)
 + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
 + * Add reloadtriggers command to nodetool (CASSANDRA-4949)
 + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
 + * Fix sstable loader (CASSANDRA-6205)
 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
 + * Fix NPE while loading paxos state (CASSANDRA-6211)
 + * cqlsh: add SHOW SESSION tracing-session command (CASSANDRA-6228)
 +Merged from 1.2:
 + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
   * Add a warning for small LCS sstable size (CASSANDRA-6191)
   * Add ability to list specific KS/CF combinations in nodetool cfstats 
(CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty 
(CASSANDRA-5946)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fcd657cd/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index a8ee93c,9063be1..d52eb76
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-24 Thread dbrosius

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/3dc4e656
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dc4e656
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dc4e656

Branch: refs/heads/trunk
Commit: 3dc4e656370103ee616288a536f7758712b1ef91
Parents: 8bdd473 08a2272
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Fri Oct 25 00:19:11 2013 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Fri Oct 25 00:19:11 2013 -0400

--
 bin/cqlsh.bat | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dc4e656/bin/cqlsh.bat
--
diff --cc bin/cqlsh.bat
index 36023ea,a61df21..79adcff
--- a/bin/cqlsh.bat
+++ b/bin/cqlsh.bat
@@@ -1,21 -1,30 +1,33 @@@
  @REM
 -@REM  Licensed to the Apache Software Foundation (ASF) under one or more
 -@REM  contributor license agreements.  See the NOTICE file distributed with
 -@REM  this work for additional information regarding copyright ownership.
 -@REM  The ASF licenses this file to You under the Apache License, Version 2.0
 -@REM  (the License); you may not use this file except in compliance with
 -@REM  the License.  You may obtain a copy of the License at
 +@REM Licensed to the Apache Software Foundation (ASF) under one or more
 +@REM contributor license agreements. See the NOTICE file distributed with
 +@REM this work for additional information regarding copyright ownership.
 +@REM The ASF licenses this file to You under the Apache License, Version 2.0
 +@REM (the License); you may not use this file except in compliance with
 +@REM the License. You may obtain a copy of the License at
  @REM
 -@REM  http://www.apache.org/licenses/LICENSE-2.0
 +@REM http://www.apache.org/licenses/LICENSE-2.0
  @REM
 -@REM  Unless required by applicable law or agreed to in writing, software
 -@REM  distributed under the License is distributed on an AS IS BASIS,
 -@REM  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 -@REM  See the License for the specific language governing permissions and
 -@REM  limitations under the License.
 +@REM Unless required by applicable law or agreed to in writing, software
 +@REM distributed under the License is distributed on an AS IS BASIS,
 +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 +@REM See the License for the specific language governing permissions and
 +@REM limitations under the License.
 +
 +@echo off
  
- set DSDIR=%~dp0..
+ if %OS% == Windows_NT setlocal
+ 
+ python -V nul 21
+ if ERRORLEVEL 1 goto err
+ 
+ python %~dp0\cqlsh %*
+ goto finally
+ 
+ :err
+ echo Can't detect Python version!
+ 
+ :finally
+ 
+ ENDLOCAL
 +
- %DSDIR%\python\python.exe %DSDIR%\apache-cassandra\bin\cqlsh %*

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-23 Thread slebresne

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/f8027ed8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f8027ed8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f8027ed8

Branch: refs/heads/trunk
Commit: f8027ed8c81efa99b34b75a76deb774929039230
Parents: e30810e f388a2e
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Oct 23 10:22:12 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Oct 23 10:22:12 2013 +0200

--
 build.xml | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f8027ed8/build.xml
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-22 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
bin/cqlsh


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dfb97657
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dfb97657
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dfb97657

Branch: refs/heads/trunk
Commit: dfb976573dce07f856c7018c4b6f9b15dc604776
Parents: e7ec65f 12413ad
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Oct 22 14:29:54 2013 +0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Oct 22 14:29:54 2013 +0800

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dfb97657/CHANGES.txt
--
diff --cc CHANGES.txt
index 40d752c,4d07d78..e89ca41
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,10 +1,33 @@@
 -1.2.12
 +2.0.2
 + * Update FailureDetector to use nanontime (CASSANDRA-4925)
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows 
(CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full 
startup (CASSANDRA-6166)
 + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
 + * Add reloadtriggers command to nodetool (CASSANDRA-4949)
 + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
-  * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
 +Merged from 1.2:
   * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
 - * Fix altering column types (CASSANDRA-6185)
 - * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
 -
 -
 -1.2.11
   * Add a warning for small LCS sstable size (CASSANDRA-6191)
   * Add ability to list specific KS/CF combinations in nodetool cfstats 
(CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty 
@@@ -62,44 -37,9 +61,45 @@@
   * Fix validation of empty column names for compact tables (CASSANDRA-6152)
   * Skip replaying mutations that pass CRC but fail to deserialize 
(CASSANDRA-6183)
   * Rework token replacement to use replace_address (CASSANDRA-5916)
 + * Fix altering column types (CASSANDRA-6185)
++ * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-22 Thread dbrosius

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/e30810eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e30810eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e30810eb

Branch: refs/heads/trunk
Commit: e30810ebb4f52aca58abc9a2cbfbc766c62aaba4
Parents: ebd50ff de52661
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Tue Oct 22 21:25:34 2013 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Tue Oct 22 21:25:34 2013 -0400

--
 CHANGES.txt |  7 +++--
 bin/cqlsh.bat   |  5 
 bin/debug-cql.bat   | 61 
 bin/sstableloader.bat   | 61 
 bin/sstablemetadata.bat | 33 
 bin/sstablescrub.bat| 61 
 bin/sstablesplit.bat| 61 
 bin/sstableupgrade.bat  | 61 
 8 files changed, 348 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e30810eb/CHANGES.txt
--
diff --cc CHANGES.txt
index d60cff1,bb40dff..1cb580d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,11 +1,41 @@@
 -1.2.12
 - * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
 +2.0.3
 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
- 
- 
++Merged from 1.2:
+  * Fix altering column types (CASSANDRA-6185)
+  * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196)
+  * add windows bat files for shell commands (CASSANDRA-6145)
 -
 -
 -1.2.11
++ 
 +2.0.2
 + * Update FailureDetector to use nanontime (CASSANDRA-4925)
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows 
(CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full 
startup (CASSANDRA-6166)
 + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212)
 + * Add reloadtriggers command to nodetool (CASSANDRA-4949)
 + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
 + * Fix sstable loader (CASSANDRA-6205)
 +Merged from 1.2:
 + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
   * Add a warning for small LCS sstable size (CASSANDRA-6191)
   * Add ability to list specific KS/CF combinations in nodetool cfstats 
(CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty 
(CASSANDRA-5946)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-21 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/config/ColumnDefinition.java
src/java/org/apache/cassandra/db/marshal/CompositeType.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c542623
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c542623
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c542623

Branch: refs/heads/trunk
Commit: 5c54262336430ee2fdca2eb5df6cdff525abf78b
Parents: edd1226 189a607
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Oct 21 10:15:59 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Oct 21 10:15:59 2013 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/config/ColumnDefinition.java  |  4 +--
 .../cql3/statements/AlterTableStatement.java| 35 
 .../cassandra/db/marshal/AbstractType.java  | 14 +++-
 .../apache/cassandra/db/marshal/BytesType.java  |  7 
 .../cassandra/db/marshal/CompositeType.java | 24 ++
 6 files changed, 76 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c542623/CHANGES.txt
--
diff --cc CHANGES.txt
index 351c625,117a200..02bbc1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -60,43 -36,9 +60,44 @@@ Merged from 1.2
   * Fix validation of empty column names for compact tables (CASSANDRA-6152)
   * Skip replaying mutations that pass CRC but fail to deserialize 
(CASSANDRA-6183)
   * Rework token replacement to use replace_address (CASSANDRA-5916)
++ * Fix altering column types (CASSANDRA-6185)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c542623/src/java/org/apache/cassandra/config/ColumnDefinition.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c542623/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c542623/src/java/org/apache/cassandra/db/marshal/AbstractType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c542623/src/java/org/apache/cassandra/db/marshal/BytesType.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-21 Thread aleksey

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/0c5f05bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c5f05bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c5f05bd

Branch: refs/heads/trunk
Commit: 0c5f05bd966edfdfdb78baa31dd57e1a90488227
Parents: 20f1b81 7e057f5
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Oct 22 00:27:56 2013 +0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Oct 22 00:27:56 2013 +0800

--
 src/java/org/apache/cassandra/db/BatchlogManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c5f05bd/src/java/org/apache/cassandra/db/BatchlogManager.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-21 Thread dbrosius

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/e7ec65f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7ec65f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7ec65f6

Branch: refs/heads/trunk
Commit: e7ec65f6625357302ef09f3f940aef12dcab7faa
Parents: c4c8bca a9b403e
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Mon Oct 21 18:55:04 2013 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Mon Oct 21 18:55:04 2013 -0400

--
 .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7ec65f6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index bcf9422,d26a072..310ddfb
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -548,14 -573,16 +548,13 @@@ public class CompactionManager implemen
  
  long totalkeysWritten = 0;
  
 -int expectedBloomFilterSize = 
Math.max(DatabaseDescriptor.getIndexInterval(),
 -   
(int)(SSTableReader.getApproximateKeyCount(Arrays.asList(sstable;
 +int expectedBloomFilterSize = 
Math.max(cfs.metadata.getIndexInterval(),
 +   (int) 
(SSTableReader.getApproximateKeyCount(Arrays.asList(sstable), cfs.metadata)));
  if (logger.isDebugEnabled())
 -  logger.debug(Expected bloom filter size :  + 
expectedBloomFilterSize);
 -
 -SSTableWriter writer = null;
 -SSTableReader newSstable = null;
 +logger.debug(Expected bloom filter size :  + 
expectedBloomFilterSize);
  
  logger.info(Cleaning up  + sstable);
- // Calculate the expected compacted filesize
- long expectedRangeFileSize = 
cfs.getExpectedCompactedFileSize(Arrays.asList(sstable), OperationType.CLEANUP);
+ 
  File compactionFileLocation = 
cfs.directories.getDirectoryForNewSSTables();
  if (compactionFileLocation == null)
  throw new IOException(disk full);

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-20 Thread dbrosius

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/1187c7aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1187c7aa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1187c7aa

Branch: refs/heads/trunk
Commit: 1187c7aa0aa609cfef1a15227d55b8c46eb59633
Parents: d00a233 df188cc
Author: Dave Brosius dbros...@mebigfatguy.com
Authored: Sun Oct 20 22:25:15 2013 -0400
Committer: Dave Brosius dbros...@mebigfatguy.com
Committed: Sun Oct 20 22:25:15 2013 -0400

--
 src/java/org/apache/cassandra/gms/TokenSerializer.java | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1187c7aa/src/java/org/apache/cassandra/gms/TokenSerializer.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-17 Thread jasobrown

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
NEWS.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a15d57b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a15d57b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a15d57b7

Branch: refs/heads/trunk
Commit: a15d57b7d068dc1b3e5b024f26afb28a3905f08e
Parents: 20d91b0 bcb9edc
Author: Jason Brown jasedbr...@gmail.com
Authored: Thu Oct 17 14:18:35 2013 -0700
Committer: Jason Brown jasedbr...@gmail.com
Committed: Thu Oct 17 14:18:35 2013 -0700

--
 CHANGES.txt | 1 +
 NEWS.txt| 2 ++
 2 files changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a15d57b7/CHANGES.txt
--
diff --cc CHANGES.txt
index aa7ad66,0435d4e..ad38cd3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,7 +1,31 @@@
 -1.2.12
 +2.0.2
 + * Fix FileCacheService regressions (CASSANDRA-6149)
 + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032)
 + * Fix race conditions in bulk loader (CASSANDRA-6129)
 + * Add configurable metrics reporting (CASSANDRA-4430)
 + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117)
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
 + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098)
 + * Delete can potentially be skipped in batch (CASSANDRA-6115)
 + * Allow alter keyspace on system_traces (CASSANDRA-6016)
 + * Disallow empty column names in cql (CASSANDRA-6136)
 + * Use Java7 file-handling APIs and fix file moving on Windows 
(CASSANDRA-5383)
 + * Save compaction history to system keyspace (CASSANDRA-5078)
 + * Fix NPE if StorageService.getOperationMode() is executed before full 
startup (CASSANDRA-6166)
 +Merged from 1.2:
   * Add ability to list specific KS/CF combinations in nodetool cfstats 
(CASSANDRA-4191)
   * Mark CF clean if a mutation raced the drop and got it marked dirty 
+  * Add a LOCAL_ONE consistency level (CASSANDRA-6202)
  
  
  1.2.11

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a15d57b7/NEWS.txt
--
diff --cc NEWS.txt
index da52382,000986f..3fa0c8d
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -14,22 -14,15 +14,24 @@@ restore snapshots created with the prev
  using the provided 'sstableupgrade' tool.
  
  
 -1.2.12
 -==
 -Features
 -
 +2.0.2
 +=
 +
 +New features
 +
 +- Speculative retry defaults to 99th percentile
 +  (See blog post at 
http://www.datastax.com/dev/blog/rapid-read-protection-in-cassandra-2-0-2)
 +- Configurable metrics reporting
 +  (see conf/metrics-reporter-config-sample.yaml)
 +- Compaction history and stats are now saved to system keyspace
 +  (system.compaction_history table). You can access historiy via
 +  new 'nodetool compactionhistory' command or CQL.
+ - Added a new consistenct level, LOCAL_ONE, that forces all CL.ONE 
operations to
+   execute only in the local datacenter.
  
 -1.2.11
 -==
 +
 +2.0.1
 +=
  
  Upgrading
  -

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-15 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
build.xml
debian/changelog


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bd71a5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bd71a5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bd71a5e

Branch: refs/heads/trunk
Commit: 6bd71a5e5e21088fdd749854c8078040493d804e
Parents: 4eaca39 6165840
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Oct 15 18:15:05 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Oct 15 18:15:05 2013 +0200

--
 .../apache/cassandra/metrics/ClientMetrics.java   | 18 ++
 .../org/apache/cassandra/pig/CqlTableTest.java| 18 ++
 .../org/apache/cassandra/pig/PigTestBase.java | 18 ++
 .../cassandra/pig/ThriftColumnFamilyTest.java | 18 ++
 4 files changed, 72 insertions(+)
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-14 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/cql3/QueryProcessor.java
src/java/org/apache/cassandra/cql3/UpdateParameters.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9bb16c3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bb16c3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bb16c3c

Branch: refs/heads/trunk
Commit: 9bb16c3c9420007f6ce2d7cda0f6000e498aba98
Parents: 810f067 623ed79
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Oct 14 19:03:48 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Oct 14 19:03:48 2013 +0200

--
 CHANGES.txt |  1 +
 .../apache/cassandra/cql3/QueryProcessor.java   | 25 +++-
 .../apache/cassandra/cql3/UpdateParameters.java | 15 
 .../cql3/statements/SelectStatement.java|  8 +++
 4 files changed, 30 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bb16c3c/CHANGES.txt
--
diff --cc CHANGES.txt
index cd06acc,48fcf58..22b9f29
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -49,43 -24,10 +49,44 @@@ Merged from 1.2
   * stress: add username/password authentication support (CASSANDRA-6068)
   * Fix indexed queries with row cache enabled on parent table (CASSANDRA-5732)
   * Fix compaction race during columnfamily drop (CASSANDRA-5957)
+  * Fix validation of empty column names for compact tables (CASSANDRA-6152)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bb16c3c/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--
diff --cc src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 72351d5,71a57f4..7ddff96
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@@ -102,28 -102,31 +102,31 @@@ public class QueryProcesso
  }
  }
  
- public static void validateColumnNames(IterableByteBuffer columns)
- throws InvalidRequestException
 -public static void validateColumnNames(IterableByteBuffer columnNames) 
throws InvalidRequestException
++public static void validateCellNames(IterableByteBuffer cellNames) 
throws InvalidRequestException
  {
- for (ByteBuffer name : columns)
- {
- if (name.remaining()  Column.MAX_NAME_LENGTH)
- throw new

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-12 Thread aleksey

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/61dc5908
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61dc5908
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61dc5908

Branch: refs/heads/trunk
Commit: 61dc59086b08878239cc1125c738ec2b006c645a
Parents: 3e7ebf8 5fab127
Author: Aleksey Yeschenko alek...@apache.org
Authored: Sat Oct 12 23:51:29 2013 +0700
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Sat Oct 12 23:51:29 2013 +0700

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/stress/Session.java| 32 ++--
 2 files changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/61dc5908/CHANGES.txt
--
diff --cc CHANGES.txt
index 0a00f2b,afb1464..0fc2a91
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -46,43 -21,10 +46,44 @@@ Merged from 1.2
   * Properly error out on CREATE INDEX for counters table (CASSANDRA-6160)
   * Handle JMX notification failure for repair (CASSANDRA-6097)
   * (Hadoop) Fetch no more than 128 splits in parallel (CASSANDRA-6169)
+  * stress: add username/password authentication support (CASSANDRA-6068)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/61dc5908/tools/stress/src/org/apache/cassandra/stress/Session.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-09 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cce68634
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cce68634
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cce68634

Branch: refs/heads/trunk
Commit: cce6863432803b5b3c278eae6f2e58b13ad069bd
Parents: 2f31bde 1bba280
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Oct 9 16:52:38 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Oct 9 16:52:38 2013 +0200

--
 CHANGES.txt   | 1 +
 .../apache/cassandra/cql3/statements/CreateIndexStatement.java| 3 +++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cce68634/CHANGES.txt
--
diff --cc CHANGES.txt
index 87a5cda,59cc0f1..53de29e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,43 -18,10 +43,44 @@@ Merged from 1.2
   * Trace index selection (CASSANDRA-6001)
   * Update sstablesPerReadHistogram to use biased sampling (CASSANDRA-6164)
   * Log UnknownColumnfamilyException when closing socket (CASSANDRA-5725)
+  * Properly error out on CREATE INDEX for counters table (CASSANDRA-6160)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cce68634/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
--
diff --cc 
src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
index 9de7106,3e2ff68..ba88e28
--- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
@@@ -64,34 -66,36 +64,37 @@@ public class CreateIndexStatement exten
  public void validate(ClientState state) throws RequestValidationException
  {
  CFMetaData cfm = ThriftValidation.validateColumnFamily(keyspace(), 
columnFamily());
+ if (cfm.getDefaultValidator().isCommutative())
+ throw new InvalidRequestException(Secondary indexes are not 
supported on counter tables);
+ 
 -CFDefinition.Name name = cfm.getCfDef().get(columnName);
 +ColumnDefinition cd = cfm.getColumnDefinition(columnName.key);
  
 -if (name == null)
 +if (cd == null)
  throw new InvalidRequestException(No column definition found for 
column  + columnName);
  
 -

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-07 Thread aleksey

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/8e8db1f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e8db1f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e8db1f2

Branch: refs/heads/trunk
Commit: 8e8db1f20688eef9a89e112f2295d160c9c35075
Parents: 6a60304 9d31ac1
Author: Aleksey Yeschenko alek...@apache.org
Authored: Tue Oct 8 01:56:55 2013 +0800
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Tue Oct 8 01:56:55 2013 +0800

--
 src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e8db1f2/src/java/org/apache/cassandra/service/StorageProxy.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-10-03 Thread slebresne

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4106f569
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4106f569
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4106f569

Branch: refs/heads/trunk
Commit: 4106f56945a8bc82762338ff1737d387abe0060a
Parents: 4bd8626 20a8050
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Oct 3 11:10:35 2013 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Oct 3 11:10:35 2013 +0200

--
 CHANGES.txt |   1 +
 .../db/columniterator/IndexedSliceReader.java   |  13 +-
 .../cassandra/db/ColumnFamilyStoreTest.java | 198 +++
 3 files changed, 209 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4106f569/CHANGES.txt
--
diff --cc CHANGES.txt
index c1023f6,c1d1991..994e8c3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -27,46 -10,12 +27,47 @@@ Merged from 1.2
   * Do not open non-ssl storage port if encryption option is all 
(CASSANDRA-3916)
   * Move batchlog replay to its own executor (CASSANDRA-6079)
   * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
 + * Enable tcp keepalive on incoming connections (CASSANDRA-4053)
   * Fix fat client schema pull NPE (CASSANDRA-6089)
   * Fix memtable flushing for indexed tables (CASSANDRA-6112)
+  * Fix skipping columns with multiple slices (CASSANDRA-6119)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4106f569/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
--
diff --cc 
src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
index 27d307a,df916b2..036d0cf
--- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
@@@ -445,11 -464,19 +445,14 @@@ class IndexedSliceReader extends Abstra
  // We remenber when we are whithin a slice to avoid some 
comparison
  boolean inSlice = false;
  
 -OnDiskAtom.Serializer atomSerializer = 
emptyColumnFamily.getOnDiskSerializer();
 -int columns = file.readInt();
 -
 +int columnCount = 
sstable.descriptor.version.hasRowSizeAndColumnCount ? file.readInt() : 
Integer.MAX_VALUE;
 +

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-09-29 Thread aleksey

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
src/java/org/apache/cassandra/db/compaction/CompactionManager.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b774eb14
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b774eb14
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b774eb14

Branch: refs/heads/trunk
Commit: b774eb14dd914521c91ea6e5a8b2121f528c45cb
Parents: dc7e2fd 898ce5f
Author: Aleksey Yeschenko alek...@apache.org
Authored: Mon Sep 30 02:28:49 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Mon Sep 30 02:28:49 2013 +0300

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b774eb14/CHANGES.txt
--
diff --cc CHANGES.txt
index dcdb01b,ca559b1..33268dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,4 +1,16 @@@
 -1.2.11
 +2.0.2
 + * Track and persist sstable read activity (CASSANDRA-5515)
 + * Fixes for speculative retry (CASSANDRA-5932)
 + * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
 + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081)
 + * Fix insertion of collections with CAS (CASSANDRA-6069)
 + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080)
 + * Track clients' remote addresses in ClientState (CASSANDRA-6070)
 + * Create snapshot dir if it does not exist when migrating
 +   leveled manifest (CASSANDRA-6093)
 + * make sequential nodetool repair the default (CASSANDRA-5950)
 + * Add more hooks for compaction strategy implementations (CASSANDRA-6111)
-  * Fix memtable flushing for indexed tables (CASSANDRA-6112)
 +Merged from 1.2:
   * Allow estimated memtable size to exceed slab allocator size 
(CASSANDRA-6078)
   * Start MeteredFlusher earlier to prevent OOM during CL replay 
(CASSANDRA-6087)
   * Avoid sending Truncate command to fat clients (CASSANDRA-6088)
@@@ -20,45 -7,11 +19,46 @@@
   * Do not open non-ssl storage port if encryption option is all 
(CASSANDRA-3916)
   * Move batchlog replay to its own executor (CASSANDRA-6079)
   * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
 + * Enable tcp keepalive on incoming connections (CASSANDRA-4053)
   * Fix fat client schema pull NPE (CASSANDRA-6089)
+  * Fix memtable flushing for indexed tables (CASSANDRA-6112)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-09-27 Thread dbrosius

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/ed7b08b3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed7b08b3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed7b08b3

Branch: refs/heads/trunk
Commit: ed7b08b399df8cad311a28a25a47c576238d3f0a
Parents: 3a70933 8d3d67e
Author: Dave Brosius dbros...@apache.org
Authored: Fri Sep 27 22:03:47 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Fri Sep 27 22:03:47 2013 -0400

--
 test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-09-25 Thread aleksey

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/643dc006
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/643dc006
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/643dc006

Branch: refs/heads/trunk
Commit: 643dc0068f24ea6b092a0d36f47f6b133b40c661
Parents: b3b7508 5d08a25
Author: Aleksey Yeschenko alek...@apache.org
Authored: Wed Sep 25 22:11:44 2013 +0300
Committer: Aleksey Yeschenko alek...@apache.org
Committed: Wed Sep 25 22:11:44 2013 +0300

--
 CHANGES.txt | 1 +
 src/java/org/apache/cassandra/service/MigrationManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/643dc006/CHANGES.txt
--
diff --cc CHANGES.txt
index c8ca4f5,27ebc9b..cc3daf6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -15,44 -7,10 +15,45 @@@ Merged from 1.2
   * Do not open non-ssl storage port if encryption option is all 
(CASSANDRA-3916)
   * Move batchlog replay to its own executor (CASSANDRA-6079)
   * Add tombstone debug threshold and histogram (CASSANDRA-6042, 6057)
 + * Enable tcp keepalive on incoming connections (CASSANDRA-4053)
+  * Fix fat client schema pull NPE (CASSANDRA-6089)
  
  
 -1.2.10
 +2.0.1
 + * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
 + * Improve memory use defaults (CASSANDRA-5069)
 + * Make ThriftServer more easlly extensible (CASSANDRA-6058)
 + * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
 + * add file_cache_size_in_mb setting (CASSANDRA-5661)
 + * Improve error message when yaml contains invalid properties 
(CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 + * Make standalone scrubber handle old and new style leveled manifest
 +   (CASSANDRA-6005)
 + * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
 + * Fix paged ranges with multiple replicas (CASSANDRA-6004)
 + * Fix potential AssertionError during tracing (CASSANDRA-6041)
 + * Fix NPE in sstablesplit (CASSANDRA-6027)
 + * Migrate pre-2.0 key/value/column aliases to system.schema_columns
 +   (CASSANDRA-6009)
 + * Paging filter empty rows too agressively (CASSANDRA-6040)
 + * Support variadic parameters for IN clauses (CASSANDRA-4210)
 + * cqlsh: return the result of CAS writes (CASSANDRA-5796)
 + * Fix validation of IN clauses with 2ndary indexes (CASSANDRA-6050)
 + * Support named bind variables in CQL (CASSANDRA-6033)
 +Merged from 1.2:
 + * Allow cache-keys-to-save to be set at runtime (CASSANDRA-5980)
   * Avoid second-guessing out-of-space state (CASSANDRA-5605)
   * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982)
   * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/643dc006/src/java/org/apache/cassandra/service/MigrationManager.java
--

[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

2013-09-25 Thread dbrosius

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/b5c23cf7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5c23cf7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5c23cf7

Branch: refs/heads/trunk
Commit: b5c23cf740c2d04f873fe970c2bef15974518e0d
Parents: 83da4bd 00e871d
Author: Dave Brosius dbros...@apache.org
Authored: Wed Sep 25 23:19:33 2013 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Wed Sep 25 23:19:33 2013 -0400

--
 test/unit/org/apache/cassandra/db/ReadMessageTest.java | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5c23cf7/test/unit/org/apache/cassandra/db/ReadMessageTest.java
--

1 2 >

1 - 100 of 111 matches

Mail list logo