subject:"git commit\: merge from 1.1"

[06/16] git commit: merge from 1.1

2013-08-08 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-2.0.0
Commit: 1143df1aa439618bff6005ca1cee34cb066a
Parents: 23d7bd8 eb884a5
Author: Jonathan Ellis 
Authored: Thu Aug 8 15:46:52 2013 -0500
Committer: Jonathan Ellis 
Committed: Thu Aug 8 15:46:52 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143df1a/CHANGES.txt
--
diff --cc CHANGES.txt
index 859e7f9,8790518..30ce976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,214 -1,19 +1,216 @@@
 -1.1.next
 - * Backport compaction exception handling from 1.2
 +1.2.9
 + * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
 + * fix bulk-loading compressed sstables (CASSANDRA-5820)
 + * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
 +   (CASSANDRA-5824)
 + * update default LCS sstable size to 160MB (CASSANDRA-5727)
 + * Allow compacting 2Is via nodetool (CASSANDRA-5670)
 + * Hex-encode non-String keys in OPP (CASSANDRA-5793)
 + * nodetool history logging (CASSANDRA-5823)
 + * (Hadoop) fix support for Thrift tables in CqlPagingRecordReader 
 +   (CASSANDRA-5752)
 + * add "all time blocked" to StatusLogger output (CASSANDRA-5825)
 + * Future-proof inter-major-version schema migrations (CASSANDRA-5845)
 + * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table
 +   (CASSANDRA-5718)
++Merged from 1.1:
+  * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
  
  
 -1.1.12
 +1.2.8
 + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
 + * cqlsh: add collections support to COPY (CASSANDRA-5698)
 + * retry important messages for any IOException (CASSANDRA-5804)
 + * Allow empty IN relations in SELECT/UPDATE/DELETE statements 
(CASSANDRA-5626)
 + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
 +
 +
 +1.2.7
 + * if no seeds can be a reached a node won't start in a ring by itself 
(CASSANDRA-5768)
 + * add cassandra.unsafesystem property (CASSANDRA-5704)
 + * (Hadoop) quote identifiers in CqlPagingRecordReader (CASSANDRA-5763)
 + * Add replace_node functionality for vnodes (CASSANDRA-5337)
 + * Add timeout events to query traces (CASSANDRA-5520)
 + * make starting native protocol server idempotent (CASSANDRA-5728)
 + * Fix loading key cache when a saved entry is no longer valid 
(CASSANDRA-5706)
 + * Fix serialization of the LEFT gossip value (CASSANDRA-5696)
 + * Pig: support for cql3 tables (CASSANDRA-5234)
 + * cqlsh: Don't show 'null' in place of empty values (CASSANDRA-5675)
 + * Race condition in detecting version on a mixed 1.1/1.2 cluster
 +   (CASSANDRA-5692)
 + * Fix skipping range tombstones with reverse queries (CASSANDRA-5712)
 + * Expire entries out of ThriftSessionManager (CASSANRDA-5719)
 + * Don't keep ancestor information in memory (CASSANDRA-5342)
 + * cqlsh: fix handling of semicolons inside BATCH queries (CASSANDRA-5697)
 + * Expose native protocol server status in nodetool info (CASSANDRA-5735)
 + * Fix pathetic performance of range tombstones (CASSANDRA-5677)
 + * Fix querying with an empty (impossible) range (CASSANDRA-5573)
 + * cqlsh: handle CUSTOM 2i in DESCRIBE output (CASSANDRA-5760)
 + * Fix minor bug in Range.intersects(Bound) (CASSANDRA-5771)
 + * cqlsh: handle disabled compression in DESCRIBE output (CASSANDRA-5766)
 + * Ensure all UP events are notified on the native protocol (CASSANDRA-5769)
 + * Fix formatting of sstable2json with multiple -k arguments (CASSANDRA-5781)
 + * Don't rely on row marker for queries in general to hide lost markers
 +   after TTL expires (CASSANDRA-5762)
 + * Sort nodetool help output (CASSANDRA-5776)
 + * Fix column expiring during 2 phases compaction (CASSANDRA-5799)
 + * now() is being rejected in INSERTs when inside collections (CASSANDRA-5795)
 +
 +
 +1.2.6
 + * Fix tracing when operation completes before all responses arrive 
 +   (CASSANDRA-5668)
 + * Fix cross-DC mutation forwarding (CASSANDRA-5632)
 + * Reduce SSTableLoader memory usage (CASSANDRA-)
 + * Scale hinted_handoff_throttle_in_kb to cluster size (CASSANDRA-5272)
 + * (Hadoop) Add CQL3 input/output formats (CASSANDRA-4421, 5622)
 + * (Hadoop) Fix InputKeyRange in CFIF (CASSANDRA-5536)
 + * Fix dealing with ridiculously large max sstable sizes in LCS 
(CASSANDRA-5589)
 + * Ignore pre-truncate hints (CASSANDRA-4655)
 + * Move System.exit on OOM into a separate

[04/16] git commit: merge from 1.1

2013-08-08 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-2.0
Commit: 1143df1aa439618bff6005ca1cee34cb066a
Parents: 23d7bd8 eb884a5
Author: Jonathan Ellis 
Authored: Thu Aug 8 15:46:52 2013 -0500
Committer: Jonathan Ellis 
Committed: Thu Aug 8 15:46:52 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143df1a/CHANGES.txt
--
diff --cc CHANGES.txt
index 859e7f9,8790518..30ce976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,214 -1,19 +1,216 @@@
 -1.1.next
 - * Backport compaction exception handling from 1.2
 +1.2.9
 + * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
 + * fix bulk-loading compressed sstables (CASSANDRA-5820)
 + * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
 +   (CASSANDRA-5824)
 + * update default LCS sstable size to 160MB (CASSANDRA-5727)
 + * Allow compacting 2Is via nodetool (CASSANDRA-5670)
 + * Hex-encode non-String keys in OPP (CASSANDRA-5793)
 + * nodetool history logging (CASSANDRA-5823)
 + * (Hadoop) fix support for Thrift tables in CqlPagingRecordReader 
 +   (CASSANDRA-5752)
 + * add "all time blocked" to StatusLogger output (CASSANDRA-5825)
 + * Future-proof inter-major-version schema migrations (CASSANDRA-5845)
 + * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table
 +   (CASSANDRA-5718)
++Merged from 1.1:
+  * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
  
  
 -1.1.12
 +1.2.8
 + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
 + * cqlsh: add collections support to COPY (CASSANDRA-5698)
 + * retry important messages for any IOException (CASSANDRA-5804)
 + * Allow empty IN relations in SELECT/UPDATE/DELETE statements 
(CASSANDRA-5626)
 + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
 +
 +
 +1.2.7
 + * if no seeds can be a reached a node won't start in a ring by itself 
(CASSANDRA-5768)
 + * add cassandra.unsafesystem property (CASSANDRA-5704)
 + * (Hadoop) quote identifiers in CqlPagingRecordReader (CASSANDRA-5763)
 + * Add replace_node functionality for vnodes (CASSANDRA-5337)
 + * Add timeout events to query traces (CASSANDRA-5520)
 + * make starting native protocol server idempotent (CASSANDRA-5728)
 + * Fix loading key cache when a saved entry is no longer valid 
(CASSANDRA-5706)
 + * Fix serialization of the LEFT gossip value (CASSANDRA-5696)
 + * Pig: support for cql3 tables (CASSANDRA-5234)
 + * cqlsh: Don't show 'null' in place of empty values (CASSANDRA-5675)
 + * Race condition in detecting version on a mixed 1.1/1.2 cluster
 +   (CASSANDRA-5692)
 + * Fix skipping range tombstones with reverse queries (CASSANDRA-5712)
 + * Expire entries out of ThriftSessionManager (CASSANRDA-5719)
 + * Don't keep ancestor information in memory (CASSANDRA-5342)
 + * cqlsh: fix handling of semicolons inside BATCH queries (CASSANDRA-5697)
 + * Expose native protocol server status in nodetool info (CASSANDRA-5735)
 + * Fix pathetic performance of range tombstones (CASSANDRA-5677)
 + * Fix querying with an empty (impossible) range (CASSANDRA-5573)
 + * cqlsh: handle CUSTOM 2i in DESCRIBE output (CASSANDRA-5760)
 + * Fix minor bug in Range.intersects(Bound) (CASSANDRA-5771)
 + * cqlsh: handle disabled compression in DESCRIBE output (CASSANDRA-5766)
 + * Ensure all UP events are notified on the native protocol (CASSANDRA-5769)
 + * Fix formatting of sstable2json with multiple -k arguments (CASSANDRA-5781)
 + * Don't rely on row marker for queries in general to hide lost markers
 +   after TTL expires (CASSANDRA-5762)
 + * Sort nodetool help output (CASSANDRA-5776)
 + * Fix column expiring during 2 phases compaction (CASSANDRA-5799)
 + * now() is being rejected in INSERTs when inside collections (CASSANDRA-5795)
 +
 +
 +1.2.6
 + * Fix tracing when operation completes before all responses arrive 
 +   (CASSANDRA-5668)
 + * Fix cross-DC mutation forwarding (CASSANDRA-5632)
 + * Reduce SSTableLoader memory usage (CASSANDRA-)
 + * Scale hinted_handoff_throttle_in_kb to cluster size (CASSANDRA-5272)
 + * (Hadoop) Add CQL3 input/output formats (CASSANDRA-4421, 5622)
 + * (Hadoop) Fix InputKeyRange in CFIF (CASSANDRA-5536)
 + * Fix dealing with ridiculously large max sstable sizes in LCS 
(CASSANDRA-5589)
 + * Ignore pre-truncate hints (CASSANDRA-4655)
 + * Move System.exit on OOM into a separate t

[05/16] git commit: merge from 1.1

2013-08-08 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 1143df1aa439618bff6005ca1cee34cb066a
Parents: 23d7bd8 eb884a5
Author: Jonathan Ellis 
Authored: Thu Aug 8 15:46:52 2013 -0500
Committer: Jonathan Ellis 
Committed: Thu Aug 8 15:46:52 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143df1a/CHANGES.txt
--
diff --cc CHANGES.txt
index 859e7f9,8790518..30ce976
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,214 -1,19 +1,216 @@@
 -1.1.next
 - * Backport compaction exception handling from 1.2
 +1.2.9
 + * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
 + * fix bulk-loading compressed sstables (CASSANDRA-5820)
 + * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
 +   (CASSANDRA-5824)
 + * update default LCS sstable size to 160MB (CASSANDRA-5727)
 + * Allow compacting 2Is via nodetool (CASSANDRA-5670)
 + * Hex-encode non-String keys in OPP (CASSANDRA-5793)
 + * nodetool history logging (CASSANDRA-5823)
 + * (Hadoop) fix support for Thrift tables in CqlPagingRecordReader 
 +   (CASSANDRA-5752)
 + * add "all time blocked" to StatusLogger output (CASSANDRA-5825)
 + * Future-proof inter-major-version schema migrations (CASSANDRA-5845)
 + * (Hadoop) add CqlPagingRecordReader support for ReversedType in Thrift table
 +   (CASSANDRA-5718)
++Merged from 1.1:
+  * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
  
  
 -1.1.12
 +1.2.8
 + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
 + * cqlsh: add collections support to COPY (CASSANDRA-5698)
 + * retry important messages for any IOException (CASSANDRA-5804)
 + * Allow empty IN relations in SELECT/UPDATE/DELETE statements 
(CASSANDRA-5626)
 + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
 +
 +
 +1.2.7
 + * if no seeds can be a reached a node won't start in a ring by itself 
(CASSANDRA-5768)
 + * add cassandra.unsafesystem property (CASSANDRA-5704)
 + * (Hadoop) quote identifiers in CqlPagingRecordReader (CASSANDRA-5763)
 + * Add replace_node functionality for vnodes (CASSANDRA-5337)
 + * Add timeout events to query traces (CASSANDRA-5520)
 + * make starting native protocol server idempotent (CASSANDRA-5728)
 + * Fix loading key cache when a saved entry is no longer valid 
(CASSANDRA-5706)
 + * Fix serialization of the LEFT gossip value (CASSANDRA-5696)
 + * Pig: support for cql3 tables (CASSANDRA-5234)
 + * cqlsh: Don't show 'null' in place of empty values (CASSANDRA-5675)
 + * Race condition in detecting version on a mixed 1.1/1.2 cluster
 +   (CASSANDRA-5692)
 + * Fix skipping range tombstones with reverse queries (CASSANDRA-5712)
 + * Expire entries out of ThriftSessionManager (CASSANRDA-5719)
 + * Don't keep ancestor information in memory (CASSANDRA-5342)
 + * cqlsh: fix handling of semicolons inside BATCH queries (CASSANDRA-5697)
 + * Expose native protocol server status in nodetool info (CASSANDRA-5735)
 + * Fix pathetic performance of range tombstones (CASSANDRA-5677)
 + * Fix querying with an empty (impossible) range (CASSANDRA-5573)
 + * cqlsh: handle CUSTOM 2i in DESCRIBE output (CASSANDRA-5760)
 + * Fix minor bug in Range.intersects(Bound) (CASSANDRA-5771)
 + * cqlsh: handle disabled compression in DESCRIBE output (CASSANDRA-5766)
 + * Ensure all UP events are notified on the native protocol (CASSANDRA-5769)
 + * Fix formatting of sstable2json with multiple -k arguments (CASSANDRA-5781)
 + * Don't rely on row marker for queries in general to hide lost markers
 +   after TTL expires (CASSANDRA-5762)
 + * Sort nodetool help output (CASSANDRA-5776)
 + * Fix column expiring during 2 phases compaction (CASSANDRA-5799)
 + * now() is being rejected in INSERTs when inside collections (CASSANDRA-5795)
 +
 +
 +1.2.6
 + * Fix tracing when operation completes before all responses arrive 
 +   (CASSANDRA-5668)
 + * Fix cross-DC mutation forwarding (CASSANDRA-5632)
 + * Reduce SSTableLoader memory usage (CASSANDRA-)
 + * Scale hinted_handoff_throttle_in_kb to cluster size (CASSANDRA-5272)
 + * (Hadoop) Add CQL3 input/output formats (CASSANDRA-4421, 5622)
 + * (Hadoop) Fix InputKeyRange in CFIF (CASSANDRA-5536)
 + * Fix dealing with ridiculously large max sstable sizes in LCS 
(CASSANDRA-5589)
 + * Ignore pre-truncate hints (CASSANDRA-4655)
 + * Move System.exit on OOM into a separate thread (C

[04/11] git commit: merge from 1.1

2013-05-21 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 40669a33027d241ceda76e842afb5de0bcada5b6
Parents: b69c1aa ac19c12
Author: Jonathan Ellis 
Authored: Tue May 21 13:41:46 2013 -0500
Committer: Jonathan Ellis 
Committed: Tue May 21 13:41:46 2013 -0500

--
 CHANGES.txt|   11 
 conf/cassandra.yaml|6 +
 src/java/org/apache/cassandra/config/Config.java   |2 +
 .../cassandra/config/DatabaseDescriptor.java   |8 --
 .../cassandra/hadoop/ColumnFamilyOutputFormat.java |4 +-
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |2 +-
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |   15 ++-
 .../apache/cassandra/thrift/TBinaryProtocol.java   |   19 ---
 .../org/apache/cassandra/thrift/ThriftServer.java  |2 +-
 9 files changed, 21 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40669a33/CHANGES.txt
--
diff --cc CHANGES.txt
index 619e415,501a68f..103f659
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,113 -1,14 +1,124 @@@
 -1.1.12
 +1.2.6
 + * Write row markers when serializing schema (CASSANDRA-5572)
 + * Check only SSTables for the requested range when streaming (CASSANDRA-5569)
++Merged from 1.1:
+  * Remove buggy thrift max message length option (CASSANDRA-5529)
 +
 +
 +1.2.5
 + * make BytesToken.toString only return hex bytes (CASSANDRA-5566)
 + * Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)
 + * fix 2i updates with identical values and timestamps (CASSANDRA-5540)
 + * fix compaction throttling bursty-ness (CASSANDRA-4316)
 + * reduce memory consumption of IndexSummary (CASSANDRA-5506)
 + * remove per-row column name bloom filters (CASSANDRA-5492)
 + * Include fatal errors in trace events (CASSANDRA-5447)
 + * Ensure that PerRowSecondaryIndex is notified of row-level deletes
 +   (CASSANDRA-5445)
 + * Allow empty blob literals in CQL3 (CASSANDRA-5452)
 + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418)
 + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468)
 + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496)
 + * Don't provide oldCfId for post-1.1 system cfs (CASSANDRA-5490)
 + * Fix primary range ignores replication strategy (CASSANDRA-5424)
 + * Fix shutdown of binary protocol server (CASSANDRA-5507)
 + * Fix repair -snapshot not working (CASSANDRA-5512)
 + * Set isRunning flag later in binary protocol server (CASSANDRA-5467)
 + * Fix use of CQL3 functions with descending clustering order (CASSANDRA-5472)
 + * Disallow renaming columns one at a time for thrift table in CQL3
 +   (CASSANDRA-5531)
 + * cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528)
 + * Add custom secondary index support to CQL3 (CASSANDRA-5484)
 + * Fix repair hanging silently on unexpected error (CASSANDRA-5229)
 + * Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432)
 + * Add nodetool enablebackup/disablebackup (CASSANDRA-5556)
 + * cqlsh: fix DESCRIBE after case insensitive USE (CASSANDRA-5567)
 +Merged from 1.1
   * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
 - * Use allocator information to improve memtable memory usage estimate 
 + * Use allocator information to improve memtable memory usage estimate
 (CASSANDRA-5497)
 + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
   * fsync leveled manifest to avoid corruption (CASSANDRA-5535)
   * Fix Bound intersection computation (CASSANDRA-5551)
 + * sstablescrub now respects max memory size in cassandra.in.sh 
(CASSANDRA-5562)
 +
 +
 +1.2.4
 + * Ensure that PerRowSecondaryIndex updates see the most recent values
 +   (CASSANDRA-5397)
 + * avoid duplicate index entries ind PrecompactedRow and 
 +   ParallelCompactionIterable (CASSANDRA-5395)
 + * remove the index entry on oldColumn when new column is a tombstone 
 +   (CASSANDRA-5395)
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection valu

[03/11] git commit: merge from 1.1

2013-05-21 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 40669a33027d241ceda76e842afb5de0bcada5b6
Parents: b69c1aa ac19c12
Author: Jonathan Ellis 
Authored: Tue May 21 13:41:46 2013 -0500
Committer: Jonathan Ellis 
Committed: Tue May 21 13:41:46 2013 -0500

--
 CHANGES.txt|   11 
 conf/cassandra.yaml|6 +
 src/java/org/apache/cassandra/config/Config.java   |2 +
 .../cassandra/config/DatabaseDescriptor.java   |8 --
 .../cassandra/hadoop/ColumnFamilyOutputFormat.java |4 +-
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |2 +-
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |   15 ++-
 .../apache/cassandra/thrift/TBinaryProtocol.java   |   19 ---
 .../org/apache/cassandra/thrift/ThriftServer.java  |2 +-
 9 files changed, 21 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40669a33/CHANGES.txt
--
diff --cc CHANGES.txt
index 619e415,501a68f..103f659
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,113 -1,14 +1,124 @@@
 -1.1.12
 +1.2.6
 + * Write row markers when serializing schema (CASSANDRA-5572)
 + * Check only SSTables for the requested range when streaming (CASSANDRA-5569)
++Merged from 1.1:
+  * Remove buggy thrift max message length option (CASSANDRA-5529)
 +
 +
 +1.2.5
 + * make BytesToken.toString only return hex bytes (CASSANDRA-5566)
 + * Ensure that submitBackground enqueues at least one task (CASSANDRA-5554)
 + * fix 2i updates with identical values and timestamps (CASSANDRA-5540)
 + * fix compaction throttling bursty-ness (CASSANDRA-4316)
 + * reduce memory consumption of IndexSummary (CASSANDRA-5506)
 + * remove per-row column name bloom filters (CASSANDRA-5492)
 + * Include fatal errors in trace events (CASSANDRA-5447)
 + * Ensure that PerRowSecondaryIndex is notified of row-level deletes
 +   (CASSANDRA-5445)
 + * Allow empty blob literals in CQL3 (CASSANDRA-5452)
 + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418)
 + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468)
 + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496)
 + * Don't provide oldCfId for post-1.1 system cfs (CASSANDRA-5490)
 + * Fix primary range ignores replication strategy (CASSANDRA-5424)
 + * Fix shutdown of binary protocol server (CASSANDRA-5507)
 + * Fix repair -snapshot not working (CASSANDRA-5512)
 + * Set isRunning flag later in binary protocol server (CASSANDRA-5467)
 + * Fix use of CQL3 functions with descending clustering order (CASSANDRA-5472)
 + * Disallow renaming columns one at a time for thrift table in CQL3
 +   (CASSANDRA-5531)
 + * cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528)
 + * Add custom secondary index support to CQL3 (CASSANDRA-5484)
 + * Fix repair hanging silently on unexpected error (CASSANDRA-5229)
 + * Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432)
 + * Add nodetool enablebackup/disablebackup (CASSANDRA-5556)
 + * cqlsh: fix DESCRIBE after case insensitive USE (CASSANDRA-5567)
 +Merged from 1.1
   * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
 - * Use allocator information to improve memtable memory usage estimate 
 + * Use allocator information to improve memtable memory usage estimate
 (CASSANDRA-5497)
 + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
   * fsync leveled manifest to avoid corruption (CASSANDRA-5535)
   * Fix Bound intersection computation (CASSANDRA-5551)
 + * sstablescrub now respects max memory size in cassandra.in.sh 
(CASSANDRA-5562)
 +
 +
 +1.2.4
 + * Ensure that PerRowSecondaryIndex updates see the most recent values
 +   (CASSANDRA-5397)
 + * avoid duplicate index entries ind PrecompactedRow and 
 +   ParallelCompactionIterable (CASSANDRA-5395)
 + * remove the index entry on oldColumn when new column is a tombstone 
 +   (CASSANDRA-5395)
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collect

[4/6] git commit: merge from 1.1

2013-04-19 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 813a937b2f1e84a96d45a6ace35d8ec1de7bf68d
Parents: 83ff1da 7d36c1e
Author: Jonathan Ellis 
Authored: Fri Apr 19 08:35:06 2013 -0500
Committer: Jonathan Ellis 
Committed: Fri Apr 19 08:35:06 2013 -0500

--
 CHANGES.txt|2 +
 src/java/org/apache/cassandra/db/Memtable.java |   12 ++-
 .../org/apache/cassandra/utils/SlabAllocator.java  |   23 ++-
 3 files changed, 34 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/813a937b/CHANGES.txt
--
diff --cc CHANGES.txt
index 80c9b44,30a09c9..7fc93f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,11 +1,85 @@@
 -1.1.12
 +1.2.5
 + * Include fatal errors in trace events (CASSANDRA-5447)
 + * Ensure that PerRowSecondaryIndex is notified of row-level deletes
 +   (CASSANDRA-5445)
 + * Allow empty blob literals in CQL3 (CASSANDRA-5452)
 + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418)
 + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468)
 + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496)
 +Merged from 1.1
   * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
+  * Use allocator information to improve memtable memory usage estimate 
+(CASSANDRA-5497)
 + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
  
  
 -1.1.11
 - * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
 +1.2.4
 + * Ensure that PerRowSecondaryIndex updates see the most recent values
 +   (CASSANDRA-5397)
 + * avoid duplicate index entries ind PrecompactedRow and 
 +   ParallelCompactionIterable (CASSANDRA-5395)
 + * remove the index entry on oldColumn when new column is a tombstone 
 +   (CASSANDRA-5395)
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Make upgradeSSTable skip current version sstables by default 
(CASSANDRA-5366)
 + * Optimize min/max timestamp collection (CASSANDRA-5373)
 + * Invalid streamId in cql binary protocol when using invalid CL 
 +   (CASSANDRA-5164)
 + * Fix validation for IN where clauses with collections (CASSANDRA-5376)
 + * Copy resultSet on count query to avoid ConcurrentModificationException 
 +   (CASSANDRA-5382)
 + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386)
 + * Fix streaming compressed files when using encryption (CASSANDRA-5391)
 + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392)
 + * Fix writetime/ttl functions on null values (CASSANDRA-5341)
 + * Fix NPE during cql3 select with token() (CASSANDRA-5404)
 + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385)
 + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413)
 + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783)
 + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423)
 + * Fix potential incremental backups race (CASSANDRA-5410)
 + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
 + * Allow overriding superuser setup delay (CASSANDRA-5430)
 + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431)
 +Merged from 1.1:
 + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
 + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
 + * Fix cf name extraction from manifest in Directories.migrateFile() 
 +   (CASSANDRA-5242)
 + * Support pluggable internode authentication (CASSANDRA-5401)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queries again

[5/6] git commit: merge from 1.1

2013-04-19 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 813a937b2f1e84a96d45a6ace35d8ec1de7bf68d
Parents: 83ff1da 7d36c1e
Author: Jonathan Ellis 
Authored: Fri Apr 19 08:35:06 2013 -0500
Committer: Jonathan Ellis 
Committed: Fri Apr 19 08:35:06 2013 -0500

--
 CHANGES.txt|2 +
 src/java/org/apache/cassandra/db/Memtable.java |   12 ++-
 .../org/apache/cassandra/utils/SlabAllocator.java  |   23 ++-
 3 files changed, 34 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/813a937b/CHANGES.txt
--
diff --cc CHANGES.txt
index 80c9b44,30a09c9..7fc93f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,83 -1,11 +1,85 @@@
 -1.1.12
 +1.2.5
 + * Include fatal errors in trace events (CASSANDRA-5447)
 + * Ensure that PerRowSecondaryIndex is notified of row-level deletes
 +   (CASSANDRA-5445)
 + * Allow empty blob literals in CQL3 (CASSANDRA-5452)
 + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418)
 + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468)
 + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496)
 +Merged from 1.1
   * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
+  * Use allocator information to improve memtable memory usage estimate 
+(CASSANDRA-5497)
 + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
  
  
 -1.1.11
 - * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
 +1.2.4
 + * Ensure that PerRowSecondaryIndex updates see the most recent values
 +   (CASSANDRA-5397)
 + * avoid duplicate index entries ind PrecompactedRow and 
 +   ParallelCompactionIterable (CASSANDRA-5395)
 + * remove the index entry on oldColumn when new column is a tombstone 
 +   (CASSANDRA-5395)
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Make upgradeSSTable skip current version sstables by default 
(CASSANDRA-5366)
 + * Optimize min/max timestamp collection (CASSANDRA-5373)
 + * Invalid streamId in cql binary protocol when using invalid CL 
 +   (CASSANDRA-5164)
 + * Fix validation for IN where clauses with collections (CASSANDRA-5376)
 + * Copy resultSet on count query to avoid ConcurrentModificationException 
 +   (CASSANDRA-5382)
 + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386)
 + * Fix streaming compressed files when using encryption (CASSANDRA-5391)
 + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392)
 + * Fix writetime/ttl functions on null values (CASSANDRA-5341)
 + * Fix NPE during cql3 select with token() (CASSANDRA-5404)
 + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385)
 + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413)
 + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783)
 + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423)
 + * Fix potential incremental backups race (CASSANDRA-5410)
 + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
 + * Allow overriding superuser setup delay (CASSANDRA-5430)
 + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431)
 +Merged from 1.1:
 + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
 + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
 + * Fix cf name extraction from manifest in Directories.migrateFile() 
 +   (CASSANDRA-5242)
 + * Support pluggable internode authentication (CASSANDRA-5401)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queri

[4/6] git commit: merge from 1.1

2013-04-09 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 225cb0e7fac97c302783d2334b5b57926bbfa346
Parents: c7eb146 feae9ef
Author: Jonathan Ellis 
Authored: Tue Apr 9 21:25:13 2013 -0500
Committer: Jonathan Ellis 
Committed: Tue Apr 9 21:25:13 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/225cb0e7/CHANGES.txt
--
diff --cc CHANGES.txt
index 32aba15,59a7443..66279f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,5 +1,78 @@@
 -1.1.11
 +1.2.5
 + * Include fatal errors in trace events (CASSANDRA-5447)
 + * Ensure that PerRowSecondaryIndex is notified of row-level deletes
 +   (CASSANDRA-5445)
++Merged from 1.1:
+  * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
 +
 +
 +1.2.4
 + * Ensure that PerRowSecondaryIndex updates see the most recent values
 +   (CASSANDRA-5397)
 + * avoid duplicate index entries ind PrecompactedRow and 
 +   ParallelCompactionIterable (CASSANDRA-5395)
 + * remove the index entry on oldColumn when new column is a tombstone 
 +   (CASSANDRA-5395)
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Make upgradeSSTable skip current version sstables by default 
(CASSANDRA-5366)
 + * Optimize min/max timestamp collection (CASSANDRA-5373)
 + * Invalid streamId in cql binary protocol when using invalid CL 
 +   (CASSANDRA-5164)
 + * Fix validation for IN where clauses with collections (CASSANDRA-5376)
 + * Copy resultSet on count query to avoid ConcurrentModificationException 
 +   (CASSANDRA-5382)
 + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386)
 + * Fix streaming compressed files when using encryption (CASSANDRA-5391)
 + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392)
 + * Fix writetime/ttl functions on null values (CASSANDRA-5341)
 + * Fix NPE during cql3 select with token() (CASSANDRA-5404)
 + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385)
 + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413)
 + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783)
 + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423)
 + * Fix potential incremental backups race (CASSANDRA-5410)
 + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
 + * Allow overriding superuser setup delay (CASSANDRA-5430)
 + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431)
 +Merged from 1.1:
 + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
 + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
 + * Fix cf name extraction from manifest in Directories.migrateFile() 
 +   (CASSANDRA-5242)
 + * Support pluggable internode authentication (CASSANDRA-5401)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queries against counter cfs
 +   (CASSANDRA-5300)
 + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285)
 + * Handle null values when executing prepared statement (CASSANDRA-5081)
 + * Add netty to pom dependencies (CASSANDRA-5181)
 + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311)
 + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182)
 + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309)
 + * Re-enable unknown option in replication/compaction strategies option for
 +   backward compatibility (CASSANDRA-4795)
 + * Add binary protocol support to s

[5/6] git commit: merge from 1.1

2013-04-09 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 225cb0e7fac97c302783d2334b5b57926bbfa346
Parents: c7eb146 feae9ef
Author: Jonathan Ellis 
Authored: Tue Apr 9 21:25:13 2013 -0500
Committer: Jonathan Ellis 
Committed: Tue Apr 9 21:25:13 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/225cb0e7/CHANGES.txt
--
diff --cc CHANGES.txt
index 32aba15,59a7443..66279f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,5 +1,78 @@@
 -1.1.11
 +1.2.5
 + * Include fatal errors in trace events (CASSANDRA-5447)
 + * Ensure that PerRowSecondaryIndex is notified of row-level deletes
 +   (CASSANDRA-5445)
++Merged from 1.1:
+  * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
 +
 +
 +1.2.4
 + * Ensure that PerRowSecondaryIndex updates see the most recent values
 +   (CASSANDRA-5397)
 + * avoid duplicate index entries ind PrecompactedRow and 
 +   ParallelCompactionIterable (CASSANDRA-5395)
 + * remove the index entry on oldColumn when new column is a tombstone 
 +   (CASSANDRA-5395)
 + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036)
 + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187)
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Make upgradeSSTable skip current version sstables by default 
(CASSANDRA-5366)
 + * Optimize min/max timestamp collection (CASSANDRA-5373)
 + * Invalid streamId in cql binary protocol when using invalid CL 
 +   (CASSANDRA-5164)
 + * Fix validation for IN where clauses with collections (CASSANDRA-5376)
 + * Copy resultSet on count query to avoid ConcurrentModificationException 
 +   (CASSANDRA-5382)
 + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386)
 + * Fix streaming compressed files when using encryption (CASSANDRA-5391)
 + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392)
 + * Fix writetime/ttl functions on null values (CASSANDRA-5341)
 + * Fix NPE during cql3 select with token() (CASSANDRA-5404)
 + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385)
 + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413)
 + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783)
 + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423)
 + * Fix potential incremental backups race (CASSANDRA-5410)
 + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415)
 + * Allow overriding superuser setup delay (CASSANDRA-5430)
 + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431)
 +Merged from 1.1:
 + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052)
 + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372)
 + * Fix cf name extraction from manifest in Directories.migrateFile() 
 +   (CASSANDRA-5242)
 + * Support pluggable internode authentication (CASSANDRA-5401)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queries against counter cfs
 +   (CASSANDRA-5300)
 + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285)
 + * Handle null values when executing prepared statement (CASSANDRA-5081)
 + * Add netty to pom dependencies (CASSANDRA-5181)
 + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311)
 + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182)
 + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309)
 + * Re-enable unknown option in replication/compaction strategies option for
 +   backward compatibility (CASSANDRA-4795)
 + * Add binary protocol supp

[4/6] git commit: merge from 1.1

2013-03-22 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: d5513829ce2fdb48007f09ae34ae49a7a332c379
Parents: 27ed655 01d81d2
Author: Jonathan Ellis 
Authored: Fri Mar 22 09:23:14 2013 -0500
Committer: Jonathan Ellis 
Committed: Fri Mar 22 09:23:14 2013 -0500

--
 CHANGES.txt|1 +
 .../apache/cassandra/tools/StandaloneScrubber.java |2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5513829/CHANGES.txt
--
diff --cc CHANGES.txt
index e309eae,b4fdd1d..f34f7bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,5 +1,39 @@@
 -1.1.11
 +1.2.4
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Change Kernel Page Cache skipping into row preheating (disabled by default)
 +   (CASSANDRA-4937)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queries against counter cfs
 +   (CASSANDRA-5300)
 + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285)
 + * Handle null values when executing prepared statement (CASSANDRA-5081)
 + * Add netty to pom dependencies (CASSANDRA-5181)
 + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311)
 + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182)
 + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309)
 + * Re-enable unknown option in replication/compaction strategies option for
 +   backward compatibility (CASSANDRA-4795)
 + * Add binary protocol support to stress (CASSANDRA-4993)
 + * cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305)
 + * Fix repair -pr for vnodes (CASSANDRA-5329)
 + * Relax CL for auth queries for non-default users (CASSANDRA-5310)
 + * Fix AssertionError during repair (CASSANDRA-5245)
 + * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334)
 +Merged from 1.1:
+  * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
   * add tmp flag to Descriptor hashcode (CASSANDRA-4021)
   * fix logging of "Found table data in data directories" when only system 
tables
 are present (CASSANDRA-5289)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5513829/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
--

[5/6] git commit: merge from 1.1

2013-03-22 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: d5513829ce2fdb48007f09ae34ae49a7a332c379
Parents: 27ed655 01d81d2
Author: Jonathan Ellis 
Authored: Fri Mar 22 09:23:14 2013 -0500
Committer: Jonathan Ellis 
Committed: Fri Mar 22 09:23:14 2013 -0500

--
 CHANGES.txt|1 +
 .../apache/cassandra/tools/StandaloneScrubber.java |2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5513829/CHANGES.txt
--
diff --cc CHANGES.txt
index e309eae,b4fdd1d..f34f7bb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,5 +1,39 @@@
 -1.1.11
 +1.2.4
 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352)
 + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354)
 + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362)
 + * Improve asynchronous hint delivery (CASSANDRA-5179)
 + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364)
 + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355)
 + * Change Kernel Page Cache skipping into row preheating (disabled by default)
 +   (CASSANDRA-4937)
 +
 +
 +1.2.3
 + * add check for sstable overlap within a level on startup (CASSANDRA-5327)
 + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328)
 + * Avoid allocating SSTableBoundedScanner during repair when the range does 
 +   not intersect the sstable (CASSANDRA-5249)
 + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292)
 + * Fix composite comparator with super columns (CASSANDRA-5287)
 + * Fix insufficient validation of UPDATE queries against counter cfs
 +   (CASSANDRA-5300)
 + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285)
 + * Handle null values when executing prepared statement (CASSANDRA-5081)
 + * Add netty to pom dependencies (CASSANDRA-5181)
 + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311)
 + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182)
 + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309)
 + * Re-enable unknown option in replication/compaction strategies option for
 +   backward compatibility (CASSANDRA-4795)
 + * Add binary protocol support to stress (CASSANDRA-4993)
 + * cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305)
 + * Fix repair -pr for vnodes (CASSANDRA-5329)
 + * Relax CL for auth queries for non-default users (CASSANDRA-5310)
 + * Fix AssertionError during repair (CASSANDRA-5245)
 + * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334)
 +Merged from 1.1:
+  * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
   * add tmp flag to Descriptor hashcode (CASSANDRA-4021)
   * fix logging of "Found table data in data directories" when only system 
tables
 are present (CASSANDRA-5289)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5513829/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
--

[2/4] git commit: merge from 1.1

2013-03-21 Thread xedin

merge from 1.1


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

Branch: refs/heads/trunk
Commit: dd184c430f6fdb5b9e062670a48f524f174fd954
Parents: 9f268d1 c5864a5
Author: jluci...@bluemountaincapital.com 
Authored: Thu Mar 21 12:43:45 2013 -0400
Committer: jluci...@bluemountaincapital.com 
Committed: Thu Mar 21 12:43:45 2013 -0400

--
 CHANGES.txt   |1 +
 conf/cassandra-env.sh |1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd184c43/CHANGES.txt
--
diff --cc CHANGES.txt
index 6827087,e2b1daa..0959ac9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -39,89 -7,9 +39,90 @@@ Merged from 1.1
   * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284)
   * cqlsh: Add inet type support on Windows (ipv4-only) (CASSANDRA-4801)
   * Fix race when initializing ColumnFamilyStore (CASSANDRA-5350)
+  * Add UseTLAB JVM flag (CASSANDRA-5361)
  
  
 +1.2.2
 + * fix potential for multiple concurrent compactions of the same sstables
 +   (CASSANDRA-5256)
 + * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199)
 + * fix symlinks under data dir not working (CASSANDRA-5185)
 + * fix bug in compact storage metadata handling (CASSANDRA-5189)
 + * Validate login for USE queries (CASSANDRA-5207)
 + * cli: remove default username and password (CASSANDRA-5208)
 + * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694)
 + * allow configuration of internode socket buffer (CASSANDRA-3378)
 + * Make sstable directory picking blacklist-aware again (CASSANDRA-5193)
 + * Correctly expire gossip states for edge cases (CASSANDRA-5216)
 + * Improve handling of directory creation failures (CASSANDRA-5196)
 + * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464)
 + * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * CQL3 refactor to allow conversion function (CASSANDRA-5226)
 + * Fix drop of sstables in some circumstance (CASSANDRA-5232)
 + * Implement caching of authorization results (CASSANDRA-4295)
 + * Add support for LZ4 compression (CASSANDRA-5038)
 + * Fix missing columns in wide rows queries (CASSANDRA-5225)
 + * Simplify auth setup and make system_auth ks alterable (CASSANDRA-5112)
 + * Stop compactions from hanging during bootstrap (CASSANDRA-5244)
 + * fix compressed streaming sending extra chunk (CASSANDRA-5105)
 + * Add CQL3-based implementations of IAuthenticator and IAuthorizer
 +   (CASSANDRA-4898)
 + * Fix timestamp-based tomstone removal logic (CASSANDRA-5248)
 + * cli: Add JMX authentication support (CASSANDRA-5080)
 + * Fix forceFlush behavior (CASSANDRA-5241)
 + * cqlsh: Add username autocompletion (CASSANDRA-5231)
 + * Fix CQL3 composite partition key error (CASSANDRA-5240)
 + * Allow IN clause on last clustering key (CASSANDRA-5230)
 +
 +
 +1.2.1
 + * stream undelivered hints on decommission (CASSANDRA-5128)
 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed 
(CASSANDRA-5133)
 + * drain should flush system CFs too (CASSANDRA-4446)
 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
 + * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit to SELEC

[2/2] git commit: merge from 1.1

2013-03-21 Thread jake

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: dd184c430f6fdb5b9e062670a48f524f174fd954
Parents: 9f268d1 c5864a5
Author: jluci...@bluemountaincapital.com 
Authored: Thu Mar 21 12:43:45 2013 -0400
Committer: jluci...@bluemountaincapital.com 
Committed: Thu Mar 21 12:43:45 2013 -0400

--
 CHANGES.txt   |1 +
 conf/cassandra-env.sh |1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd184c43/CHANGES.txt
--
diff --cc CHANGES.txt
index 6827087,e2b1daa..0959ac9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -39,89 -7,9 +39,90 @@@ Merged from 1.1
   * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284)
   * cqlsh: Add inet type support on Windows (ipv4-only) (CASSANDRA-4801)
   * Fix race when initializing ColumnFamilyStore (CASSANDRA-5350)
+  * Add UseTLAB JVM flag (CASSANDRA-5361)
  
  
 +1.2.2
 + * fix potential for multiple concurrent compactions of the same sstables
 +   (CASSANDRA-5256)
 + * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199)
 + * fix symlinks under data dir not working (CASSANDRA-5185)
 + * fix bug in compact storage metadata handling (CASSANDRA-5189)
 + * Validate login for USE queries (CASSANDRA-5207)
 + * cli: remove default username and password (CASSANDRA-5208)
 + * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694)
 + * allow configuration of internode socket buffer (CASSANDRA-3378)
 + * Make sstable directory picking blacklist-aware again (CASSANDRA-5193)
 + * Correctly expire gossip states for edge cases (CASSANDRA-5216)
 + * Improve handling of directory creation failures (CASSANDRA-5196)
 + * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464)
 + * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * CQL3 refactor to allow conversion function (CASSANDRA-5226)
 + * Fix drop of sstables in some circumstance (CASSANDRA-5232)
 + * Implement caching of authorization results (CASSANDRA-4295)
 + * Add support for LZ4 compression (CASSANDRA-5038)
 + * Fix missing columns in wide rows queries (CASSANDRA-5225)
 + * Simplify auth setup and make system_auth ks alterable (CASSANDRA-5112)
 + * Stop compactions from hanging during bootstrap (CASSANDRA-5244)
 + * fix compressed streaming sending extra chunk (CASSANDRA-5105)
 + * Add CQL3-based implementations of IAuthenticator and IAuthorizer
 +   (CASSANDRA-4898)
 + * Fix timestamp-based tomstone removal logic (CASSANDRA-5248)
 + * cli: Add JMX authentication support (CASSANDRA-5080)
 + * Fix forceFlush behavior (CASSANDRA-5241)
 + * cqlsh: Add username autocompletion (CASSANDRA-5231)
 + * Fix CQL3 composite partition key error (CASSANDRA-5240)
 + * Allow IN clause on last clustering key (CASSANDRA-5230)
 +
 +
 +1.2.1
 + * stream undelivered hints on decommission (CASSANDRA-5128)
 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed 
(CASSANDRA-5133)
 + * drain should flush system CFs too (CASSANDRA-4446)
 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
 + * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit

[2/5] git commit: merge from 1.1

2013-03-11 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 51d71a79b8f5be772396a2701687665cb83922f1
Parents: 61465c3 37ba434
Author: Pavel Yaskevich 
Authored: Sun Mar 10 15:38:05 2013 -0700
Committer: Pavel Yaskevich 
Committed: Sun Mar 10 15:38:05 2013 -0700

--
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51d71a79/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
--

[2/2] git commit: merge from 1.1

2013-03-10 Thread xedin

Updated Branches:
  refs/heads/cassandra-1.2 61465c39a -> 51d71a79b


merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 51d71a79b8f5be772396a2701687665cb83922f1
Parents: 61465c3 37ba434
Author: Pavel Yaskevich 
Authored: Sun Mar 10 15:38:05 2013 -0700
Committer: Pavel Yaskevich 
Committed: Sun Mar 10 15:38:05 2013 -0700

--
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51d71a79/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
--

[9/11] git commit: merge from 1.1

2013-03-07 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 6895bd6278d6578f9c727dc3a7b5bd07080645c2
Parents: aadc5e5 712d468
Author: Jonathan Ellis 
Authored: Thu Mar 7 15:26:59 2013 -0600
Committer: Jonathan Ellis 
Committed: Thu Mar 7 15:27:31 2013 -0600

--
 .../cassandra/config/DatabaseDescriptor.java   |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6895bd62/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 2ad41ab,afcfb42..dec3773
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -38,9 -36,8 +38,10 @@@ import org.apache.cassandra.config.Encr
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.DefsTable;
  import org.apache.cassandra.db.SystemTable;
+ import org.apache.cassandra.db.Table;
  import org.apache.cassandra.dht.IPartitioner;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.io.FSWriteError;
  import org.apache.cassandra.io.util.FileUtils;
  import org.apache.cassandra.locator.DynamicEndpointSnitch;
  import org.apache.cassandra.locator.EndpointSnitchInfo;
@@@ -582,7 -551,7 +583,7 @@@ public class DatabaseDescripto
  {
  public boolean accept(File pathname)
  {
- return (pathname.isDirectory() && 
!Table.SYSTEM_KS.equals(pathname.getName()));
 -return (pathname.isDirectory() && 
!Table.SYSTEM_TABLE.equals(pathname.getName()));
++return (pathname.isDirectory() && 
!Schema.systemKeyspaceNames.contains(pathname.getName()));
  }
  }).length;

[10/11] git commit: merge from 1.1

2013-03-07 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 6895bd6278d6578f9c727dc3a7b5bd07080645c2
Parents: aadc5e5 712d468
Author: Jonathan Ellis 
Authored: Thu Mar 7 15:26:59 2013 -0600
Committer: Jonathan Ellis 
Committed: Thu Mar 7 15:27:31 2013 -0600

--
 .../cassandra/config/DatabaseDescriptor.java   |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6895bd62/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 2ad41ab,afcfb42..dec3773
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -38,9 -36,8 +38,10 @@@ import org.apache.cassandra.config.Encr
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.DefsTable;
  import org.apache.cassandra.db.SystemTable;
+ import org.apache.cassandra.db.Table;
  import org.apache.cassandra.dht.IPartitioner;
 +import org.apache.cassandra.exceptions.ConfigurationException;
 +import org.apache.cassandra.io.FSWriteError;
  import org.apache.cassandra.io.util.FileUtils;
  import org.apache.cassandra.locator.DynamicEndpointSnitch;
  import org.apache.cassandra.locator.EndpointSnitchInfo;
@@@ -582,7 -551,7 +583,7 @@@ public class DatabaseDescripto
  {
  public boolean accept(File pathname)
  {
- return (pathname.isDirectory() && 
!Table.SYSTEM_KS.equals(pathname.getName()));
 -return (pathname.isDirectory() && 
!Table.SYSTEM_TABLE.equals(pathname.getName()));
++return (pathname.isDirectory() && 
!Schema.systemKeyspaceNames.contains(pathname.getName()));
  }
  }).length;

[2/4] git commit: merge from 1.1

2013-01-29 Thread slebresne

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 4feb87d37544b9fde722786555475f2f790059ca
Parents: 7752f01 73d828e
Author: Pavel Yaskevich 
Authored: Mon Jan 28 10:45:47 2013 -0800
Committer: Pavel Yaskevich 
Committed: Mon Jan 28 10:45:47 2013 -0800

--
 CHANGES.txt|1 +
 .../cassandra/hadoop/ColumnFamilyOutputFormat.java |4 +-
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |4 +-
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |   34 ++-
 .../apache/cassandra/thrift/ITransportFactory.java |3 +-
 .../apache/cassandra/thrift/TBinaryProtocol.java   |8 +++
 .../cassandra/thrift/TFramedTransportFactory.java  |7 ++-
 7 files changed, 52 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/thrift/TBinaryProtocol.java
--

[2/2] git commit: merge from 1.1

2013-01-28 Thread xedin

Updated Branches:
  refs/heads/cassandra-1.2 7752f018b -> 4feb87d37


merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 4feb87d37544b9fde722786555475f2f790059ca
Parents: 7752f01 73d828e
Author: Pavel Yaskevich 
Authored: Mon Jan 28 10:45:47 2013 -0800
Committer: Pavel Yaskevich 
Committed: Mon Jan 28 10:45:47 2013 -0800

--
 CHANGES.txt|1 +
 .../cassandra/hadoop/ColumnFamilyOutputFormat.java |4 +-
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |4 +-
 .../org/apache/cassandra/hadoop/ConfigHelper.java  |   34 ++-
 .../apache/cassandra/thrift/ITransportFactory.java |3 +-
 .../apache/cassandra/thrift/TBinaryProtocol.java   |8 +++
 .../cassandra/thrift/TFramedTransportFactory.java  |7 ++-
 7 files changed, 52 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4feb87d3/src/java/org/apache/cassandra/thrift/TBinaryProtocol.java
--

[9/10] git commit: merge from 1.1

2013-01-24 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: ba6cd11b74c3cebc6491b5a868ac5c26add3872b
Parents: 9719b68 9c8d949
Author: Jonathan Ellis 
Authored: Thu Jan 24 08:57:47 2013 -0600
Committer: Jonathan Ellis 
Committed: Thu Jan 24 08:57:47 2013 -0600

--
 CHANGES.txt|1 +
 .../db/compaction/LazilyCompactedRow.java  |2 +-
 .../cassandra/io/sstable/SSTableMetadata.java  |2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba6cd11b/CHANGES.txt
--
diff --cc CHANGES.txt
index 2f054f7,61bcf60..02317b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,17 +1,56 @@@
 -1.1.10
 +1.2.1
 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed 
(CASSANDRA-5133)
 + * drain should flush system CFs too (CASSANDRA-4446)
 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
 + * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
 + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
 + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
 + * Validate correctly selects on composite partition key (CASSANDRA-5122)
 + * Fix exception when adding collection (CASSANDRA-5117)
 + * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
 + * Refuse unrecognized replication strategy options (CASSANDRA-4795)
 + * Pick the correct value validator in sstable2json for cql3 tables 
(CASSANDRA-5134)
 + * Validate login for describe_keyspace, describe_keyspaces and set_keyspace
 +   (CASSANDRA-5144)
 + * Fix inserting empty maps (CASSANDRA-5141)
 + * Don't remove tokens from System table for node we know (CASSANDRA-5121)
 + * fix streaming progress report for compresed files (CASSANDRA-5130)
 + * Coverage analysis for low-CL queries (CASSANDRA-4858)
 + * Stop interpreting dates as valid timeUUID value (CASSANDRA-4936)
 + * Adds E notation for floating point numbers (CASSANDRA-4927)
 + * Detect (and warn) unintentional use of the cql2 thrift methods when cql3 
was
 +   intended (CASSANDRA-5172)
 +Merged from 1.1:
   * fix saved key cache not loading at startup (CASSANDRA-5166)
   * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170)
+  * fix sstable maxtimestamp for row deletes and pre-1.1.1 sstables 
(CASSANDRA-5153)
 -
 -
 -1.1.9
   * Simplify CompressedRandomAccessReader to work around JDK FD bug 
(CASSANDRA-5088)
   * Improve handling a changing target throttle rate mid-compaction 
(CASSANDRA-5087)
 - * fix multithreaded compaction deadlock (CASSANDRA-4492)
 - * fix specifying and altering crc_check_chance (CASSANDRA-5053)
 - * Don't expire columns sooner than they should in 2ndary indexes 
(CASSANDRA-5079)
   * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
   * nodetool repair command now prints progress (CASSANDRA-4767)
 + * Ensure Jackson dependency matches lib (CASSANDRA-5126)
   * fix user defined compaction to run against 1.1 data directory 
(CASSANDRA-5118)
   * Fix CQL3 BATCH authorization caching (CASSANDRA-5145)
   * fix get_count returns incorrec

[8/10] git commit: merge from 1.1

2013-01-24 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: ba6cd11b74c3cebc6491b5a868ac5c26add3872b
Parents: 9719b68 9c8d949
Author: Jonathan Ellis 
Authored: Thu Jan 24 08:57:47 2013 -0600
Committer: Jonathan Ellis 
Committed: Thu Jan 24 08:57:47 2013 -0600

--
 CHANGES.txt|1 +
 .../db/compaction/LazilyCompactedRow.java  |2 +-
 .../cassandra/io/sstable/SSTableMetadata.java  |2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba6cd11b/CHANGES.txt
--
diff --cc CHANGES.txt
index 2f054f7,61bcf60..02317b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,17 +1,56 @@@
 -1.1.10
 +1.2.1
 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed 
(CASSANDRA-5133)
 + * drain should flush system CFs too (CASSANDRA-4446)
 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
 + * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
 + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
 + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
 + * Validate correctly selects on composite partition key (CASSANDRA-5122)
 + * Fix exception when adding collection (CASSANDRA-5117)
 + * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
 + * Refuse unrecognized replication strategy options (CASSANDRA-4795)
 + * Pick the correct value validator in sstable2json for cql3 tables 
(CASSANDRA-5134)
 + * Validate login for describe_keyspace, describe_keyspaces and set_keyspace
 +   (CASSANDRA-5144)
 + * Fix inserting empty maps (CASSANDRA-5141)
 + * Don't remove tokens from System table for node we know (CASSANDRA-5121)
 + * fix streaming progress report for compresed files (CASSANDRA-5130)
 + * Coverage analysis for low-CL queries (CASSANDRA-4858)
 + * Stop interpreting dates as valid timeUUID value (CASSANDRA-4936)
 + * Adds E notation for floating point numbers (CASSANDRA-4927)
 + * Detect (and warn) unintentional use of the cql2 thrift methods when cql3 
was
 +   intended (CASSANDRA-5172)
 +Merged from 1.1:
   * fix saved key cache not loading at startup (CASSANDRA-5166)
   * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170)
+  * fix sstable maxtimestamp for row deletes and pre-1.1.1 sstables 
(CASSANDRA-5153)
 -
 -
 -1.1.9
   * Simplify CompressedRandomAccessReader to work around JDK FD bug 
(CASSANDRA-5088)
   * Improve handling a changing target throttle rate mid-compaction 
(CASSANDRA-5087)
 - * fix multithreaded compaction deadlock (CASSANDRA-4492)
 - * fix specifying and altering crc_check_chance (CASSANDRA-5053)
 - * Don't expire columns sooner than they should in 2ndary indexes 
(CASSANDRA-5079)
   * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
   * nodetool repair command now prints progress (CASSANDRA-4767)
 + * Ensure Jackson dependency matches lib (CASSANDRA-5126)
   * fix user defined compaction to run against 1.1 data directory 
(CASSANDRA-5118)
   * Fix CQL3 BATCH authorization caching (CASSANDRA-5145)
   * fix get_count returns incorrect value

[5/6] git commit: merge from 1.1

2013-01-18 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: a330716d4507079e3ae208c7b4a4c50f01ce6c8f
Parents: 17adf8e a7da029
Author: Jonathan Ellis 
Authored: Fri Jan 18 12:58:18 2013 -0800
Committer: Jonathan Ellis 
Committed: Fri Jan 18 12:58:18 2013 -0800

--
 CHANGES.txt|2 ++
 .../apache/cassandra/service/LoadBroadcaster.java  |6 --
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a330716d/CHANGES.txt
--
diff --cc CHANGES.txt
index 86743ca,9cdb02a..2f054f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,53 -1,16 +1,55 @@@
 -1.1.10
 +1.2.1
 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed 
(CASSANDRA-5133)
 + * drain should flush system CFs too (CASSANDRA-4446)
 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
 + * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
 + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
 + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
 + * Validate correctly selects on composite partition key (CASSANDRA-5122)
 + * Fix exception when adding collection (CASSANDRA-5117)
 + * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
 + * Refuse unrecognized replication strategy options (CASSANDRA-4795)
 + * Pick the correct value validator in sstable2json for cql3 tables 
(CASSANDRA-5134)
 + * Validate login for describe_keyspace, describe_keyspaces and set_keyspace
 +   (CASSANDRA-5144)
 + * Fix inserting empty maps (CASSANDRA-5141)
 + * Don't remove tokens from System table for node we know (CASSANDRA-5121)
 + * fix streaming progress report for compresed files (CASSANDRA-5130)
 + * Coverage analysis for low-CL queries (CASSANDRA-4858)
 + * Stop interpreting dates as valid timeUUID value (CASSANDRA-4936)
 + * Adds E notation for floating point numbers (CASSANDRA-4927)
 + * Detect (and warn) unintentional use of the cql2 thrift methods when cql3 
was
 +   intended (CASSANDRA-5172)
 +Merged from 1.1:
+  * fix saved key cache not loading at startup (CASSANDRA-5166)
+  * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170)
 -
 -
 -1.1.9
   * Simplify CompressedRandomAccessReader to work around JDK FD bug 
(CASSANDRA-5088)
   * Improve handling a changing target throttle rate mid-compaction 
(CASSANDRA-5087)
 - * fix multithreaded compaction deadlock (CASSANDRA-4492)
 - * fix specifying and altering crc_check_chance (CASSANDRA-5053)
 - * Don't expire columns sooner than they should in 2ndary indexes 
(CASSANDRA-5079)
   * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
   * nodetool repair command now prints progress (CASSANDRA-4767)
 + * Ensure Jackson dependency matches lib (CASSANDRA-5126)
   * fix user defined compaction to run against 1.1 data directory 
(CASSANDRA-5118)
   * Fix CQL3 BATCH authorization caching (CASSANDRA-5145)
   * fix get_count returns incorrect value with TTL (CASSANDRA-5099)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a330716d/src/java/org/apache/cassandra/service/LoadBroa

[4/6] git commit: merge from 1.1

2013-01-18 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: a330716d4507079e3ae208c7b4a4c50f01ce6c8f
Parents: 17adf8e a7da029
Author: Jonathan Ellis 
Authored: Fri Jan 18 12:58:18 2013 -0800
Committer: Jonathan Ellis 
Committed: Fri Jan 18 12:58:18 2013 -0800

--
 CHANGES.txt|2 ++
 .../apache/cassandra/service/LoadBroadcaster.java  |6 --
 2 files changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a330716d/CHANGES.txt
--
diff --cc CHANGES.txt
index 86743ca,9cdb02a..2f054f7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,53 -1,16 +1,55 @@@
 -1.1.10
 +1.2.1
 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed 
(CASSANDRA-5133)
 + * drain should flush system CFs too (CASSANDRA-4446)
 + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
 + * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
 + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
 + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
 + * Validate correctly selects on composite partition key (CASSANDRA-5122)
 + * Fix exception when adding collection (CASSANDRA-5117)
 + * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
 + * Refuse unrecognized replication strategy options (CASSANDRA-4795)
 + * Pick the correct value validator in sstable2json for cql3 tables 
(CASSANDRA-5134)
 + * Validate login for describe_keyspace, describe_keyspaces and set_keyspace
 +   (CASSANDRA-5144)
 + * Fix inserting empty maps (CASSANDRA-5141)
 + * Don't remove tokens from System table for node we know (CASSANDRA-5121)
 + * fix streaming progress report for compresed files (CASSANDRA-5130)
 + * Coverage analysis for low-CL queries (CASSANDRA-4858)
 + * Stop interpreting dates as valid timeUUID value (CASSANDRA-4936)
 + * Adds E notation for floating point numbers (CASSANDRA-4927)
 + * Detect (and warn) unintentional use of the cql2 thrift methods when cql3 
was
 +   intended (CASSANDRA-5172)
 +Merged from 1.1:
+  * fix saved key cache not loading at startup (CASSANDRA-5166)
+  * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170)
 -
 -
 -1.1.9
   * Simplify CompressedRandomAccessReader to work around JDK FD bug 
(CASSANDRA-5088)
   * Improve handling a changing target throttle rate mid-compaction 
(CASSANDRA-5087)
 - * fix multithreaded compaction deadlock (CASSANDRA-4492)
 - * fix specifying and altering crc_check_chance (CASSANDRA-5053)
 - * Don't expire columns sooner than they should in 2ndary indexes 
(CASSANDRA-5079)
   * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
   * nodetool repair command now prints progress (CASSANDRA-4767)
 + * Ensure Jackson dependency matches lib (CASSANDRA-5126)
   * fix user defined compaction to run against 1.1 data directory 
(CASSANDRA-5118)
   * Fix CQL3 BATCH authorization caching (CASSANDRA-5145)
   * fix get_count returns incorrect value with TTL (CASSANDRA-5099)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a330716d/src/java/org/apache/cassandra/service/LoadBroadcaster.

[5/6] git commit: merge from 1.1

2013-01-10 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: a1b601e435a3dc97b46bad32cb4060ba063c5718
Parents: 1b41d6f ccdb632
Author: Jonathan Ellis 
Authored: Thu Jan 10 12:52:01 2013 -0600
Committer: Jonathan Ellis 
Committed: Thu Jan 10 12:52:01 2013 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/thrift/ThriftValidation.java  |7 +++
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1b601e4/CHANGES.txt
--
diff --cc CHANGES.txt
index 5100c1a,58dbc7b..63c0b1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,11 +1,40 @@@
 -1.1.9
 +1.2.1
++ * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
 + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
 + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
 + * Validate correctly selects on composite partition key (CASSANDRA-5122)
 + * Fix exception when adding collection (CASSANDRA-5117)
 + * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
 + * Refuse unrecognized replication strategy options (CASSANDRA-4795)
 + * Pick the correct value validator in sstable2json for cql3 tables 
(CASSANDRA-5134)
 +Merged from 1.1:
   * Simplify CompressedRandomAccessReader to work around JDK FD bug 
(CASSANDRA-5088)
   * Improve handling a changing target throttle rate mid-compaction 
(CASSANDRA-5087)
 - * fix multithreaded compaction deadlock (CASSANDRA-4492)
 - * fix specifying and altering crc_check_chance (CASSANDRA-5053)
 - * Don't expire columns sooner than they should in 2ndary indexes 
(CASSANDRA-5079)
   * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
   * nodetool repair command now prints progress (CASSANDRA-4767)
 + * Ensure Jackson dependency matches lib (CASSANDRA-5126)
   * fix user defined compaction to run against 1.1 data directory 
(CASSANDRA-5118)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1b601e4/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index c0702b2,bc64018..eebc378
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -476,18 -502,17 +476,17 @@@ public class ThriftValidatio
  if (startToken.compareTo(endToken) > 0 && !endToken.isMinimum(p))
  {
  if (p.preservesOrder())
 -throw new InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
 +throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
  else
 -throw new InvalidRequestException("start key's md5 sorts 
after end key's md5.  this is not allowed; you probably should not specify end 
key at all, under RandomPartitioner");
 +throw new 
org.apache.cass

[4/6] git commit: merge from 1.1

2013-01-10 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: a1b601e435a3dc97b46bad32cb4060ba063c5718
Parents: 1b41d6f ccdb632
Author: Jonathan Ellis 
Authored: Thu Jan 10 12:52:01 2013 -0600
Committer: Jonathan Ellis 
Committed: Thu Jan 10 12:52:01 2013 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/thrift/ThriftValidation.java  |7 +++
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1b601e4/CHANGES.txt
--
diff --cc CHANGES.txt
index 5100c1a,58dbc7b..63c0b1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,11 +1,40 @@@
 -1.1.9
 +1.2.1
++ * re-allow wrapping ranges for start_token/end_token range pairing 
(CASSANDRA-5106)
 + * fix validation compaction of empty rows (CASSADRA-5136)
 + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
 + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
 + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and 
 +   CompactionManagerMBean (CASSANDRA-5044)
 + * fix hinting for dropped local writes (CASSANDRA-4753)
 + * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
 + * apply disk_failure_policy to bad disks on initial directory creation 
 +   (CASSANDRA-4847)
 + * Optimize name-based queries to use ArrayBackedSortedColumns 
(CASSANDRA-5043)
 + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
 + * pool [Compressed]RandomAccessReader objects on the partitioned read path
 +   (CASSANDRA-4942)
 + * Add debug logging to list filenames processed by Directories.migrateFile 
 +   method (CASSANDRA-4939)
 + * Expose black-listed directories via JMX (CASSANDRA-4848)
 + * Log compaction merge counts (CASSANDRA-4894)
 + * Minimize byte array allocation by AbstractData{Input,Output} 
(CASSANDRA-5090)
 + * Add SSL support for the binary protocol (CASSANDRA-5031)
 + * Allow non-schema system ks modification for shuffle to work 
(CASSANDRA-5097)
 + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
 + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
 + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
 + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
 + * Validate correctly selects on composite partition key (CASSANDRA-5122)
 + * Fix exception when adding collection (CASSANDRA-5117)
 + * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
 + * Refuse unrecognized replication strategy options (CASSANDRA-4795)
 + * Pick the correct value validator in sstable2json for cql3 tables 
(CASSANDRA-5134)
 +Merged from 1.1:
   * Simplify CompressedRandomAccessReader to work around JDK FD bug 
(CASSANDRA-5088)
   * Improve handling a changing target throttle rate mid-compaction 
(CASSANDRA-5087)
 - * fix multithreaded compaction deadlock (CASSANDRA-4492)
 - * fix specifying and altering crc_check_chance (CASSANDRA-5053)
 - * Don't expire columns sooner than they should in 2ndary indexes 
(CASSANDRA-5079)
   * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
   * nodetool repair command now prints progress (CASSANDRA-4767)
 + * Ensure Jackson dependency matches lib (CASSANDRA-5126)
   * fix user defined compaction to run against 1.1 data directory 
(CASSANDRA-5118)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1b601e4/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index c0702b2,bc64018..eebc378
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -476,18 -502,17 +476,17 @@@ public class ThriftValidatio
  if (startToken.compareTo(endToken) > 0 && !endToken.isMinimum(p))
  {
  if (p.preservesOrder())
 -throw new InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
 +throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
  else
 -throw new InvalidRequestException("start key's md5 sorts 
after end key's md5.  this is not allowed; you probably should not specify end 
key at all, under RandomPartitioner");
 +throw new 
org.apache.cassandra.ex

[4/6] git commit: merge from 1.1

2013-01-09 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 94f0b8568db62d09c1c82a2eb3da6d5a1b599c99
Parents: 1c2a69c 0d2410e
Author: Jonathan Ellis 
Authored: Wed Jan 9 16:44:13 2013 -0600
Committer: Jonathan Ellis 
Committed: Wed Jan 9 16:44:19 2013 -0600

--
 .../apache/cassandra/thrift/ThriftValidation.java  |8 
 1 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/94f0b856/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index 6473acd,f9733d6..c0702b2
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -460,7 -486,7 +460,7 @@@ public class ThriftValidatio
  if ((range.start_key == null) == (range.start_token == null)
  || (range.end_key == null) == (range.end_token == null))
  {
- throw new 
org.apache.cassandra.exceptions.InvalidRequestException("exactly one of {start 
key, end key} or {start token, end token} must be specified");
 -throw new InvalidRequestException("exactly one each of {start 
key, start token} and {end key, end token} must be specified");
++throw new 
org.apache.cassandra.exceptions.InvalidRequestException("exactly one each of 
{start key, start token} and {end key, end token} must be specified");
  }
  
  // (key, token) is supported (for wide-row CFRR) but not (token, key)
@@@ -475,10 -501,10 +475,10 @@@
  Token endToken = p.getToken(range.end_key);
  if (startToken.compareTo(endToken) > 0 && !endToken.isMinimum(p))
  {
- if (p instanceof RandomPartitioner)
- throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key's md5 sorts 
after end key's md5.  this is not allowed; you probably should not specify end 
key at all, under RandomPartitioner");
- else
+ if (p.preservesOrder())
 -throw new InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
 +throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
+ else
 -throw new InvalidRequestException("start key's md5 sorts 
after end key's md5.  this is not allowed; you probably should not specify end 
key at all, under RandomPartitioner");
++throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key's token 
sorts after end key's token.  this is not allowed; you probably should not 
specify end key at all except with an ordered partitioner");
  }
  }
  else if (range.end_token != null)

[5/6] git commit: merge from 1.1

2013-01-09 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 94f0b8568db62d09c1c82a2eb3da6d5a1b599c99
Parents: 1c2a69c 0d2410e
Author: Jonathan Ellis 
Authored: Wed Jan 9 16:44:13 2013 -0600
Committer: Jonathan Ellis 
Committed: Wed Jan 9 16:44:19 2013 -0600

--
 .../apache/cassandra/thrift/ThriftValidation.java  |8 
 1 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/94f0b856/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index 6473acd,f9733d6..c0702b2
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -460,7 -486,7 +460,7 @@@ public class ThriftValidatio
  if ((range.start_key == null) == (range.start_token == null)
  || (range.end_key == null) == (range.end_token == null))
  {
- throw new 
org.apache.cassandra.exceptions.InvalidRequestException("exactly one of {start 
key, end key} or {start token, end token} must be specified");
 -throw new InvalidRequestException("exactly one each of {start 
key, start token} and {end key, end token} must be specified");
++throw new 
org.apache.cassandra.exceptions.InvalidRequestException("exactly one each of 
{start key, start token} and {end key, end token} must be specified");
  }
  
  // (key, token) is supported (for wide-row CFRR) but not (token, key)
@@@ -475,10 -501,10 +475,10 @@@
  Token endToken = p.getToken(range.end_key);
  if (startToken.compareTo(endToken) > 0 && !endToken.isMinimum(p))
  {
- if (p instanceof RandomPartitioner)
- throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key's md5 sorts 
after end key's md5.  this is not allowed; you probably should not specify end 
key at all, under RandomPartitioner");
- else
+ if (p.preservesOrder())
 -throw new InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
 +throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key must sort 
before (or equal to) finish key in your partitioner!");
+ else
 -throw new InvalidRequestException("start key's md5 sorts 
after end key's md5.  this is not allowed; you probably should not specify end 
key at all, under RandomPartitioner");
++throw new 
org.apache.cassandra.exceptions.InvalidRequestException("start key's token 
sorts after end key's token.  this is not allowed; you probably should not 
specify end key at all except with an ordered partitioner");
  }
  }
  else if (range.end_token != null)

[4/10] git commit: merge from 1.1

2012-12-18 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: fb9ad748d58bddc5e1be1ca84eec503d8a35c695
Parents: d67816b 134e8c7
Author: Jonathan Ellis 
Authored: Tue Dec 18 14:51:41 2012 -0600
Committer: Jonathan Ellis 
Committed: Tue Dec 18 14:53:29 2012 -0600

--
 CHANGES.txt|1 +
 conf/cassandra.yaml|   15 ++-
 .../db/compaction/AbstractCompactedRow.java|3 ++-
 .../cassandra/db/compaction/CompactionTask.java|3 +++
 .../db/compaction/LazilyCompactedRow.java  |2 +-
 .../cassandra/db/compaction/PrecompactedRow.java   |2 ++
 6 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9ad748/CHANGES.txt
--
diff --cc CHANGES.txt
index 2e789fa,cc75791..7a17236
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,141 -1,28 +1,142 @@@
 -1.1.9
 +1.2.0-rc2
 + * fix nodetool ownership display with vnodes (CASSANDRA-5065)
 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
 + * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
 + * Fix SimpleAuthorizer example (CASSANDRA-5072)
 + * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
 + * Includes cassandra-shuffle in the debian package (CASSANDRA-5058)
 +Merged from 1.1:
+  * fix multithreaded compaction deadlock (CASSANDRA-4492)
 -
 -
 -1.1.8
 - * reset getRangeSlice filter after finishing a row for get_paged_slice
 -   (CASSANDRA-4919)
   * fix temporarily missing schema after upgrade from pre-1.1.5 
(CASSANDRA-5061)
 + * Fix ALTER TABLE overriding compression options with defaults
 +   (CASSANDRA-4996, CASSANDRA-5066)
 +
 +
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 + * Fix inserting only a key in CQL3 (CASSANDRA-5040)
 + * Fix CQL3 token() function when used with strings (CASSANDRA-5050)
 +Merged from 1.1:
   * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
 + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827)
   * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
 - * Fix ALTER TABLE overriding compression options with defaults 
(CASSANDRA-4996, 5066)
 - * Avoid error opening data file on startup (CASSANDRA-4984)
 - * Fix wrong index_options in cli 'show schema' (CASSANDRA-5008)
 - * Allow overriding number of available processor (CASSANDRA-4790)
  
  
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 +

[5/10] git commit: merge from 1.1

2012-12-18 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: fb9ad748d58bddc5e1be1ca84eec503d8a35c695
Parents: d67816b 134e8c7
Author: Jonathan Ellis 
Authored: Tue Dec 18 14:51:41 2012 -0600
Committer: Jonathan Ellis 
Committed: Tue Dec 18 14:53:29 2012 -0600

--
 CHANGES.txt|1 +
 conf/cassandra.yaml|   15 ++-
 .../db/compaction/AbstractCompactedRow.java|3 ++-
 .../cassandra/db/compaction/CompactionTask.java|3 +++
 .../db/compaction/LazilyCompactedRow.java  |2 +-
 .../cassandra/db/compaction/PrecompactedRow.java   |2 ++
 6 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9ad748/CHANGES.txt
--
diff --cc CHANGES.txt
index 2e789fa,cc75791..7a17236
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,141 -1,28 +1,142 @@@
 -1.1.9
 +1.2.0-rc2
 + * fix nodetool ownership display with vnodes (CASSANDRA-5065)
 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
 + * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
 + * Fix SimpleAuthorizer example (CASSANDRA-5072)
 + * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
 + * Includes cassandra-shuffle in the debian package (CASSANDRA-5058)
 +Merged from 1.1:
+  * fix multithreaded compaction deadlock (CASSANDRA-4492)
 -
 -
 -1.1.8
 - * reset getRangeSlice filter after finishing a row for get_paged_slice
 -   (CASSANDRA-4919)
   * fix temporarily missing schema after upgrade from pre-1.1.5 
(CASSANDRA-5061)
 + * Fix ALTER TABLE overriding compression options with defaults
 +   (CASSANDRA-4996, CASSANDRA-5066)
 +
 +
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 + * Fix inserting only a key in CQL3 (CASSANDRA-5040)
 + * Fix CQL3 token() function when used with strings (CASSANDRA-5050)
 +Merged from 1.1:
   * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
 + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827)
   * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
 - * Fix ALTER TABLE overriding compression options with defaults 
(CASSANDRA-4996, 5066)
 - * Avoid error opening data file on startup (CASSANDRA-4984)
 - * Fix wrong index_options in cli 'show schema' (CASSANDRA-5008)
 - * Allow overriding number of available processor (CASSANDRA-4790)
  
  
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA

[6/10] git commit: merge from 1.1

2012-12-18 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: fb9ad748d58bddc5e1be1ca84eec503d8a35c695
Parents: d67816b 134e8c7
Author: Jonathan Ellis 
Authored: Tue Dec 18 14:51:41 2012 -0600
Committer: Jonathan Ellis 
Committed: Tue Dec 18 14:53:29 2012 -0600

--
 CHANGES.txt|1 +
 conf/cassandra.yaml|   15 ++-
 .../db/compaction/AbstractCompactedRow.java|3 ++-
 .../cassandra/db/compaction/CompactionTask.java|3 +++
 .../db/compaction/LazilyCompactedRow.java  |2 +-
 .../cassandra/db/compaction/PrecompactedRow.java   |2 ++
 6 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb9ad748/CHANGES.txt
--
diff --cc CHANGES.txt
index 2e789fa,cc75791..7a17236
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,141 -1,28 +1,142 @@@
 -1.1.9
 +1.2.0-rc2
 + * fix nodetool ownership display with vnodes (CASSANDRA-5065)
 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
 + * Fix potential infinite loop when reloading CFS (CASSANDRA-5064)
 + * Fix SimpleAuthorizer example (CASSANDRA-5072)
 + * cqlsh: force CL.ONE for tracing and system.schema* queries (CASSANDRA-5070)
 + * Includes cassandra-shuffle in the debian package (CASSANDRA-5058)
 +Merged from 1.1:
+  * fix multithreaded compaction deadlock (CASSANDRA-4492)
 -
 -
 -1.1.8
 - * reset getRangeSlice filter after finishing a row for get_paged_slice
 -   (CASSANDRA-4919)
   * fix temporarily missing schema after upgrade from pre-1.1.5 
(CASSANDRA-5061)
 + * Fix ALTER TABLE overriding compression options with defaults
 +   (CASSANDRA-4996, CASSANDRA-5066)
 +
 +
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 + * Fix inserting only a key in CQL3 (CASSANDRA-5040)
 + * Fix CQL3 token() function when used with strings (CASSANDRA-5050)
 +Merged from 1.1:
   * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
 + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827)
   * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
 - * Fix ALTER TABLE overriding compression options with defaults 
(CASSANDRA-4996, 5066)
 - * Avoid error opening data file on startup (CASSANDRA-4984)
 - * Fix wrong index_options in cli 'show schema' (CASSANDRA-5008)
 - * Allow overriding number of available processor (CASSANDRA-4790)
  
  
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4

[6/10] git commit: merge from 1.1

2012-12-13 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 3474613757028b3841d199d7173dd29eaad45155
Parents: 1bb78b0 3e27a32
Author: Jonathan Ellis 
Authored: Thu Dec 13 10:52:54 2012 -0600
Committer: Jonathan Ellis 
Committed: Thu Dec 13 10:52:54 2012 -0600

--
 CHANGES.txt |4 +++-
 src/java/org/apache/cassandra/db/DefsTable.java |   13 +
 2 files changed, 16 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/CHANGES.txt
--
diff --cc CHANGES.txt
index d73849c,e6b1b95..e09e925
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,9 +1,25 @@@
 -1.1.8
 +1.2.0
 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
++Merged from 1.1:
+  * fix temporarily missing schema after upgrade from pre-1.1.5 
(CASSANDRA-5061)
 +
 +
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 + * Fix inserting only a key in CQL3 (CASSANDRA-5040)
 + * Fix CQL3 token() function when used with strings (CASSANDRA-5050)
- Merged from 1.1
++Merged from 1.1:
   * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
 + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827)
   * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/src/java/org/apache/cassandra/db/DefsTable.java
--
diff --cc src/java/org/apache/cassandra/db/DefsTable.java
index 8569553,d564eaf..a9f6427
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@@ -241,8 -244,26 +241,21 @@@ public class DefsTabl
  
  mutation.apply();
  }
+ // flush immediately because we read schema before replaying the 
commitlog
+ try
+ {
+ cfs.forceBlockingFlush();
+ }
+ catch (ExecutionException e)
+ {
+ throw new RuntimeException("Could not flush after fixing schema 
timestamps", e);
+ }
+ catch (InterruptedException e)
+ {
+ throw new AssertionError(e);
+ }
  }
  
 -private static boolean invalidSchemaRow(Row row)
 -{
 -return row.cf == null || (row.cf.isMarkedForDelete() && 
row.cf.isEmpty());
 -}
 -
  public static ByteBuffer searchComposite(String name, boolean start)
  {
  assert name != null;

[5/10] git commit: merge from 1.1

2012-12-13 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: 3474613757028b3841d199d7173dd29eaad45155
Parents: 1bb78b0 3e27a32
Author: Jonathan Ellis 
Authored: Thu Dec 13 10:52:54 2012 -0600
Committer: Jonathan Ellis 
Committed: Thu Dec 13 10:52:54 2012 -0600

--
 CHANGES.txt |4 +++-
 src/java/org/apache/cassandra/db/DefsTable.java |   13 +
 2 files changed, 16 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/CHANGES.txt
--
diff --cc CHANGES.txt
index d73849c,e6b1b95..e09e925
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,9 +1,25 @@@
 -1.1.8
 +1.2.0
 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
++Merged from 1.1:
+  * fix temporarily missing schema after upgrade from pre-1.1.5 
(CASSANDRA-5061)
 +
 +
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 + * Fix inserting only a key in CQL3 (CASSANDRA-5040)
 + * Fix CQL3 token() function when used with strings (CASSANDRA-5050)
- Merged from 1.1
++Merged from 1.1:
   * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
 + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827)
   * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/src/java/org/apache/cassandra/db/DefsTable.java
--
diff --cc src/java/org/apache/cassandra/db/DefsTable.java
index 8569553,d564eaf..a9f6427
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@@ -241,8 -244,26 +241,21 @@@ public class DefsTabl
  
  mutation.apply();
  }
+ // flush immediately because we read schema before replaying the 
commitlog
+ try
+ {
+ cfs.forceBlockingFlush();
+ }
+ catch (ExecutionException e)
+ {
+ throw new RuntimeException("Could not flush after fixing schema 
timestamps", e);
+ }
+ catch (InterruptedException e)
+ {
+ throw new AssertionError(e);
+ }
  }
  
 -private static boolean invalidSchemaRow(Row row)
 -{
 -return row.cf == null || (row.cf.isMarkedForDelete() && 
row.cf.isEmpty());
 -}
 -
  public static ByteBuffer searchComposite(String name, boolean start)
  {
  assert name != null;

[4/10] git commit: merge from 1.1

2012-12-13 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 3474613757028b3841d199d7173dd29eaad45155
Parents: 1bb78b0 3e27a32
Author: Jonathan Ellis 
Authored: Thu Dec 13 10:52:54 2012 -0600
Committer: Jonathan Ellis 
Committed: Thu Dec 13 10:52:54 2012 -0600

--
 CHANGES.txt |4 +++-
 src/java/org/apache/cassandra/db/DefsTable.java |   13 +
 2 files changed, 16 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/CHANGES.txt
--
diff --cc CHANGES.txt
index d73849c,e6b1b95..e09e925
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,9 +1,25 @@@
 -1.1.8
 +1.2.0
 + * cqlsh: add DESCRIBE KEYSPACES command (CASSANDRA-5060)
++Merged from 1.1:
+  * fix temporarily missing schema after upgrade from pre-1.1.5 
(CASSANDRA-5061)
 +
 +
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 + * Fix inserting only a key in CQL3 (CASSANDRA-5040)
 + * Fix CQL3 token() function when used with strings (CASSANDRA-5050)
- Merged from 1.1
++Merged from 1.1:
   * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
 + * cqlsh: make it possible to describe thrift CFs (CASSANDRA-4827)
   * cqlsh: fix timestamp formatting on some platforms (CASSANDRA-5046)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/34746137/src/java/org/apache/cassandra/db/DefsTable.java
--
diff --cc src/java/org/apache/cassandra/db/DefsTable.java
index 8569553,d564eaf..a9f6427
--- a/src/java/org/apache/cassandra/db/DefsTable.java
+++ b/src/java/org/apache/cassandra/db/DefsTable.java
@@@ -241,8 -244,26 +241,21 @@@ public class DefsTabl
  
  mutation.apply();
  }
+ // flush immediately because we read schema before replaying the 
commitlog
+ try
+ {
+ cfs.forceBlockingFlush();
+ }
+ catch (ExecutionException e)
+ {
+ throw new RuntimeException("Could not flush after fixing schema 
timestamps", e);
+ }
+ catch (InterruptedException e)
+ {
+ throw new AssertionError(e);
+ }
  }
  
 -private static boolean invalidSchemaRow(Row row)
 -{
 -return row.cf == null || (row.cf.isMarkedForDelete() && 
row.cf.isEmpty());
 -}
 -
  public static ByteBuffer searchComposite(String name, boolean start)
  {
  assert name != null;

[5/13] git commit: merge from 1.1

2012-12-08 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: 66706d1cc3b60a1ad4265936616972bfd8f20aa0
Parents: bddfa9e 5b511b6
Author: Jonathan Ellis 
Authored: Sat Dec 8 10:19:27 2012 -0600
Committer: Jonathan Ellis 
Committed: Sat Dec 8 10:19:27 2012 -0600

--
 CHANGES.txt|2 +
 .../cassandra/db/compaction/CompactionManager.java |   18 +++
 .../cassandra/db/context/CounterContext.java   |   12 -
 3 files changed, 25 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66706d1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 48ebb87,15d63f0..b92984d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,14 +1,59 @@@
 -1.1.8
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 +Merged from 1.1
+  * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
  
+ 
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * (cql3) Fix adding column when the table has collections (CASSANDRA-4982)
 + * (cql3) Fix allowing collections with compact storage (CASSANDRA-4990)
 + * (cql3) Refuse ttl/writetime function on collections (CASSANDRA-4992)
 + * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
 + * clqsh: fix KEY pseudocolumn escaping when describing Thrift tables
 +   in CQL3 mode (CASSANDRA-4955)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
 +Merged from 1.1:
 + * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 + * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
 + * Fix assertion failure with leveled compaction (CASSANDRA-4799)
 + * Check for null end_token in get_range_slice (CASSANDRA-4804)
 + * Remove all remnants of removed nodes (CASSANDRA-4840)
 + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
 + * Fix estimated row cache entry size (CASSANDRA-4860)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)

h

[6/13] git commit: merge from 1.1

2012-12-08 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 66706d1cc3b60a1ad4265936616972bfd8f20aa0
Parents: bddfa9e 5b511b6
Author: Jonathan Ellis 
Authored: Sat Dec 8 10:19:27 2012 -0600
Committer: Jonathan Ellis 
Committed: Sat Dec 8 10:19:27 2012 -0600

--
 CHANGES.txt|2 +
 .../cassandra/db/compaction/CompactionManager.java |   18 +++
 .../cassandra/db/context/CounterContext.java   |   12 -
 3 files changed, 25 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66706d1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 48ebb87,15d63f0..b92984d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,14 +1,59 @@@
 -1.1.8
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 +Merged from 1.1
+  * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
  
+ 
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * (cql3) Fix adding column when the table has collections (CASSANDRA-4982)
 + * (cql3) Fix allowing collections with compact storage (CASSANDRA-4990)
 + * (cql3) Refuse ttl/writetime function on collections (CASSANDRA-4992)
 + * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
 + * clqsh: fix KEY pseudocolumn escaping when describing Thrift tables
 +   in CQL3 mode (CASSANDRA-4955)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
 +Merged from 1.1:
 + * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 + * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
 + * Fix assertion failure with leveled compaction (CASSANDRA-4799)
 + * Check for null end_token in get_range_slice (CASSANDRA-4804)
 + * Remove all remnants of removed nodes (CASSANDRA-4840)
 + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
 + * Fix estimated row cache entry size (CASSANDRA-4860)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)

htt

[4/13] git commit: merge from 1.1

2012-12-08 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 66706d1cc3b60a1ad4265936616972bfd8f20aa0
Parents: bddfa9e 5b511b6
Author: Jonathan Ellis 
Authored: Sat Dec 8 10:19:27 2012 -0600
Committer: Jonathan Ellis 
Committed: Sat Dec 8 10:19:27 2012 -0600

--
 CHANGES.txt|2 +
 .../cassandra/db/compaction/CompactionManager.java |   18 +++
 .../cassandra/db/context/CounterContext.java   |   12 -
 3 files changed, 25 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66706d1c/CHANGES.txt
--
diff --cc CHANGES.txt
index 48ebb87,15d63f0..b92984d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,57 -1,14 +1,59 @@@
 -1.1.8
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
 + * Don't generate UUID based on other node address (CASSANDRA-5002)
 + * Fix message when trying to alter a clustering key type (CASSANDRA-5012)
 + * Update IAuthenticator to match the new IAuthorizer (CASSANDRA-5003)
 +Merged from 1.1
+  * reduce log spam from invalid counter shards (CASSANDRA-5026)
   * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix for IndexHelper.IndexFor throws OOB Exception (CASSANDRA-5030)
  
+ 
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * (cql3) Fix adding column when the table has collections (CASSANDRA-4982)
 + * (cql3) Fix allowing collections with compact storage (CASSANDRA-4990)
 + * (cql3) Refuse ttl/writetime function on collections (CASSANDRA-4992)
 + * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
 + * clqsh: fix KEY pseudocolumn escaping when describing Thrift tables
 +   in CQL3 mode (CASSANDRA-4955)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
 +Merged from 1.1:
 + * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 + * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
 + * Fix assertion failure with leveled compaction (CASSANDRA-4799)
 + * Check for null end_token in get_range_slice (CASSANDRA-4804)
 + * Remove all remnants of removed nodes (CASSANDRA-4840)
 + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
 + * Fix estimated row cache entry size (CASSANDRA-4860)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)

http://git-

[6/16] git commit: merge from 1.1

2012-12-07 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: d599b3fc80292620043191cbe5a280630207f78e
Parents: 8f7754d f618369
Author: Jonathan Ellis 
Authored: Fri Dec 7 16:55:48 2012 -0600
Committer: Jonathan Ellis 
Committed: Fri Dec 7 16:55:48 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d599b3fc/CHANGES.txt
--

[5/16] git commit: merge from 1.1

2012-12-07 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: d599b3fc80292620043191cbe5a280630207f78e
Parents: 8f7754d f618369
Author: Jonathan Ellis 
Authored: Fri Dec 7 16:55:48 2012 -0600
Committer: Jonathan Ellis 
Committed: Fri Dec 7 16:55:48 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d599b3fc/CHANGES.txt
--

[4/16] git commit: merge from 1.1

2012-12-07 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: d599b3fc80292620043191cbe5a280630207f78e
Parents: 8f7754d f618369
Author: Jonathan Ellis 
Authored: Fri Dec 7 16:55:48 2012 -0600
Committer: Jonathan Ellis 
Committed: Fri Dec 7 16:55:48 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d599b3fc/CHANGES.txt
--

[4/10] git commit: merge from 1.1

2012-12-06 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: b537567b379e098329da10a534d16e856918b6fc
Parents: 7322f82 8d55474
Author: Jonathan Ellis 
Authored: Thu Dec 6 16:15:13 2012 -0600
Committer: Jonathan Ellis 
Committed: Thu Dec 6 16:15:13 2012 -0600

--
 CHANGES.txt|2 +
 .../apache/cassandra/service/MigrationManager.java |   43 +++
 2 files changed, 34 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a3187d,5d1fd8d..385dca6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,13 +1,54 @@@
 -1.1.8
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
++Merged from 1.1
+  * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
  
  
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * (cql3) Fix adding column when the table has collections (CASSANDRA-4982)
 + * (cql3) Fix allowing collections with compact storage (CASSANDRA-4990)
 + * (cql3) Refuse ttl/writetime function on collections (CASSANDRA-4992)
 + * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
 + * clqsh: fix KEY pseudocolumn escaping when describing Thrift tables
 +   in CQL3 mode (CASSANDRA-4955)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
 +Merged from 1.1:
 + * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 + * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
 + * Fix assertion failure with leveled compaction (CASSANDRA-4799)
 + * Check for null end_token in get_range_slice (CASSANDRA-4804)
 + * Remove all remnants of removed nodes (CASSANDRA-4840)
 + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
 + * Fix estimated row cache entry size (CASSANDRA-4860)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 80f8cd9,102ea12..4cffdfc
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@@ -21,8

[5/10] git commit: merge from 1.1

2012-12-06 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: b537567b379e098329da10a534d16e856918b6fc
Parents: 7322f82 8d55474
Author: Jonathan Ellis 
Authored: Thu Dec 6 16:15:13 2012 -0600
Committer: Jonathan Ellis 
Committed: Thu Dec 6 16:15:13 2012 -0600

--
 CHANGES.txt|2 +
 .../apache/cassandra/service/MigrationManager.java |   43 +++
 2 files changed, 34 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a3187d,5d1fd8d..385dca6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,13 +1,54 @@@
 -1.1.8
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
++Merged from 1.1
+  * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
  
  
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * (cql3) Fix adding column when the table has collections (CASSANDRA-4982)
 + * (cql3) Fix allowing collections with compact storage (CASSANDRA-4990)
 + * (cql3) Refuse ttl/writetime function on collections (CASSANDRA-4992)
 + * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
 + * clqsh: fix KEY pseudocolumn escaping when describing Thrift tables
 +   in CQL3 mode (CASSANDRA-4955)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
 +Merged from 1.1:
 + * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 + * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
 + * Fix assertion failure with leveled compaction (CASSANDRA-4799)
 + * Check for null end_token in get_range_slice (CASSANDRA-4804)
 + * Remove all remnants of removed nodes (CASSANDRA-4840)
 + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
 + * Fix estimated row cache entry size (CASSANDRA-4860)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 80f8cd9,102ea12..4cffdfc
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java

[6/10] git commit: merge from 1.1

2012-12-06 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: b537567b379e098329da10a534d16e856918b6fc
Parents: 7322f82 8d55474
Author: Jonathan Ellis 
Authored: Thu Dec 6 16:15:13 2012 -0600
Committer: Jonathan Ellis 
Committed: Thu Dec 6 16:15:13 2012 -0600

--
 CHANGES.txt|2 +
 .../apache/cassandra/service/MigrationManager.java |   43 +++
 2 files changed, 34 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a3187d,5d1fd8d..385dca6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,52 -1,13 +1,54 @@@
 -1.1.8
 +1.2-rc1
 + * rename rpc_timeout settings to request_timeout (CASSANDRA-5027)
 + * add BF with 0.1 FP to LCS by default (CASSANDRA-5029)
 + * Fix preparing insert queries (CASSANDRA-5016)
 + * Fix preparing queries with counter increment (CASSANDRA-5022)
 + * Fix preparing updates with collections (CASSANDRA-5017)
++Merged from 1.1
+  * Improve schema propagation performance (CASSANDRA-5025)
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 - * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
  
  
 -1.1.7
 - * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
 +1.2-beta3
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTombstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * (cql3) Remove arbitrary SELECT limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * (cql3) Fix adding column when the table has collections (CASSANDRA-4982)
 + * (cql3) Fix allowing collections with compact storage (CASSANDRA-4990)
 + * (cql3) Refuse ttl/writetime function on collections (CASSANDRA-4992)
 + * Replace IAuthority with new IAuthorizer (CASSANDRA-4874)
 + * clqsh: fix KEY pseudocolumn escaping when describing Thrift tables
 +   in CQL3 mode (CASSANDRA-4955)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
 +Merged from 1.1:
 + * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 + * Improve error reporting when streaming ranges fail (CASSANDRA-5009)
 + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
 + * Fix assertion failure with leveled compaction (CASSANDRA-4799)
 + * Check for null end_token in get_range_slice (CASSANDRA-4804)
 + * Remove all remnants of removed nodes (CASSANDRA-4840)
 + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
 + * Fix estimated row cache entry size (CASSANDRA-4860)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b537567b/src/java/org/apache/cassandra/service/MigrationManager.java
--
diff --cc src/java/org/apache/cassandra/service/MigrationManager.java
index 80f8cd9,102ea12..4cffdfc
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@

[5/15] git commit: merge from 1.1

2012-11-27 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: 93738e31266e87eb34f8fe0de72262b5312b0db7
Parents: 24cf1d1 3706749
Author: Jonathan Ellis 
Authored: Wed Nov 28 00:03:18 2012 +0900
Committer: Jonathan Ellis 
Committed: Wed Nov 28 00:03:18 2012 +0900

--
 CHANGES.txt|   18 ++
 .../db/columniterator/IColumnIteratorFactory.java  |   17 +
 .../db/columniterator/LazyColumnIterator.java  |   17 +
 .../cassandra/hadoop/ColumnFamilyInputFormat.java  |   27 ++-
 4 files changed, 78 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93738e31/CHANGES.txt
--
diff --cc CHANGES.txt
index 82fe9a9,066065d..9c80e87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,9 +1,33 @@@
 -1.1.8
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 -
 -
 -1.1.7
 +1.2-rc1
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTomstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * Remove select arbitrary limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * Fix adding column when the table has collections (CASSANDRA-4982)
 + * Fix allowing collections with compact storage (CASSANDRA-4990)
 + * Refuse ttl/writetime function on collections (CASSANDRA-4992)
 +Merged from 1.1:
+  * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
++ * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
@@@ -106,75 -23,16 +108,91 @@@ Merged from 1.1
   * (CQL) fix CREATE COLUMNFAMILY permissions check (CASSANDRA-4864)
   * Fix DynamicCompositeType same type comparison (CASSANDRA-4711)
   * Fix duplicate SSTable reference when stream session failed (CASSANDRA-3306)
++<<< HEAD
++||| merged common ancestors
++ * Allow static CF definition with compact storage (CASSANDRA-4910)
++ * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
++ * Fix 'wrong class type' assertion in CounterColumn (CASSANDRA-4976)
++===
+  * Allow static CF definition with compact storage (CASSANDRA-4910)
+  * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
+  * Fix 'wrong class type' assertion in CounterColumn (CASSANDRA-4976)
+  * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
+  * Fix assertion failure with leveled compaction (CASSANDRA-4799)
+  * Check for null end_token in get_range_slice (CASSANDRA-4804)
+  * Remove all remnants of removed nodes (CASSANDRA-4840)
+  * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
+  * Fix estimated row cache entry size (CASSANDRA-4860)
++>>> cassandra-1.1
 +
  
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.j

[6/15] git commit: merge from 1.1

2012-11-27 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 93738e31266e87eb34f8fe0de72262b5312b0db7
Parents: 24cf1d1 3706749
Author: Jonathan Ellis 
Authored: Wed Nov 28 00:03:18 2012 +0900
Committer: Jonathan Ellis 
Committed: Wed Nov 28 00:03:18 2012 +0900

--
 CHANGES.txt|   18 ++
 .../db/columniterator/IColumnIteratorFactory.java  |   17 +
 .../db/columniterator/LazyColumnIterator.java  |   17 +
 .../cassandra/hadoop/ColumnFamilyInputFormat.java  |   27 ++-
 4 files changed, 78 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93738e31/CHANGES.txt
--
diff --cc CHANGES.txt
index 82fe9a9,066065d..9c80e87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,9 +1,33 @@@
 -1.1.8
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 -
 -
 -1.1.7
 +1.2-rc1
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTomstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * Remove select arbitrary limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * Fix adding column when the table has collections (CASSANDRA-4982)
 + * Fix allowing collections with compact storage (CASSANDRA-4990)
 + * Refuse ttl/writetime function on collections (CASSANDRA-4992)
 +Merged from 1.1:
+  * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
++ * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
@@@ -106,75 -23,16 +108,91 @@@ Merged from 1.1
   * (CQL) fix CREATE COLUMNFAMILY permissions check (CASSANDRA-4864)
   * Fix DynamicCompositeType same type comparison (CASSANDRA-4711)
   * Fix duplicate SSTable reference when stream session failed (CASSANDRA-3306)
++<<< HEAD
++||| merged common ancestors
++ * Allow static CF definition with compact storage (CASSANDRA-4910)
++ * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
++ * Fix 'wrong class type' assertion in CounterColumn (CASSANDRA-4976)
++===
+  * Allow static CF definition with compact storage (CASSANDRA-4910)
+  * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
+  * Fix 'wrong class type' assertion in CounterColumn (CASSANDRA-4976)
+  * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
+  * Fix assertion failure with leveled compaction (CASSANDRA-4799)
+  * Check for null end_token in get_range_slice (CASSANDRA-4804)
+  * Remove all remnants of removed nodes (CASSANDRA-4840)
+  * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
+  * Fix estimated row cache entry size (CASSANDRA-4860)
++>>> cassandra-1.1
 +
  
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar

[4/15] git commit: merge from 1.1

2012-11-27 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 93738e31266e87eb34f8fe0de72262b5312b0db7
Parents: 24cf1d1 3706749
Author: Jonathan Ellis 
Authored: Wed Nov 28 00:03:18 2012 +0900
Committer: Jonathan Ellis 
Committed: Wed Nov 28 00:03:18 2012 +0900

--
 CHANGES.txt|   18 ++
 .../db/columniterator/IColumnIteratorFactory.java  |   17 +
 .../db/columniterator/LazyColumnIterator.java  |   17 +
 .../cassandra/hadoop/ColumnFamilyInputFormat.java  |   27 ++-
 4 files changed, 78 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93738e31/CHANGES.txt
--
diff --cc CHANGES.txt
index 82fe9a9,066065d..9c80e87
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,9 +1,33 @@@
 -1.1.8
 - * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
 -
 -
 -1.1.7
 +1.2-rc1
 + * make consistency level configurable in cqlsh (CASSANDRA-4829)
 + * fix cqlsh rendering of blob fields (CASSANDRA-4970)
 + * fix cqlsh DESCRIBE command (CASSANDRA-4913)
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 + * Optimize mostRecentTomstone check in CC.collectAllData (CASSANDRA-4883)
 + * Change stream session ID to UUID to avoid collision from same node 
(CASSANDRA-4813)
 + * Use Stats.db when bulk loading if present (CASSANDRA-4957)
 + * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
 + * Remove select arbitrary limit (CASSANDRA-4918)
 + * Correctly handle prepared operation on collections (CASSANDRA-4945)
 + * Fix CQL3 LIMIT (CASSANDRA-4877)
 + * Fix Stress for CQL3 (CASSANDRA-4979)
 + * Remove cassandra specific exceptions from JMX interface (CASSANDRA-4893)
 + * (CQL3) Force using ALLOW FILTERING on potentially inefficient queries 
(CASSANDRA-4915)
 + * Fix adding column when the table has collections (CASSANDRA-4982)
 + * Fix allowing collections with compact storage (CASSANDRA-4990)
 + * Refuse ttl/writetime function on collections (CASSANDRA-4992)
 +Merged from 1.1:
+  * cqlsh: improve COPY FROM performance (CASSANDRA-4921)
++ * Fall back to old describe_splits if d_s_ex is not available 
(CASSANDRA-4803)
   * add basic authentication support for Pig CassandraStorage (CASSANDRA-3042)
   * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965)
   * reset getRangeSlice filter after finishing a row for get_paged_slice
@@@ -106,75 -23,16 +108,91 @@@ Merged from 1.1
   * (CQL) fix CREATE COLUMNFAMILY permissions check (CASSANDRA-4864)
   * Fix DynamicCompositeType same type comparison (CASSANDRA-4711)
   * Fix duplicate SSTable reference when stream session failed (CASSANDRA-3306)
++<<< HEAD
++||| merged common ancestors
++ * Allow static CF definition with compact storage (CASSANDRA-4910)
++ * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
++ * Fix 'wrong class type' assertion in CounterColumn (CASSANDRA-4976)
++===
+  * Allow static CF definition with compact storage (CASSANDRA-4910)
+  * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
+  * Fix 'wrong class type' assertion in CounterColumn (CASSANDRA-4976)
+  * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746)
+  * Fix assertion failure with leveled compaction (CASSANDRA-4799)
+  * Check for null end_token in get_range_slice (CASSANDRA-4804)
+  * Remove all remnants of removed nodes (CASSANDRA-4840)
+  * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855)
+  * Fix estimated row cache entry size (CASSANDRA-4860)
++>>> cassandra-1.1
 +
  
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar depende

[3/4] git commit: merge from 1.1

2012-11-21 Thread xedin

merge from 1.1


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

Branch: refs/heads/trunk
Commit: e1ac6e9ff02634e265c275c966f2fbb6ebb579fe
Parents: 92f3339 e128ab0
Author: Pavel Yaskevich 
Authored: Wed Nov 21 15:48:26 2012 -0800
Committer: Pavel Yaskevich 
Committed: Wed Nov 21 15:48:26 2012 -0800

--
 src/java/org/apache/cassandra/db/RowMutation.java |   54 
 1 files changed, 0 insertions(+), 54 deletions(-)
--


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

[2/3] git commit: merge from 1.1

2012-11-21 Thread xedin

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: e1ac6e9ff02634e265c275c966f2fbb6ebb579fe
Parents: 92f3339 e128ab0
Author: Pavel Yaskevich 
Authored: Wed Nov 21 15:48:26 2012 -0800
Committer: Pavel Yaskevich 
Committed: Wed Nov 21 15:48:26 2012 -0800

--
 src/java/org/apache/cassandra/db/RowMutation.java |   54 
 1 files changed, 0 insertions(+), 54 deletions(-)
--


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

[1/2] git commit: merge from 1.1

2012-11-21 Thread xedin

Updated Branches:
  refs/heads/cassandra-1.2.0 92f33391e -> e1ac6e9ff


merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: e1ac6e9ff02634e265c275c966f2fbb6ebb579fe
Parents: 92f3339 e128ab0
Author: Pavel Yaskevich 
Authored: Wed Nov 21 15:48:26 2012 -0800
Committer: Pavel Yaskevich 
Committed: Wed Nov 21 15:48:26 2012 -0800

--
 src/java/org/apache/cassandra/db/RowMutation.java |   54 
 1 files changed, 0 insertions(+), 54 deletions(-)
--


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

[3/8] git commit: merge from 1.1

2012-11-16 Thread xedin

merge from 1.1


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

Branch: refs/heads/trunk
Commit: bd0b9ff745322e2e3030e4920ee4eef6a47d
Parents: 8dd1d56 dd1633b
Author: Pavel Yaskevich 
Authored: Fri Nov 16 15:05:34 2012 -0800
Committer: Pavel Yaskevich 
Committed: Fri Nov 16 15:05:34 2012 -0800

--
 CHANGES.txt|3 ++
 .../cassandra/db/DefinitionsUpdateVerbHandler.java |4 +-
 src/java/org/apache/cassandra/db/DefsTable.java|   26 +++---
 src/java/org/apache/cassandra/db/RowMutation.java  |3 ++
 .../org/apache/cassandra/net/MessagingService.java |8 ++--
 .../apache/cassandra/service/MigrationManager.java |9 +++--
 .../org/apache/cassandra/cli/CliHelp.yaml  |2 +-
 7 files changed, 38 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd0b/CHANGES.txt
--
diff --cc CHANGES.txt
index c499919,2ed9666..b935425
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,64 -2,7 +18,67 @@@ Merged from 1.1
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)
+  * remove IAuthority2 (CASSANDRA-4875)
++ * Allow static CF definition with compact storage (CASSANDRA-4910)
++ * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in clustering key order in 'CLUSTERING ORDER BY' 
(CASSANDRA-4881)
 + * Fix composite index bug (CASSANDRA-4884)
 + * Fix short read protection for CQL3 (CASSANDRA-4882)
 + * Add tracing support to the binary pro

[2/6] git commit: merge from 1.1

2012-11-16 Thread xedin

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: bd0b9ff745322e2e3030e4920ee4eef6a47d
Parents: 8dd1d56 dd1633b
Author: Pavel Yaskevich 
Authored: Fri Nov 16 15:05:34 2012 -0800
Committer: Pavel Yaskevich 
Committed: Fri Nov 16 15:05:34 2012 -0800

--
 CHANGES.txt|3 ++
 .../cassandra/db/DefinitionsUpdateVerbHandler.java |4 +-
 src/java/org/apache/cassandra/db/DefsTable.java|   26 +++---
 src/java/org/apache/cassandra/db/RowMutation.java  |3 ++
 .../org/apache/cassandra/net/MessagingService.java |8 ++--
 .../apache/cassandra/service/MigrationManager.java |9 +++--
 .../org/apache/cassandra/cli/CliHelp.yaml  |2 +-
 7 files changed, 38 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd0b/CHANGES.txt
--
diff --cc CHANGES.txt
index c499919,2ed9666..b935425
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,64 -2,7 +18,67 @@@ Merged from 1.1
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)
+  * remove IAuthority2 (CASSANDRA-4875)
++ * Allow static CF definition with compact storage (CASSANDRA-4910)
++ * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in clustering key order in 'CLUSTERING ORDER BY' 
(CASSANDRA-4881)
 + * Fix composite index bug (CASSANDRA-4884)
 + * Fix short read protection for CQL3 (CASSANDRA-4882)
 + * Add tracing support to the bi

[1/5] git commit: merge from 1.1

2012-11-16 Thread xedin

Updated Branches:
  refs/heads/cassandra-1.2.0 8dd1d56b4 -> bd0b9


merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: bd0b9ff745322e2e3030e4920ee4eef6a47d
Parents: 8dd1d56 dd1633b
Author: Pavel Yaskevich 
Authored: Fri Nov 16 15:05:34 2012 -0800
Committer: Pavel Yaskevich 
Committed: Fri Nov 16 15:05:34 2012 -0800

--
 CHANGES.txt|3 ++
 .../cassandra/db/DefinitionsUpdateVerbHandler.java |4 +-
 src/java/org/apache/cassandra/db/DefsTable.java|   26 +++---
 src/java/org/apache/cassandra/db/RowMutation.java  |3 ++
 .../org/apache/cassandra/net/MessagingService.java |8 ++--
 .../apache/cassandra/service/MigrationManager.java |9 +++--
 .../org/apache/cassandra/cli/CliHelp.yaml  |2 +-
 7 files changed, 38 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd0b/CHANGES.txt
--
diff --cc CHANGES.txt
index c499919,2ed9666..b935425
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,64 -2,7 +18,67 @@@ Merged from 1.1
   * reset getRangeSlice filter after finishing a row for get_paged_slice
 (CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)
+  * remove IAuthority2 (CASSANDRA-4875)
++ * Allow static CF definition with compact storage (CASSANDRA-4910)
++ * Fix endless loop/compaction of schema_* CFs due to broken timestamps 
(CASSANDRA-4880)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in clustering key order in 'CLUSTERING ORDER BY' 
(CASSANDRA-4881)
 + * Fix composite index bug (CASSANDRA-4884)
 + * Fix short re

[3/8] git commit: merge from 1.1

2012-11-12 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 3e7708289be12d6bacf0ea4c1adc822a63f75f15
Parents: 38bfc6d a2ca30e
Author: Jonathan Ellis 
Authored: Mon Nov 12 15:59:28 2012 -0600
Committer: Jonathan Ellis 
Committed: Mon Nov 12 15:59:28 2012 -0600

--
 CHANGES.txt|2 +
 .../org/apache/cassandra/service/StorageProxy.java |   17 ++-
 2 files changed, 18 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e770828/CHANGES.txt
--
diff --cc CHANGES.txt
index 9ac6227,b80c60f..0ac5b66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,74 -1,8 +1,76 @@@
 -1.1.7
 +1.2-rc1
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 +Merged from 1.1:
+  * reset getRangeSlice filter after finishing a row for get_paged_slice
+(CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)
 - * remove IAuthority2 (CASSANDRA-4875)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in

[2/8] git commit: merge from 1.1

2012-11-12 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: 3e7708289be12d6bacf0ea4c1adc822a63f75f15
Parents: 38bfc6d a2ca30e
Author: Jonathan Ellis 
Authored: Mon Nov 12 15:59:28 2012 -0600
Committer: Jonathan Ellis 
Committed: Mon Nov 12 15:59:28 2012 -0600

--
 CHANGES.txt|2 +
 .../org/apache/cassandra/service/StorageProxy.java |   17 ++-
 2 files changed, 18 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e770828/CHANGES.txt
--
diff --cc CHANGES.txt
index 9ac6227,b80c60f..0ac5b66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,74 -1,8 +1,76 @@@
 -1.1.7
 +1.2-rc1
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 +Merged from 1.1:
+  * reset getRangeSlice filter after finishing a row for get_paged_slice
+(CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)
 - * remove IAuthority2 (CASSANDRA-4875)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns

[4/8] git commit: merge from 1.1

2012-11-12 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 3e7708289be12d6bacf0ea4c1adc822a63f75f15
Parents: 38bfc6d a2ca30e
Author: Jonathan Ellis 
Authored: Mon Nov 12 15:59:28 2012 -0600
Committer: Jonathan Ellis 
Committed: Mon Nov 12 15:59:28 2012 -0600

--
 CHANGES.txt|2 +
 .../org/apache/cassandra/service/StorageProxy.java |   17 ++-
 2 files changed, 18 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e770828/CHANGES.txt
--
diff --cc CHANGES.txt
index 9ac6227,b80c60f..0ac5b66
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,74 -1,8 +1,76 @@@
 -1.1.7
 +1.2-rc1
 + * save truncation position in system table (CASSANDRA-4906)
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
 +Merged from 1.1:
+  * reset getRangeSlice filter after finishing a row for get_paged_slice
+(CASSANDRA-4919)
   * expunge row cache post-truncate (CASSANDRA-4940)
 - * remove IAuthority2 (CASSANDRA-4875)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in cluster

[4/8] git commit: merge from 1.1

2012-11-12 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: 93f8fec9d21e4fbe48241fb096892bd24080207b
Parents: 9118764 a05f676
Author: Jonathan Ellis 
Authored: Mon Nov 12 08:28:27 2012 -0600
Committer: Jonathan Ellis 
Committed: Mon Nov 12 08:28:27 2012 -0600

--
 CHANGES.txt|2 ++
 .../cassandra/db/compaction/CompactionManager.java |8 
 2 files changed, 10 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f8fec9/CHANGES.txt
--
diff --cc CHANGES.txt
index 43fc53a,088daa7..ff79b9a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,71 -1,6 +1,73 @@@
 -1.1.7
 +1.2-rc1
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
++Merged from 1.1:
+  * expunge row cache post-truncate (CASSANDRA-4940)
 - * remove IAuthority2 (CASSANDRA-4875)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in clustering key order in 'CLUSTERING ORDER BY' 
(CASSANDRA-4881)
 + * Fix composite index bug (CASSANDRA-4884)
 + * Fix short read protection for CQL3 (CASSANDRA-4882)
 + *

[3/8] git commit: merge from 1.1

2012-11-12 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2
Commit: 93f8fec9d21e4fbe48241fb096892bd24080207b
Parents: 9118764 a05f676
Author: Jonathan Ellis 
Authored: Mon Nov 12 08:28:27 2012 -0600
Committer: Jonathan Ellis 
Committed: Mon Nov 12 08:28:27 2012 -0600

--
 CHANGES.txt|2 ++
 .../cassandra/db/compaction/CompactionManager.java |8 
 2 files changed, 10 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f8fec9/CHANGES.txt
--
diff --cc CHANGES.txt
index 43fc53a,088daa7..ff79b9a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,71 -1,6 +1,73 @@@
 -1.1.7
 +1.2-rc1
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
++Merged from 1.1:
+  * expunge row cache post-truncate (CASSANDRA-4940)
 - * remove IAuthority2 (CASSANDRA-4875)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in clustering key order in 'CLUSTERING ORDER BY' 
(CASSANDRA-4881)
 + * Fix composite index bug (CASSANDRA-4884)
 + * Fix short read protection for CQL3 (CASSANDRA-488

[2/8] git commit: merge from 1.1

2012-11-12 Thread jbellis

merge from 1.1


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

Branch: refs/heads/cassandra-1.2.0
Commit: 93f8fec9d21e4fbe48241fb096892bd24080207b
Parents: 9118764 a05f676
Author: Jonathan Ellis 
Authored: Mon Nov 12 08:28:27 2012 -0600
Committer: Jonathan Ellis 
Committed: Mon Nov 12 08:28:27 2012 -0600

--
 CHANGES.txt|2 ++
 .../cassandra/db/compaction/CompactionManager.java |8 
 2 files changed, 10 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f8fec9/CHANGES.txt
--
diff --cc CHANGES.txt
index 43fc53a,088daa7..ff79b9a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,71 -1,6 +1,73 @@@
 -1.1.7
 +1.2-rc1
 + * Move CompressionMetadata off-heap (CASSANDRA-4937)
 + * allow CLI to GET cql3 columnfamily data (CASSANDRA-4924)
 + * Fix rare race condition in getExpireTimeForEndpoint (CASSANDRA-4402)
 + * acquire references to overlapping sstables during compaction so bloom 
filter
 +   doesn't get free'd prematurely (CASSANDRA-4934)
 + * Don't share slice query filter in CQL3 SelectStatement (CASSANDRA-4928)
 + * Separate tracing from Log4J (CASSANDRA-4861)
 + * Exclude gcable tombstones from merkle-tree computation (CASSANDRA-4905)
 + * Better printing of AbstractBounds for tracing (CASSANDRA-4931)
++Merged from 1.1:
+  * expunge row cache post-truncate (CASSANDRA-4940)
 - * remove IAuthority2 (CASSANDRA-4875)
 +
 +
 +1.2-beta2
 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876)
 + * off-heap bloom filters for row keys (CASSANDRA_4865)
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781)
 + * Remove system tables accounting from schema (CASSANDRA-4850)
 + * Force provided columns in clustering key order in 'CLUSTERING ORDER BY' 
(CASSANDRA-4881)
 + * Fix composite index bug (CASSANDRA-4884)
 + * Fix short read protection for CQL3 (CASSANDRA-4

[1/4] git commit: merge from 1.1

2012-10-30 Thread jbellis

Updated Branches:
  refs/heads/trunk a850abd16 -> 02b59eb1f


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 02b59eb1fe4764bd2df5ad054c0173b9f8b6eb10
Parents: a850abd 99b245d
Author: Jonathan Ellis 
Authored: Tue Oct 30 10:39:29 2012 -0500
Committer: Jonathan Ellis 
Committed: Tue Oct 30 10:41:34 2012 -0500

--
 CHANGES.txt|2 +
 .../cassandra/db/marshal/DynamicCompositeType.java |   20 +++-
 .../org/apache/cassandra/metrics/CacheMetrics.java |   15 ++-
 .../org/apache/cassandra/service/CacheService.java |   14 ++-
 .../cassandra/service/CacheServiceMBean.java   |   92 ++-
 5 files changed, 105 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02b59eb1/CHANGES.txt
--
diff --cc CHANGES.txt
index 1416351,e69298f..69b4daa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,47 -1,5 +1,48 @@@
 -1.1.7
 +1.2-beta2
 + * add extension point for sstable components (CASSANDRA-4049)
 + * improve tracing output (CASSANDRA-4852, 4862)
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 + * Fix list prepend logic (CQL3) (CASSANDRA-4835)
 + * Add booleans as literals in CQL3 (CASSANDRA-4776)
 + * Allow renaming PK columns in CQL3 (CASSANDRA-4822)
 + * Fix binary protocol NEW_NODE event (CASSANDRA-4679)
 +Merged from 1.1:
+  * add get[Row|Key]CacheEntries to CacheServiceMBean (CASSANDRA-4859)
   * fix get_paged_slice to wrap to next row correctly (CASSANDRA-4816)
   * fix indexing empty column values (CASSANDRA-4832)
   * allow JdbcDate to compose null Date objects (CASSANDRA-4830)
@@@ -52,77 -10,9 +53,78 @@@
   * fix potential infinite loop in get_count (CASSANDRA-4833)
   * fix compositeType.{get/from}String methods (CASSANDRA-4842)
   * (CQL) fix CREATE COLUMNFAMILY permissions check (CASSANDRA-4864)
+  * Fix DynamicCompositeType same type comparison (CASSANDRA-4711)
  
  
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new

[1/3] git commit: merge from 1.1

2012-10-25 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 0712c66f5 -> a2a2251b3
  refs/heads/trunk 21c57a094 -> 8ef2cb838


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 8ef2cb8385f6db7e634bf889a9c6f2bf6a4a6d24
Parents: 21c57a0 a2a2251
Author: Jonathan Ellis 
Authored: Thu Oct 25 20:12:25 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Oct 25 20:12:25 2012 -0500

--
 CHANGES.txt|2 ++
 .../org/apache/cassandra/cql/QueryProcessor.java   |2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ef2cb83/CHANGES.txt
--
diff --cc CHANGES.txt
index 5761dc1,191c935..bffd9ec
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -48,76 -8,9 +48,78 @@@ Merged from 1.1
   * add a close() method to CRAR to prevent leaking file descriptors 
(CASSANDRA-4820)
   * fix potential infinite loop in get_count (CASSANDRA-4833)
   * fix compositeType.{get/from}String methods (CASSANDRA-4842)
+  * (CQL) fix CREATE COLUMNFAMILY permissions check (CASSANDRA-4864)
+ 
  
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 + * add Murmur3Partitioner and make it default for new installations 
(CASSANDRA-3772, 4621)
 + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
 + * Finer grained exceptions hierarchy and provides error code with exceptions 
(CASSANDRA-3979)
 + * Adds events push to binary protocol (CASSANDRA-4480)
 + * Rew

[1/3] git commit: merge from 1.1

2012-10-24 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 5d5207b91 -> 6f31aba0e
  refs/heads/trunk 0f255da32 -> 8cf1259b3


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 8cf1259b367c5b910ef70996191dc10ef0987657
Parents: 0f255da 6f31aba
Author: Jonathan Ellis 
Authored: Wed Oct 24 14:45:05 2012 -0500
Committer: Jonathan Ellis 
Committed: Wed Oct 24 14:48:22 2012 -0500

--
 CHANGES.txt|1 +
 .../apache/cassandra/db/RowIteratorFactory.java|   43 --
 .../db/columniterator/IColumnIteratorFactory.java  |6 ++
 .../db/columniterator/LazyColumnIterator.java  |   62 +++
 .../cassandra/io/sstable/SSTableScanner.java   |   18 +++-
 5 files changed, 117 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cf1259b/CHANGES.txt
--
diff --cc CHANGES.txt
index e6c1d1a,0857259..3ef9530
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,41 -1,5 +1,42 @@@
 -1.1.7
 +1.2-beta2
 + * make TRACE verb droppable (CASSANDRA-4672)
 + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755)
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 + * Fix Subcolumn slice ends not respected (CASSANDRA-4826)
 + * Fix Assertion error in cql3 select (CASSANDRA-4783)
 +Merged from 1.1:
+  * fix get_paged_slice to wrap to next row correctly (CASSANDRA-4816)
   * fix indexing empty column values (CASSANDRA-4832)
   * allow JdbcDate to compose null Date objects (CASSANDRA-4830)
   * fix possible stackoverflow when compacting 1000s of sstables

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8cf1259b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
--
diff --cc src/java/org/apache/cassandra/db/RowIteratorFactory.java
index 547e27d,5a53c4a..229a08f
--- a/src/java/org/apache/cassandra/db/RowIteratorFactory.java
+++ b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
@@@ -19,9 -19,9 +19,17 @@@ package org.apache.cassandra.db
  
  import java.util.*;
  
- import com.google.common.collect.AbstractIterator;
++<<< HEAD
 +
 +import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
++||| merged common ancestors
++
++import org.apache.cassandra.db.columniterator.IColumnIterator;
++===
+ import org.apache.cassandra.db.columniterator.IColumnIterator;
+ import org.apache.cassandra.db.columniterator.IColumnIteratorFactory;
+ import org.apache.cassandra.db.columniterator.LazyColumnIte

[1/3] git commit: merge from 1.1

2012-10-19 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 487c9168f -> 72dcc298d
  refs/heads/trunk f8129b435 -> 15e3f142a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 15e3f142a1dedacba7d4252051b1c5827867ffd6
Parents: f8129b4 72dcc29
Author: Jonathan Ellis 
Authored: Fri Oct 19 17:43:54 2012 -0500
Committer: Jonathan Ellis 
Committed: Fri Oct 19 17:43:54 2012 -0500

--
 CHANGES.txt|1 +
 .../apache/cassandra/io/sstable/SSTableWriter.java |3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/15e3f142/CHANGES.txt
--
diff --cc CHANGES.txt
index f15e198,8822c3b..9fbccb0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,5 +1,38 @@@
 -1.1.7
 +1.2-beta2
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 +Merged from 1.1:
+  * fix indexing empty column values (CASSANDRA-4832)
   * allow JdbcDate to compose null Date objects (CASSANDRA-4830)
   * fix possible stackoverflow when compacting 1000s of sstables
 (CASSANDRA-4765)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/15e3f142/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index f243f3e,31b03b8..06e6826
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@@ -123,10 -127,9 +123,9 @@@ public class SSTableWriter extends SSTa
  /**
   * Perform sanity checks on @param decoratedKey and @return the position 
in the data file before any data is written
   */
 -private long beforeAppend(DecoratedKey decoratedKey) throws IOException
 +private long beforeAppend(DecoratedKey decoratedKey)
  {
- assert decoratedKey != null : "Keys must not be null";
- assert decoratedKey.key.remaining() > 0 : "Keys must not be empty";
+ assert decoratedKey != null : "Keys must not be null"; // empty keys 
ARE allowed b/c of indexed column values
  if (lastWrittenKey != null && lastWrittenKey.compareTo(decoratedKey) 
>= 0)
  throw new RuntimeException("Last written key " + lastWrittenKey + 
" >= current key " + decoratedKey + " writing into " + getFilename());
  return (lastWrittenKey == null) ? 0 : dataFile.getFilePointer();

[1/4] git commit: merge from 1.1

2012-10-18 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 e400d0eca -> 9d7ba39cb
  refs/heads/trunk 1b8c47524 -> d55408d97


merge from 1.1


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

Branch: refs/heads/trunk
Commit: d55408d977453f172638753ab004dc7a620080d4
Parents: 2bcbec0
Author: Jonathan Ellis 
Authored: Thu Oct 18 17:44:53 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Oct 18 17:44:53 2012 -0500

--
 CHANGES.txt |   13 ++---
 1 files changed, 6 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55408d9/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 87bff33..f15e198 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -31,6 +31,12 @@
  * Fix potential NPE during CFS reload (CASSANDRA-4786)
  * Composite indexes may miss results (CASSANDRA-4796)
  * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
+Merged from 1.1:
+ * allow JdbcDate to compose null Date objects (CASSANDRA-4830)
+ * fix possible stackoverflow when compacting 1000s of sstables
+   (CASSANDRA-4765)
+ * fix wrong leveled compaction progress calculation (CASSANDRA-4807)
+ * add a close() method to CRAR to prevent leaking file descriptors 
(CASSANDRA-4820)
 
 
 1.2-beta1
@@ -101,13 +107,6 @@
  * (cql3) Fix queries using LIMIT missing results (CASSANDRA-4579)
  * fix cross-version gossip messaging (CASSANDRA-4576)
 
-1.1.7
- * allow JdbcDate to compose null Date objects (CASSANDRA-4830)
- * fix possible stackoverflow when compacting 1000s of sstables
-   (CASSANDRA-4765)
- * fix wrong leveled compaction progress calculation (CASSANDRA-4807)
- * add a close() method to CRAR to prevent leaking file descriptors 
(CASSANDRA-4820)
-
 1.1.6
  * Wait for writes on synchronous read digest mismatch (CASSANDRA-4792)
  * fix commitlog replay for nanotime-infected sstables (CASSANDRA-4782)

[1/6] git commit: merge from 1.1

2012-10-18 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 c9b249b2a -> e400d0eca
  refs/heads/trunk 8495560c2 -> db2c2999d


merge from 1.1


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

Branch: refs/heads/trunk
Commit: db2c2999d10989c26da198f241cb81921759bd1c
Parents: 8495560 e400d0e
Author: Jonathan Ellis 
Authored: Thu Oct 18 15:19:30 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Oct 18 15:19:30 2012 -0500

--
 CHANGES.txt|3 +++
 src/java/org/apache/cassandra/config/Config.java   |4 ++--
 .../org/apache/cassandra/db/ColumnFamilyStore.java |4 +++-
 .../io/compress/CompressedRandomAccessReader.java  |7 +++
 .../apache/cassandra/thrift/CassandraServer.java   |1 -
 5 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/db2c2999/CHANGES.txt
--
diff --cc CHANGES.txt
index 922e808,49164b6..ee61379
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,108 -1,8 +1,111 @@@
 +1.2-beta2
 + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793)
 + * Make hint delivery asynchronous (CASSANDRA-4761)
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351, 4814)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 + * Fix potential NPE during CFS reload (CASSANDRA-4786)
 + * Composite indexes may miss results (CASSANDRA-4796)
 + * Move consistency level to the protocol level (CASSANDRA-4734, 4824)
 +
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSA

[1/2] git commit: merge from 1.1

2012-10-11 Thread brandonwilliams

Updated Branches:
  refs/heads/trunk 488122136 -> e19fa37d4


merge from 1.1


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

Branch: refs/heads/trunk
Commit: e19fa37d46ead3920b86341e46fc9b0140019a58
Parents: 4881221 6407cbc
Author: Brandon Williams 
Authored: Thu Oct 11 22:03:01 2012 -0500
Committer: Brandon Williams 
Committed: Thu Oct 11 22:03:01 2012 -0500

--
 .../cassandra/hadoop/pig/CassandraStorage.java |   19 +-
 1 files changed, 7 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e19fa37d/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
--

[1/3] git commit: merge from 1.1

2012-10-11 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 4355aa877 -> 936302cb3
  refs/heads/trunk 286a175d8 -> a4288fdc5


merge from 1.1


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

Branch: refs/heads/trunk
Commit: a4288fdc59d0fcd26c9e5040deca96ac9781188b
Parents: 286a175 936302c
Author: Jonathan Ellis 
Authored: Thu Oct 11 15:07:00 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Oct 11 15:07:00 2012 -0500

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/service/StorageProxy.java |   22 ---
 2 files changed, 13 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4288fdc/CHANGES.txt
--
diff --cc CHANGES.txt
index d004f8f,1a37b8e..15bebf3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,103 -1,5 +1,104 @@@
 +1.2-beta2
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 +
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones

[1/3] git commit: merge from 1.1

2012-10-11 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 46fc843bb -> 178c934aa
  refs/heads/trunk 4f5d072a2 -> 907a6ddf1


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 907a6ddf1dc1089f5cd5056e29abaa005f666b91
Parents: 4f5d072 178c934
Author: Jonathan Ellis 
Authored: Thu Oct 11 08:56:14 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Oct 11 08:57:49 2012 -0500

--
 CHANGES.txt|1 +
 NEWS.txt   |5 +
 .../apache/cassandra/io/sstable/Descriptor.java|7 +--
 .../cassandra/io/sstable/SSTableMetadata.java  |6 ++
 4 files changed, 17 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/907a6ddf/CHANGES.txt
--
diff --cc CHANGES.txt
index 49c9d9d,ac3a157..ba146e5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,103 -1,5 +1,104 @@@
 +1.2-beta2
 + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 
4610)
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 + * Run leveled compaction in parallel (CASSANDRA-4310)
 +
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)

[1/3] git commit: merge from 1.1

2012-10-08 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 5b5b20a87 -> 6d13ce69b
  refs/heads/trunk b7296316d -> 04859be40


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 04859be4005c864e86d9bcdce93eea03da15c06a
Parents: b729631 6d13ce6
Author: Jonathan Ellis 
Authored: Mon Oct 8 22:48:47 2012 -0500
Committer: Jonathan Ellis 
Committed: Mon Oct 8 22:48:47 2012 -0500

--
 CHANGES.txt|1 +
 .../cassandra/db/compaction/LeveledManifest.java   |   20 +-
 2 files changed, 8 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/04859be4/CHANGES.txt
--
diff --cc CHANGES.txt
index fd58882,a40420e..41b29fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,101 -1,5 +1,102 @@@
 +1.2-beta2
 + * cassandra-cli: allow Double value type to be inserted to a column 
(CASSANDRA-4661)
 + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
 + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667)
 + * include metadata for system keyspace itself in schema tables 
(CASSANDRA-4416)
 + * add check to PropertyFileSnitch to verify presence of location for
 +   local node (CASSANDRA-4728)
 + * add PBSPredictor consistency modeler (CASSANDRA-4261)
 + * remove vestiges of Thrift unframed mode (CASSANDRA-4729)
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
 +   (CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
 +   table (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648)
 + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738)
 + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208)
 + * Support repairing only the local DC nodes (CASSANDRA-4747)
 + * Use rpc_address for binary protocol and change default port (CASSANRA-4751)
 + * Fix use of collections in prepared statements (CASSANDRA-4739)
 + * Store more information into peers table (CASSANDRA-4351)
 + * Configurable bucket size for size tiered compaction (CASSANDRA-4704)
 +
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-379

[1/2] git commit: merge from 1.1

2012-10-05 Thread xedin

Updated Branches:
  refs/heads/trunk 074f4befa -> 6b83663ca


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 6b83663ca494123d87477f69205633497e4bef1d
Parents: 074f4be 8264eb2
Author: Pavel Yaskevich 
Authored: Fri Oct 5 14:59:13 2012 -0700
Committer: Pavel Yaskevich 
Committed: Fri Oct 5 14:59:13 2012 -0700

--
 CHANGES.txt|1 +
 conf/cassandra.yaml|5 +-
 .../cassandra/config/DatabaseDescriptor.java   |2 -
 .../apache/cassandra/thrift/CustomTHsHaServer.java |   39 
 .../cassandra/thrift/CustomTNonBlockingServer.java |   31 +++
 .../cassandra/thrift/CustomTThreadPoolServer.java  |   63 ++
 .../cassandra/thrift/TServerCustomFactory.java |   75 +++
 .../apache/cassandra/thrift/TServerFactory.java|   43 
 .../org/apache/cassandra/thrift/ThriftServer.java  |  150 ++-
 9 files changed, 274 insertions(+), 135 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b83663c/CHANGES.txt
--
diff --cc CHANGES.txt
index cab1425,4d2fd27..4fffbf7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -113,7 -19,7 +113,8 @@@
   * Pluggable Thrift transport factories for CLI (CASSANDRA-4609)
   * Backport adding AlterKeyspace statement (CASSANDRA-4611)
   * (CQL3) Correcty accept upper-case data types (CASSANDRA-4770)
 + * Add binary protocol events for schema changes (CASSANDRA-4684)
+  * Add ability to use custom TServerFactory implementations (CASSANDRA-4608)
  Merged from 1.0:
   * Switch from NBHM to CHM in MessagingService's callback map, which
 prevents OOM in long-running instances (CASSANDRA-4708)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b83663c/conf/cassandra.yaml
--
diff --cc conf/cassandra.yaml
index f98f9f0,5e0be98..84c0ae5
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@@ -333,31 -287,39 +333,34 @@@ rpc_port: 916
  # enable or disable keepalive on rpc connections
  rpc_keepalive: true
  
- # Cassandra provides three options for the RPC Server:
+ # Cassandra provides three out-of-the-box options for the RPC Server:
  #
 -# sync  -> One connection per thread in the rpc pool (see below).
 -#  For a very large number of clients, memory will be your limiting
 -#  factor; on a 64 bit JVM, 128KB is the minimum stack size per 
thread.
 -#  Connection pooling is very, very strongly recommended.
 -#
 -# async -> Nonblocking server implementation with one thread to serve 
 -#  rpc connections.  This is not recommended for high throughput use
 -#  cases. Async has been tested to be about 50% slower than sync
 -#  or hsha and is deprecated: it will be removed in the next major 
release.
 +# sync  -> One thread per thrift connection. For a very large number of 
clients, memory
 +#  will be your limiting factor. On a 64 bit JVM, 128KB is the 
minimum stack size
 +#  per thread, and that will correspond to your use of virtual memory 
(but physical memory
 +#  may be limited depending on use of stack space).
  #
 -# hsha  -> Stands for "half synchronous, half asynchronous." The rpc thread 
pool 
 -#  (see below) is used to manage requests, but the threads are 
multiplexed
 -#  across the different clients.
 +# hsha  -> Stands for "half synchronous, half asynchronous." All thrift 
clients are handled
 +#  asynchronously using a small number of threads that does not vary 
with the amount
 +#  of thrift clients (and thus scales well to many clients). The rpc 
requests are still
 +#  synchronous (one thread per active request).
  #
  # The default is sync because on Windows hsha is about 30% slower.  On Linux,
  # sync/hsha performance is about the same, with hsha of course using less 
memory.
+ #
+ # Alternatively,  can provide your own RPC server by providing the 
fully-qualified class name
+ # of an o.a.c.t.TServerFactory that can create an instance of it.
  rpc_server_type: sync
  
 -# Uncomment rpc_min|max|thread to set request pool size.
 -# You would primarily set max for the sync server to safeguard against
 -# misbehaved clients; if you do hit the max, Cassandra will block until one
 -# disconnects before accepting more.  The defaults for sync are min of 16 and 
max
 -# unlimited.
 -# 
 -# For the Hsha server, the min and max both default to quadruple the number of
 -# CPU cores.
 +# Uncomment rpc_min|max_thread to set reque

[1/4] git commit: merge from 1.1

2012-10-04 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 3f31642c3 -> 0d44159e6
  refs/heads/trunk 780ccc8ba -> b07e53cfb


merge from 1.1


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

Branch: refs/heads/trunk
Commit: b07e53cfb95c3a28727744699edc333cdab325c3
Parents: 780ccc8 0d44159
Author: Jonathan Ellis 
Authored: Thu Oct 4 10:35:07 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Oct 4 10:35:07 2012 -0500

--
 CHANGES.txt   |3 ++-
 src/java/org/apache/cassandra/db/RowMutation.java |   13 +++--
 2 files changed, 9 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b07e53cf/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b07e53cf/src/java/org/apache/cassandra/db/RowMutation.java
--
diff --cc src/java/org/apache/cassandra/db/RowMutation.java
index 1a5f871,3a05df9..c37bcfb
--- a/src/java/org/apache/cassandra/db/RowMutation.java
+++ b/src/java/org/apache/cassandra/db/RowMutation.java
@@@ -431,20 -458,17 +431,21 @@@ public class RowMutation implements IMu
  RowMutation mutation = deserialize(dis, version);
  
  long now = FBUtilities.timestampMicros();
 -Map fixedModifications = new 
HashMap();
 +Map fixedModifications = new HashMap();
  
 -for (Map.Entry modification : 
mutation.modifications_.entrySet())
 +for (Map.Entry modification : 
mutation.modifications.entrySet())
  {
- ColumnFamily cf = 
ColumnFamily.create(modification.getValue().metadata());
+ ColumnFamily cfOld = modification.getValue();
+ ColumnFamily cf = ColumnFamily.create(cfOld.metadata());
  
- if (cf.isMarkedForDelete())
+ if (cfOld.isMarkedForDelete())
 -cf.delete(cfOld.getLocalDeletionTime(), 
cfOld.getMarkedForDeleteAt() > now ? now : cfOld.getMarkedForDeleteAt());
 +{
- DeletionTime delTime = 
cf.deletionInfo().getTopLevelDeletion();
- cf.delete(new DeletionInfo(delTime.markedForDeleteAt > 
now ? now : delTime.markedForDeleteAt,
-delTime.localDeletionTime));
++DeletionTime dt = 
cfOld.deletionInfo().getTopLevelDeletion();
++cf.delete(new DeletionInfo(dt.markedForDeleteAt > now ? 
now : dt.markedForDeleteAt,
++   dt.localDeletionTime));
 +}
  
- for (IColumn column : modification.getValue().columns)
+ for (IColumn column : cfOld.columns)
  {
  // don't clone if column already has a correct timestamp
  if (column.timestamp() <= now)

[1/2] git commit: merge from 1.1

2012-10-03 Thread xedin

Updated Branches:
  refs/heads/trunk 5df99327e -> 51e6c7c0a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 51e6c7c0a840fc039cb847937f55ab58c26a79f7
Parents: 5df9932 59a6a5d
Author: Pavel Yaskevich 
Authored: Wed Oct 3 22:24:54 2012 -0700
Committer: Pavel Yaskevich 
Committed: Wed Oct 3 22:24:54 2012 -0700

--
 CHANGES.txt|1 +
 src/java/org/apache/cassandra/cli/CliMain.java |7 +--
 src/java/org/apache/cassandra/cli/CliOptions.java  |   23 ++
 .../org/apache/cassandra/cli/CliSessionState.java  |8 +++-
 .../cli/transport/FramedTransportFactory.java  |   30 ++
 .../cli/transport/SimpleTransportFactory.java  |   32 +++
 6 files changed, 95 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/src/java/org/apache/cassandra/cli/CliMain.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/src/java/org/apache/cassandra/cli/CliOptions.java
--
diff --cc src/java/org/apache/cassandra/cli/CliOptions.java
index b32833e,982daf5..b905336
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@@ -17,7 -17,9 +17,8 @@@
   */
  package org.apache.cassandra.cli;
  
 -import org.apache.cassandra.cli.transport.SimpleTransportFactory;
  import org.apache.commons.cli.*;
+ import org.apache.thrift.transport.TTransportFactory;
  
  /**
   *
@@@ -34,6 -36,8 +35,7 @@@ public class CliOption
  // Command line options
  private static final String HOST_OPTION = "host";
  private static final String PORT_OPTION = "port";
 -private static final String UNFRAME_OPTION = "unframed";
+ private static final String TRANSPORT_FACTORY = "transport-factory";
  private static final String DEBUG_OPTION = "debug";
  private static final String USERNAME_OPTION = "username";
  private static final String PASSWORD_OPTION = "password";
@@@ -93,6 -99,20 +96,9 @@@
  css.hostName = DEFAULT_HOST;
  }
  
 -// Look to see if frame has been specified
 -if (cmd.hasOption(UNFRAME_OPTION))
 -{
 -if (cmd.hasOption(TRANSPORT_FACTORY))
 -throw new IllegalArgumentException("--unframed and 
--transport-factory options should not be fixed.");
 -
 -css.framed = false;
 -css.transportFactory = new SimpleTransportFactory();
 -}
 -
+ if (cmd.hasOption(TRANSPORT_FACTORY))
+ css.transportFactory = 
validateAndSetTransportFactory(cmd.getOptionValue(TRANSPORT_FACTORY));
+ 
 -// Look to see if frame has been specified
  if (cmd.hasOption(DEBUG_OPTION))
  {
  css.debug = true;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/51e6c7c0/src/java/org/apache/cassandra/cli/CliSessionState.java
--
diff --cc src/java/org/apache/cassandra/cli/CliSessionState.java
index a0ef4e2,0284239..5f29186
--- a/src/java/org/apache/cassandra/cli/CliSessionState.java
+++ b/src/java/org/apache/cassandra/cli/CliSessionState.java
@@@ -15,10 -15,9 +15,8 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
 -
  package org.apache.cassandra.cli;
  
- import org.apache.cassandra.tools.NodeProbe;
- 
  import java.io.InputStream;
  import java.io.PrintStream;

[1/3] git commit: merge from 1.1

2012-09-28 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 c7ce11f00 -> c710edf07
  refs/heads/trunk ec14be929 -> ad8ebc684


merge from 1.1


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

Branch: refs/heads/trunk
Commit: ad8ebc684a2e8226b88da80c98dd0e252a18dbb7
Parents: ec14be9 c710edf
Author: Jonathan Ellis 
Authored: Fri Sep 28 10:15:31 2012 -0500
Committer: Jonathan Ellis 
Committed: Fri Sep 28 10:15:31 2012 -0500

--
 .../org/apache/cassandra/cache/KeyCacheKey.java|9 +-
 .../apache/cassandra/io/sstable/SSTableReader.java |   21 +-
 .../apache/cassandra/io/sstable/SSTableWriter.java |1 +
 3 files changed, 21 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8ebc68/src/java/org/apache/cassandra/cache/KeyCacheKey.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad8ebc68/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
--
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index fd4874c,a4cca37..b89ee24
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@@ -686,10 -651,12 +686,12 @@@ public class SSTableReader extends SSTa
  return;
  
  // avoid keeping a permanent reference to the original key buffer
- keyCache.put(new KeyCacheKey(descriptor, 
ByteBufferUtil.clone(key.key)), info);
+ KeyCacheKey cacheKey = new KeyCacheKey(descriptor, 
ByteBufferUtil.clone(key.key));
+ logger.trace("Adding cache entry for {} -> {}", cacheKey, info);
+ keyCache.put(cacheKey, info);
  }
  
 -public Long getCachedPosition(DecoratedKey key, boolean updateStats)
 +public RowIndexEntry getCachedPosition(DecoratedKey key, boolean 
updateStats)
  {
  return getCachedPosition(new KeyCacheKey(descriptor, key.key), 
updateStats);
  }
@@@ -731,9 -698,13 +733,13 @@@
  if ((op == Operator.EQ || op == Operator.GE) && (key instanceof 
DecoratedKey))
  {
  DecoratedKey decoratedKey = (DecoratedKey)key;
- RowIndexEntry cachedPosition = getCachedPosition(new 
KeyCacheKey(descriptor, decoratedKey.key), updateCacheAndStats);
+ KeyCacheKey cacheKey = new KeyCacheKey(descriptor, 
decoratedKey.key);
 -Long cachedPosition = getCachedPosition(cacheKey, 
updateCacheAndStats);
++RowIndexEntry cachedPosition = getCachedPosition(cacheKey, 
updateCacheAndStats);
  if (cachedPosition != null)
+ {
+ logger.trace("Cache hit for {} -> {}", cacheKey, 
cachedPosition);
  return cachedPosition;
+ }
  }
  
  // next, see if the sampled index says it's impossible for the key to 
be present
@@@ -793,8 -738,22 +799,19 @@@
  {
  assert key instanceof DecoratedKey; // key can be 
== to the index key only if it's a true row key
  DecoratedKey decoratedKey = (DecoratedKey)key;
+ 
+ if (logger.isTraceEnabled())
+ {
+ // expensive sanity check!  see CASSANDRA-4687
 -FileDataInput fdi = 
dfile.getSegment(dataPosition);
++FileDataInput fdi = 
dfile.getSegment(indexEntry.position);
+ DecoratedKey keyInDisk = 
SSTableReader.decodeKey(partitioner, descriptor, 
ByteBufferUtil.readWithShortLength(fdi));
+ if (!keyInDisk.equals(key))
+ throw new 
AssertionError(String.format("%s != %s in %s", keyInDisk, key, fdi.getPath()));
+ fdi.close();
+ }
+ 
 -if (keyCache != null && keyCache.getCapacity() > 
0 && updateCacheAndStats)
 -{
 -// store exact match for the key
 -cacheKey(decoratedKey, dataPosition);
 -}
 +// store exact match for the key
 +cacheKey(decoratedKey, indexEntry);
  }
  if (op == Operator.EQ && updateCacheAndStats)
  bloomFilterTracker.addTruePositive();

http://git-wip-us.apache.org/repos/asf/cassand

[1/5] git commit: merge from 1.1

2012-09-27 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 988ea81d4 -> 93bd3d896
  refs/heads/trunk 1078e6f51 -> 5df3f13b6


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 5df3f13b6ca993c9987c4e4b0319e01ff3895d54
Parents: 1078e6f 93bd3d8
Author: Jonathan Ellis 
Authored: Thu Sep 27 09:30:28 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Sep 27 09:30:28 2012 -0500

--
 CHANGES.txt|2 +
 .../org/apache/cassandra/db/ColumnSerializer.java  |5 --
 src/java/org/apache/cassandra/db/RowMutation.java  |   46 +++
 .../cassandra/locator/NetworkTopologyStrategy.java |3 +-
 4 files changed, 50 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df3f13b/CHANGES.txt
--
diff --cc CHANGES.txt
index 576f7a6,e48fbfd..f50f368
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,85 -1,5 +1,86 @@@
 +1.2-beta2
 + * optimize single-row PK lookups (CASSANDRA-4710)
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649)
 + * (CQL3) Make prepared statement global instead of per connection 
(CASSANDRA-4449)
 + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685)
 + * (CQL3) Fix validation when using counter and regular columns in the same 
table
 +   (CASSANDRA-4706)
 + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648
 + * )
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema

[1/3] git commit: merge from 1.1

2012-09-26 Thread jbellis

Updated Branches:
  refs/heads/trunk 981aa0578 -> c1724dd8a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: c1724dd8a233867379b35d1f370010ac2c36824b
Parents: 981aa05 b03ae12
Author: Jonathan Ellis 
Authored: Wed Sep 26 10:05:25 2012 -0500
Committer: Jonathan Ellis 
Committed: Wed Sep 26 10:05:25 2012 -0500

--
 .../apache/cassandra/db/HintedHandOffManager.java  |   19 +++
 1 files changed, 9 insertions(+), 10 deletions(-)
--


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

[1/3] git commit: merge from 1.1

2012-09-24 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 6fc4b3a64 -> 0307dca20
  refs/heads/trunk 095249615 -> 356e8ab5e


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 356e8ab5e690c5c9c14778f16077f475568d65ee
Parents: 0952496 0307dca
Author: Jonathan Ellis 
Authored: Mon Sep 24 12:44:23 2012 -0500
Committer: Jonathan Ellis 
Committed: Mon Sep 24 12:44:23 2012 -0500

--
 CHANGES.txt|2 ++
 .../org/apache/cassandra/cql/UpdateStatement.java  |2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/356e8ab5/CHANGES.txt
--
diff --cc CHANGES.txt
index b2a397c,4afe899..e4098b9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,77 -1,6 +1,79 @@@
 +1.2-beta2
 + * adjust blockFor calculation to account for pending ranges due to node 
 +   movement (CASSANDRA-833)
 +
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 + * add Murmur3Partitioner and make it default for new installations 
(CASSANDRA-3772, 4621)
 + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
 + * Finer grained exceptions hierarchy and provides error code with exceptions 
(CASSANDRA-3979)
 + * Adds events push to binary protocol (CASSANDRA-4480)
 + * Rewrite nodetool help (CASSANDRA-2293)
 + * Make CQL3 the default for CQL (CASSANDRA-4640)
 + * update stress tool to be able to use CQL3 (CASSANDRA-4406)
 + * Accept all thrift update on CQL3 cf

[1/2] git commit: merge from 1.1

2012-09-21 Thread xedin

Updated Branches:
  refs/heads/trunk ae91d17d3 -> 59a905c83


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 59a905c8352a4836fb20d8505c3b03bb47a8a931
Parents: ae91d17 117d91a
Author: Pavel Yaskevich 
Authored: Fri Sep 21 13:08:18 2012 +0300
Committer: Pavel Yaskevich 
Committed: Fri Sep 21 13:08:18 2012 +0300

--
 CHANGES.txt|1 +
 src/java/org/apache/cassandra/auth/Permission.java |6 +++---
 .../org/apache/cassandra/service/ClientState.java  |   12 +---
 .../apache/cassandra/thrift/CassandraServer.java   |2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a905c8/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a905c8/src/java/org/apache/cassandra/auth/Permission.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a905c8/src/java/org/apache/cassandra/service/ClientState.java
--
diff --cc src/java/org/apache/cassandra/service/ClientState.java
index d3bbc4e,279523f..51194d5
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@@ -209,6 -170,12 +207,12 @@@ public class ClientStat
  hasAccess(user, perms, perm, resource);
  }
  
+ private void preventSystemKSModification(String keyspace, Permission 
perm) throws InvalidRequestException
+ {
 -if (keyspace.equalsIgnoreCase(Table.SYSTEM_TABLE) && perm != 
Permission.SELECT && perm != Permission.DESCRIBE)
++if (keyspace.equalsIgnoreCase(Table.SYSTEM_KS) && perm != 
Permission.SELECT && perm != Permission.DESCRIBE)
+ throw new InvalidRequestException("system keyspace is not 
user-modifiable.");
+ }
+ 
  /**
   * Confirms that the client thread has the given Permission in the 
context of the given
   * ColumnFamily and the current keyspace.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a905c8/src/java/org/apache/cassandra/thrift/CassandraServer.java
--
diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java
index b7815a6,a11472c..9b59519
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@@ -897,20 -646,13 +897,20 @@@ public class CassandraServer implement
  
  public KsDef describe_keyspace(String table) throws NotFoundException, 
InvalidRequestException
  {
 -state().hasKeyspaceAccess(table, Permission.DESCRIBE);
 +try
 +{
- state().hasKeyspaceAccess(table, Permission.USE);
++state().hasKeyspaceAccess(table, Permission.DESCRIBE);
  
 -KSMetaData ksm = Schema.instance.getTableDefinition(table);
 -if (ksm == null)
 -throw new NotFoundException();
 +KSMetaData ksm = Schema.instance.getTableDefinition(table);
 +if (ksm == null)
 +throw new NotFoundException();
  
 -return ksm.toThrift();
 +return ksm.toThrift();
 +}
 +catch (RequestValidationException e)
 +{
 +throw ThriftConversion.toThrift(e);
 +}
  }
  
  public List get_range_slices(ColumnParent column_parent, 
SlicePredicate predicate, KeyRange range, ConsistencyLevel consistency_level)

[1/2] git commit: merge from 1.1

2012-09-20 Thread xedin

Updated Branches:
  refs/heads/trunk 0ada18462 -> ae91d17d3


merge from 1.1


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

Branch: refs/heads/trunk
Commit: ae91d17d397ba2b5952c74b4f975dea9c3b72f32
Parents: 0ada184 a4c397b
Author: Pavel Yaskevich 
Authored: Thu Sep 20 16:57:21 2012 +0300
Committer: Pavel Yaskevich 
Committed: Thu Sep 20 16:57:21 2012 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae91d17d/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae91d17d/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 26086ad,4a013b1..4ae9e75
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -804,21 -819,22 +804,22 @@@ public class SelectStatement implement
  /**
   * Orders results when multiple keys are selected (using IN)
   */
- private void orderResults(ResultSet cqlRows)
 -private void orderResults(List> 
selection, List cqlRows)
++private void orderResults(List> 
selection, ResultSet cqlRows)
  {
  // There is nothing to do if
  //   a. there are no results,
  //   b. no ordering information where given,
 -//   c. key restriction wasn't given or it's not an IN expression
 -if (cqlRows.isEmpty() || parameters.orderings.isEmpty() || 
keyRestriction == null || keyRestriction.eqValues.size() < 2)
 +//   c. key restriction is a Range or not an IN expression
 +if (cqlRows.size() == 0 || parameters.orderings.isEmpty() || 
isKeyRange || !keyIsInRelation)
  return;
  
+ 
  // optimization when only *one* order condition was given
  // because there is no point of using composite comparator if there 
is only one order condition
  if (parameters.orderings.size() == 1)
  {
  CFDefinition.Name ordering = 
cfDef.get(parameters.orderings.keySet().iterator().next());
- Collections.sort(cqlRows.rows, new 
SingleColumnComparator(getColumnPositionInSelect(ordering), ordering.type));
 -Collections.sort(cqlRows, new 
SingleColumnComparator(getColumnPositionInSelect(selection, ordering), 
ordering.type));
++Collections.sort(cqlRows.rows, new 
SingleColumnComparator(getColumnPositionInSelect(selection, ordering), 
ordering.type));
  return;
  }
  
@@@ -833,10 -849,10 +834,10 @@@
  {
  CFDefinition.Name orderingColumn = cfDef.get(identifier);
  types.add(orderingColumn.type);
- positions[idx++] = getColumnPositionInSelect(orderingColumn);
+ positions[idx++] = getColumnPositionInSelect(selection, 
orderingColumn);
  }
  
 -Collections.sort(cqlRows, new CompositeComparator(types, positions));
 +Collections.sort(cqlRows.rows, new CompositeComparator(types, 
positions));
  }
  
  // determine position of column in the select clause

[1/3] git commit: merge from 1.1

2012-09-19 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 b43cc362a -> c565b64fe
  refs/heads/trunk 96a46771b -> 4c1b11bc3


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 4c1b11bc35ed8770076742ad27e8374418e9970e
Parents: 96a4677 c565b64
Author: Jonathan Ellis 
Authored: Wed Sep 19 11:10:39 2012 -0500
Committer: Jonathan Ellis 
Committed: Wed Sep 19 11:10:39 2012 -0500

--
 src/java/org/apache/cassandra/tools/NodeCmd.java |  611 +
 1 files changed, 183 insertions(+), 428 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c1b11bc/src/java/org/apache/cassandra/tools/NodeCmd.java
--
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 5f2ac12,3f8e942..4d2790d
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -162,11 -138,63 +138,63 @@@ public class NodeCm
  private static void printUsage()
  {
  HelpFormatter hf = new HelpFormatter();
- StringBuilder header = new StringBuilder(512);
- header.append("\nAvailable commands\n");
- final NodeToolHelp ntHelp = loadHelp();
- for(NodeToolHelp.NodeToolCommand cmd : ntHelp.commands)
- addCmdHelp(header, cmd);
+ StringBuilder header = new StringBuilder();
+ header.append("\nAvailable commands:\n");
+ // No args
++addCmdHelp(header, "ring", "Print information about the token ring");
+ addCmdHelp(header, "join", "Join the ring");
+ addCmdHelp(header, "info", "Print node information (uptime, load, 
...)");
+ addCmdHelp(header, "cfstats", "Print statistics on column families");
+ addCmdHelp(header, "version", "Print cassandra version");
+ addCmdHelp(header, "tpstats", "Print usage statistics of thread 
pools");
+ addCmdHelp(header, "proxyhistograms", "Print statistic histograms for 
network operations");
+ addCmdHelp(header, "drain", "Drain the node (stop accepting writes 
and flush all column families)");
+ addCmdHelp(header, "decommission", "Decommission the *node I am 
connecting to*");
+ addCmdHelp(header, "compactionstats", "Print statistics on 
compactions");
+ addCmdHelp(header, "disablegossip", "Disable gossip (effectively 
marking the node dead)");
+ addCmdHelp(header, "enablegossip", "Reenable gossip");
+ addCmdHelp(header, "disablethrift", "Disable thrift server");
+ addCmdHelp(header, "enablethrift", "Reenable thrift server");
+ addCmdHelp(header, "statusthrift", "Status of thrift server");
+ addCmdHelp(header, "gossipinfo", "Shows the gossip information for 
the cluster");
+ addCmdHelp(header, "invalidatekeycache", "Invalidate the key cache");
+ addCmdHelp(header, "invalidaterowcache", "Invalidate the row cache");
+ addCmdHelp(header, "resetlocalschema", "Reset node's local schema and 
resync");
+ 
+ // One arg
 -addCmdHelp(header, "ring [keyspace]", "Print information about the 
token ring for a given keyspace (for all keyspaces if it is not specified)");
+ addCmdHelp(header, "netstats [host]", "Print network information on 
provided host (connecting node by default)");
+ addCmdHelp(header, "move ", "Move node on the token ring 
to a new token");
+ addCmdHelp(header, "removetoken status|force|", "Show status 
of current token removal, force completion of pending removal or remove 
providen token");
+ addCmdHelp(header, "setcompactionthroughput ", "Set the 
MB/s throughput cap for compaction in the system, or 0 to disable throttling.");
+ addCmdHelp(header, "setstreamthroughput ", "Set the MB/s 
throughput cap for streaming in the system, or 0 to disable throttling.");
+ addCmdHelp(header, "describering [keyspace]", "Shows the token ranges 
info of a given keyspace.");
+ addCmdHelp(header, "rangekeysample", "Shows the sampled keys held 
across all keyspaces.");
+ addCmdHelp(header, "rebuild [src-dc-name]", "Rebuild data by 
streaming from other nodes (similarly to bootstrap)");
+ 
+ // Two args
+ addCmdHelp(header, "snapshot [keyspaces...] -cf [columnfamilyName] -t 
[snapshotName]", "Take a snapshot of the optionally specified column family of 
the specified keyspaces using optional name snapshotName");
+ addCmdHelp(header, "clearsnapshot [keyspaces...] -t [snapshotName]", 
"Remove snapshots for the specified keyspaces. Either remove all snapshots or 
remo

[1/2] git commit: merge from 1.1

2012-09-11 Thread xedin

Updated Branches:
  refs/heads/trunk c6ddbea43 -> b85c93e0a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: b85c93e0a89ace02b4a73d49a75976d7fbce6115
Parents: c6ddbea 98708d8
Author: Pavel Yaskevich 
Authored: Tue Sep 11 14:16:22 2012 +0300
Committer: Pavel Yaskevich 
Committed: Tue Sep 11 14:16:22 2012 +0300

--
 CHANGES.txt  |9 +---
 src/java/org/apache/cassandra/cli/CliClient.java |   36 +++-
 2 files changed, 28 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b85c93e0/CHANGES.txt
--
diff --cc CHANGES.txt
index 98929cf,b6fe049..00971a5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,7 +1,69 @@@
 +1.2-beta1
 + * add atomic_batch_mutate (CASSANDRA-4542, -4635)
 + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632)
 + * include message initiation time to replicas so they can more
 +   accurately drop timed-out requests (CASSANDRA-2858)
 + * fix clientutil.jar dependencies (CASSANDRA-4566)
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 + * add Murmur3Partitioner and make it default for new installations 
(CASSANDRA-3772)
 + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
 + * Finer grained exceptions hierarchy and provides error code with exceptions 
(CASSANDRA-3979)
 + * Adds events push to binary protocol (CASSANDRA-4480)
 + * Rewrite nodetool help (CASSANDRA-2293)
 + * Make CQL3 the default for CQL (CASSANDRA-4640)
 + * update stress tool to be able to use CQL3 (CASSANDRA-4406)
 + * Accept all thrift update on CQL3 cf but don't expose their metadata 
(CASSANDRA-4377)
 +
 +
  1.1.6
-   * (cql3) fix potential NPE with both equal and unequal restriction 
(CASSANDRA-4532)
-   * (

[1/13] git commit: merge from 1.1

2012-09-10 Thread xedin

Updated Branches:
  refs/heads/trunk 804dd0991 -> c4692a171


merge from 1.1


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

Branch: refs/heads/trunk
Commit: c4692a1713e5abe1446954c9202aebe0f2d3ec81
Parents: 804dd09 e172a9b
Author: Pavel Yaskevich 
Authored: Tue Sep 11 01:13:05 2012 +0300
Committer: Pavel Yaskevich 
Committed: Tue Sep 11 01:13:05 2012 +0300

--
 CHANGES.txt|4 +++
 bin/cqlsh  |   18 ++-
 .../cassandra/config/DatabaseDescriptor.java   |3 ++
 .../cql3/statements/AlterTableStatement.java   |   17 +++--
 .../statements/CreateColumnFamilyStatement.java|3 +-
 .../org/apache/cassandra/service/ClientState.java  |3 +-
 6 files changed, 32 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4692a17/CHANGES.txt
--
diff --cc CHANGES.txt
index 26c361a,246bc49..f5ae4e3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -101,9 -37,9 +102,12 @@@ Merged from 1.0
   * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534)
   * (Hadoop) fix iterating through a resultset consisting entirely
 of tombstoned rows (CASSANDRA-4466)
++<<< HEAD
 + * Fix multiple values for CurrentLocal NodeID (CASSANDRA-4626)
++===
++>>> cassandra-1.1
  
  
 -1.1.3
   * munmap commitlog segments before rename (CASSANDRA-4337)
   * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
 multi-MB results as an attribute (CASSANDRA-4452)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4692a17/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 97106f1,20fa981..d479acb
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -461,15 -438,21 +461,18 @@@ public class DatabaseDescripto
  rowCacheProvider = 
FBUtilities.newCacheProvider(conf.row_cache_provider);
  
  // Hardcoded system tables
 -KSMetaData systemMeta = KSMetaData.systemKeyspace();
 -Schema.instance.load(CFMetaData.StatusCf);
 -Schema.instance.load(CFMetaData.HintsCf);
 -Schema.instance.load(CFMetaData.MigrationsCf);
 -Schema.instance.load(CFMetaData.SchemaCf);
 -Schema.instance.load(CFMetaData.IndexCf);
 -Schema.instance.load(CFMetaData.NodeIdCf);
 -Schema.instance.load(CFMetaData.VersionCf);
 -Schema.instance.load(CFMetaData.SchemaKeyspacesCf);
 -Schema.instance.load(CFMetaData.SchemaColumnFamiliesCf);
 -Schema.instance.load(CFMetaData.SchemaColumnsCf);
 -
 -Schema.instance.addSystemTable(systemMeta);
 +List systemKeyspaces = 
Arrays.asList(KSMetaData.systemKeyspace(), KSMetaData.traceKeyspace());
 +for (KSMetaData ksmd : systemKeyspaces)
 +{
 +for (CFMetaData cfm : ksmd.cfMetaData().values())
 +Schema.instance.load(cfm);
 +Schema.instance.setTableDefinition(ksmd);
 +}
 +
 +// setup schema required for authorization
++authorityContainer.setup();
+ 
+ // setup schema required for authorization
  authorityContainer.setup();
  
  /* Load the seeds for node contact points */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4692a17/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
index 360d188,7867019..fe89f32
--- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
@@@ -17,21 -18,17 +17,22 @@@
   */
  package org.apache.cassandra.cql3.statements;
  
 -import java.util.*;
 +import java.nio.ByteBuffer;
- import java.util.*;
++import java.util.ArrayList;
++import java.util.HashMap;
++import java.util.List;
++import java.util.Map;
  
  import org.apache.cassandra.auth.Permission;
++import org.apache.cassandra.config.CFMetaData;
++import org.apache.cassandra.config.ColumnDefin

[1/3] git commit: merge from 1.1

2012-09-05 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 ec1c64ab5 -> 2cd73633b
  refs/heads/trunk 781b248f3 -> 67cc0dc4a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 67cc0dc4ade15a3693a62cb6ebb85ac4fc9ad328
Parents: 781b248 2cd7363
Author: Jonathan Ellis 
Authored: Wed Sep 5 16:39:08 2012 -0500
Committer: Jonathan Ellis 
Committed: Wed Sep 5 16:41:05 2012 -0500

--
 CHANGES.txt|1 +
 .../AbstractSimplePerColumnSecondaryIndex.java |6 ++
 .../apache/cassandra/db/index/SecondaryIndex.java  |   10 +-
 .../cassandra/db/index/SecondaryIndexManager.java  |7 ---
 .../apache/cassandra/db/index/keys/KeysIndex.java  |   12 ++--
 .../cassandra/db/SecondaryIndexColumnSizeTest.java |   10 ++
 6 files changed, 32 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/67cc0dc4/CHANGES.txt
--
diff --cc CHANGES.txt
index 8125e38,04fa0bf..46222c5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,56 -1,5 +1,57 @@@
 +1.2-dev
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 + * add Murmur3Partitioner and make it default for new installations 
(CASSANDRA-3772)
 + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
 + * Finer grained exceptions hierarchy and provides error code with exceptions 
(CASSANDRA-3979)
 +
 +
  1.1.5
+  * add SecondaryIndex.reload API (CASSANDRA-4581)
   * use millis + atomicint for commitlog segment creation instead of
 nanotime, which has issues under some hypervisors (CASSANDRA-4601)
   * fix FD leak in slice queries (CASSANDRA-4571)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/67cc0dc4/src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.ja

[1/4] git commit: merge from 1.1

2012-09-05 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 7c14044f2 -> ec1c64ab5
  refs/heads/trunk b7fdc674a -> 781b248f3


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 781b248f3123cb7e61d898803752609fc7d14537
Parents: b7fdc67 ec1c64a
Author: Jonathan Ellis 
Authored: Wed Sep 5 14:50:09 2012 -0500
Committer: Jonathan Ellis 
Committed: Wed Sep 5 14:50:09 2012 -0500

--
 conf/cassandra-rackdc.properties   |   20 +++
 .../apache/cassandra/tools/StandaloneScrubber.java |   13 ++---
 2 files changed, 28 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/781b248f/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
--
diff --cc src/java/org/apache/cassandra/tools/StandaloneScrubber.java
index d172c31,10f9cd8..a691844
--- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java
@@@ -30,8 -32,9 +32,9 @@@ import org.apache.cassandra.db.Table
  import org.apache.cassandra.db.compaction.LeveledManifest;
  import org.apache.cassandra.db.compaction.Scrubber;
  import org.apache.cassandra.io.sstable.*;
 -import org.apache.cassandra.service.AbstractCassandraDaemon;
 +import org.apache.cassandra.service.CassandraDaemon;
  import org.apache.cassandra.utils.OutputHandler;
+ 
  import static org.apache.cassandra.tools.BulkLoader.CmdLineOptions;
  
  public class StandaloneScrubber

[2/3] git commit: merge from 1.1

2012-09-04 Thread xedin

merge from 1.1


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

Branch: refs/heads/trunk
Commit: d90eaf5b05a98ad090746424dcd507a915c55ca9
Parents: 6b29ab7 846b140
Author: Pavel Yaskevich 
Authored: Wed Sep 5 00:17:00 2012 +0300
Committer: Pavel Yaskevich 
Committed: Wed Sep 5 00:17:00 2012 +0300

--
 CHANGES.txt   |1 +
 src/java/org/apache/cassandra/db/DefsTable.java   |   77 +++-
 src/java/org/apache/cassandra/db/SystemTable.java |1 +
 3 files changed, 78 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d90eaf5b/CHANGES.txt
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d90eaf5b/src/java/org/apache/cassandra/db/SystemTable.java
--
diff --cc src/java/org/apache/cassandra/db/SystemTable.java
index 23d9269,3256b91..cd64d2c
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@@ -86,62 -83,66 +86,63 @@@ public class SystemTabl
  
  public static void finishStartup() throws IOException
  {
+ DefsTable.fixSchemaNanoTimestamps();
  setupVersion();
 -purgeIncompatibleHints();
 +try
 +{
 +upgradeSystemData();
 +}
 +catch (ExecutionException e)
 +{
 +throw new RuntimeException(e);
 +}
 +catch (InterruptedException e)
 +{
 +throw new RuntimeException(e);
 +}
  }
  
 -private static void setupVersion() throws IOException
 +private static void setupVersion()
  {
 -RowMutation rm;
 -ColumnFamily cf;
 -
 -rm = new RowMutation(Table.SYSTEM_TABLE, 
ByteBufferUtil.bytes("build"));
 -cf = ColumnFamily.create(Table.SYSTEM_TABLE, VERSION_CF);
 -cf.addColumn(new Column(ByteBufferUtil.bytes("version"), 
ByteBufferUtil.bytes(FBUtilities.getReleaseVersionString()), 
FBUtilities.timestampMicros()));
 -rm.add(cf);
 -rm.apply();
 -
 -rm = new RowMutation(Table.SYSTEM_TABLE, ByteBufferUtil.bytes("cql"));
 -cf = ColumnFamily.create(Table.SYSTEM_TABLE, VERSION_CF);
 -cf.addColumn(new Column(ByteBufferUtil.bytes("version"), 
ByteBufferUtil.bytes(QueryProcessor.CQL_VERSION.toString()), 
FBUtilities.timestampMicros()));
 -rm.add(cf);
 -rm.apply();
 -
 -rm = new RowMutation(Table.SYSTEM_TABLE, 
ByteBufferUtil.bytes("thrift"));
 -cf = ColumnFamily.create(Table.SYSTEM_TABLE, VERSION_CF);
 -cf.addColumn(new Column(ByteBufferUtil.bytes("version"), 
ByteBufferUtil.bytes(Constants.VERSION), FBUtilities.timestampMicros()));
 -rm.add(cf);
 -rm.apply();
 +String req = "INSERT INTO system.%s (key, release_version, 
cql_version, thrift_version) VALUES ('%s', '%s', '%s', '%s')";
 +processInternal(String.format(req, LOCAL_CF,
 + LOCAL_KEY,
 + 
FBUtilities.getReleaseVersionString(),
 + 
QueryProcessor.CQL_VERSION.toString(),
 + Constants.VERSION));
  }
  
 -/** if hints become incompatible across versions of cassandra, that logic 
(and associated purging) is managed here. */
 -private static void purgeIncompatibleHints() throws IOException
 +/** if system data becomes incompatible across versions of cassandra, 
that logic (and associated purging) is managed here */
 +private static void upgradeSystemData() throws IOException, 
ExecutionException, InterruptedException
  {
 -ByteBuffer upgradeMarker = ByteBufferUtil.bytes("Pre-1.0 hints 
purged");
 -Table table = Table.open(Table.SYSTEM_TABLE);
 -QueryFilter filter = QueryFilter.getNamesFilter(decorate(COOKIE_KEY), 
new QueryPath(STATUS_CF), upgradeMarker);
 -ColumnFamily cf = 
table.getColumnFamilyStore(STATUS_CF).getColumnFamily(filter);
 -if (cf != null)
 +Table table = Table.open(Table.SYSTEM_KS);
 +ColumnFamilyStore oldStatusCfs = 
table.getColumnFamilyStore(OLD_STATUS_CF);
 +if (oldStatusCfs.getSSTables().size() > 0)
  {
 -logger.debug("Pre-1.0 hints already purged");
 -return;
 +

[1/2] git commit: merge from 1.1

2012-09-04 Thread jbellis

Updated Branches:
  refs/heads/trunk b2899f088 -> 6b29ab709


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 6b29ab709f03941037bda89171543860027475ba
Parents: b2899f0 5df7b25
Author: Jonathan Ellis 
Authored: Tue Sep 4 15:13:28 2012 -0500
Committer: Jonathan Ellis 
Committed: Tue Sep 4 15:13:28 2012 -0500

--
 CHANGES.txt|2 ++
 .../cassandra/db/commitlog/CommitLogArchiver.java  |2 +-
 .../cassandra/db/commitlog/CommitLogSegment.java   |   14 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b29ab70/CHANGES.txt
--
diff --cc CHANGES.txt
index 88a0172,6125c9c..61aae96
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,6 +1,57 @@@
 +1.2-dev
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 + * add Murmur3Partitioner and make it default for new installations 
(CASSANDRA-3772)
 + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
 +
 +
  1.1.5
+  * use millis + atomicint for commitlog segment creation instead of
+nanotime, which has issues under some hypervisors (CASSANDRA-4601)
   * fix FD leak in slice queries (CASSANDRA-4571)
   * avoid recursion in leveled compaction (CASSANDRA-4587)
   * increase stack size under Java7 to 180K

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b29ab70/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index b109db5,fe66369..c0732db
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.

[1/3] git commit: merge from 1.1

2012-09-04 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 5c91bd142 -> e1b10590e
  refs/heads/trunk 769fe895a -> 6c8687237


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 6c8687237cf58fac21078a27ffb32dda4cca5b01
Parents: 769fe89 e1b1059
Author: Jonathan Ellis 
Authored: Tue Sep 4 14:07:46 2012 -0500
Committer: Jonathan Ellis 
Committed: Tue Sep 4 14:07:46 2012 -0500

--
 CHANGES.txt|1 +
 .../apache/cassandra/db/CollationController.java   |   18 ++
 .../db/columniterator/ISSTableColumnIterator.java  |8 ++
 .../db/columniterator/SSTableNamesIterator.java|7 +-
 .../db/columniterator/SSTableSliceIterator.java|   10 +++-
 .../org/apache/cassandra/db/filter/IFilter.java|9 +--
 .../cassandra/db/filter/NamesQueryFilter.java  |9 +--
 .../apache/cassandra/db/filter/QueryFilter.java|7 +++--
 .../cassandra/db/filter/SliceQueryFilter.java  |5 ++-
 9 files changed, 56 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c868723/CHANGES.txt
--
diff --cc CHANGES.txt
index d6b40ba,6c504e8..38678dd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,55 -1,5 +1,56 @@@
 +1.2-dev
 + * optimize WriteResponse (CASSANDRA-4548)
 + * new metrics (CASSANDRA-4009)
 + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897)
 + * debug tracing (CASSANDRA-1123)
 + * parallelize row cache loading (CASSANDRA-4282)
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * add disk_failure_policy (CASSANDRA-2118)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 + * add Murmur3Partitioner and make it default for new installations 
(CASSANDRA-3772)
 + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497)
 +
 +
  1.1.5
+  * fix FD leak in slice queries (CASSANDRA-4571)
   * avoid recursion in leveled compaction (CASSANDRA-4587)
   * increase stack size under Java7 to 180K
   * Log(info) schema changes (CASSANDRA-4547)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c868723/src/java/org/apache/cassandr

[1/2] git commit: merge from 1.1

2012-09-04 Thread xedin

Updated Branches:
  refs/heads/trunk 94e4ace75 -> 5d8ba3d3b


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 5d8ba3d3b4b76aa06a8e80abe017e43c007b
Parents: 94e4ace 5c91bd1
Author: Pavel Yaskevich 
Authored: Tue Sep 4 14:39:41 2012 +0300
Committer: Pavel Yaskevich 
Committed: Tue Sep 4 14:39:41 2012 +0300

--
 CHANGES.txt|1 +
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |   11 +++
 2 files changed, 12 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d8ba3d3/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d8ba3d3/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java
index bc0ba04,01e14fb..db85522
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@@ -20,7 -21,11 +20,8 @@@ package org.apache.cassandra.cql3
  import com.google.common.collect.Sets;
  import org.apache.cassandra.config.CFMetaData;
  import org.apache.cassandra.config.ConfigurationException;
 -import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
 -import org.apache.cassandra.db.marshal.AbstractType;
 -import org.apache.cassandra.db.marshal.TypeParser;
  import org.apache.cassandra.io.compress.CompressionParameters;
 -import org.apache.cassandra.thrift.InvalidRequestException;
++import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;

[1/8] git commit: merge from 1.1

2012-08-28 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.0 ec76baf0d -> 4764a379e
  refs/heads/cassandra-1.1 fa8fc22fc -> de039598f
  refs/heads/trunk 08b309191 -> f5c19e84a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: f5c19e84a49e11c16bb030a9069c4a9ca4ea3be4
Parents: 08b3091 de03959
Author: Jonathan Ellis 
Authored: Tue Aug 28 09:29:31 2012 -0500
Committer: Jonathan Ellis 
Committed: Tue Aug 28 09:29:31 2012 -0500

--
 CHANGES.txt|2 ++
 .../apache/cassandra/db/HintedHandOffManager.java  |9 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5c19e84/CHANGES.txt
--

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

git commit: merge from 1.1

2012-08-23 Thread dbrosius

Updated Branches:
  refs/heads/trunk a89ef1ffd -> 58c5533e9


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 58c5533e956cab461a4122e63212cee1f8275713
Parents: a89ef1f
Author: Dave Brosius 
Authored: Fri Aug 24 00:09:25 2012 -0400
Committer: Dave Brosius 
Committed: Fri Aug 24 00:09:25 2012 -0400

--
 .../cassandra/service/AntiEntropyService.java  |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58c5533e/src/java/org/apache/cassandra/service/AntiEntropyService.java
--
diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java 
b/src/java/org/apache/cassandra/service/AntiEntropyService.java
index b26574e..474566e 100644
--- a/src/java/org/apache/cassandra/service/AntiEntropyService.java
+++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java
@@ -622,7 +622,7 @@ public class AntiEntropyService
 if (endpoints.isEmpty())
 {
 differencingDone.signalAll();
-logger.info("[repair #%s] No neighbors to repair with on range 
%s: session completed", getName(), range);
+logger.info(String.format("[repair #%s] No neighbors to repair 
with on range %s: session completed", getName(), range));
 return;
 }

[1/2] git commit: merge from 1.1

2012-08-22 Thread xedin

Updated Branches:
  refs/heads/trunk 66d52f9d2 -> 39e5a080d


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 39e5a080d350a669b775063e2707deaade77b5ba
Parents: 66d52f9 dbf99d6
Author: Pavel Yaskevich 
Authored: Thu Aug 23 00:59:29 2012 +0300
Committer: Pavel Yaskevich 
Committed: Thu Aug 23 00:59:29 2012 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39e5a080/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39e5a080/src/java/org/apache/cassandra/tools/NodeCmd.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39e5a080/src/java/org/apache/cassandra/tools/NodeProbe.java
--

[1/2] git commit: merge from 1.1

2012-08-17 Thread xedin

Updated Branches:
  refs/heads/trunk f70945eaa -> b25b12a0a


merge from 1.1


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

Branch: refs/heads/trunk
Commit: b25b12a0a9a15904fcd8126422d01100d611de44
Parents: f70945e f5619bb
Author: Pavel Yaskevich 
Authored: Fri Aug 17 19:23:27 2012 +0300
Committer: Pavel Yaskevich 
Committed: Fri Aug 17 19:23:27 2012 +0300

--
 CHANGES.txt|4 
 .../apache/cassandra/service/MigrationManager.java |6 ++
 2 files changed, 10 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25b12a0/CHANGES.txt
--
diff --cc CHANGES.txt
index 39c92b1,2ea901f..426ac7d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,7 +1,49 @@@
 +1.2-dev
 + * run local range scans on the read stage (CASSANDRA-3687)
 + * clean up ioexceptions (CASSANDRA-2116)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477)
 + * remove schema agreement checking from all external APIs (Thrift, CQL and 
CQL3) (CASSANDRA-4487)
 +
 +
+ 1.1.5
+  * Log(info) schema changes (CASSANDRA-4547)
+ 
+ 
  1.1.4
   * fix offline scrub to catch >= out of order rows (CASSANDRA-4411)
   * fix cassandra-env.sh on RHEL and other non-dash-based systems 

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

[1/14] git commit: merge from 1.1

2012-08-14 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 a201422b2 -> 17c1787e9
  refs/heads/trunk e243db435 -> 1a44fa7ea


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 1a44fa7ea20a0be92cc0cb0f87c270a7dd2f6334
Parents: e243db4 17c1787
Author: Jonathan Ellis 
Authored: Tue Aug 14 16:01:41 2012 -0500
Committer: Jonathan Ellis 
Committed: Tue Aug 14 16:01:41 2012 -0500

--
 CHANGES.txt|6 ++
 build.xml  |2 +-
 debian/changelog   |6 ++
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a44fa7e/CHANGES.txt
--
diff --cc CHANGES.txt
index f823937,dfb77d6..5d878bc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,12 +1,50 @@@
 +1.2-dev
 + * clean up ioexceptions (CASSANDRA-2116)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680)
 +
 +
  1.1.4
   * fix offline scrub to catch >= out of order rows (CASSANDRA-4411)
+  * fix cassandra-env.sh on RHEL and other non-dash-based systems 
+(CASSANDRA-4494)
+ Merged from 1.0:
+  * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534)
  
  
 -1.1.3
   * munmap commitlog segments before rename (CASSANDRA-4337)
   * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
 multi-MB results as an attribute (CASSANDRA-4452)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a44fa7e/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
--

[1/7] git commit: merge from 1.1

2012-08-09 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 115f380a8 -> 9fb63a2f9
  refs/heads/trunk ce368f812 -> 8a290c1b7


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 8a290c1b7cf3e414272f22ee5b0f3cae265f732b
Parents: ce368f8 9fb63a2
Author: Jonathan Ellis 
Authored: Thu Aug 9 11:40:08 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Aug 9 11:40:08 2012 -0500

--
 CHANGES.txt|1 -
 .../apache/cassandra/db/compaction/Scrubber.java   |2 +-
 .../apache/cassandra/tools/StandaloneScrubber.java |2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a290c1b/CHANGES.txt
--
diff --cc CHANGES.txt
index 4001b0a,aa40626..3de82e2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -40,7 -2,7 +40,6 @@@
   * fix offline scrub to catch >= out of order rows (CASSANDRA-4411)
  
  
--1.1.3
   * munmap commitlog segments before rename (CASSANDRA-4337)
   * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
 multi-MB results as an attribute (CASSANDRA-4452)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a290c1b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
--

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

[1/3] git commit: merge from 1.1

2012-07-31 Thread brandonwilliams

Updated Branches:
  refs/heads/cassandra-1.1 271405656 -> 38e5cf73d
  refs/heads/trunk 70e318eaa -> eed76ae9c


merge from 1.1


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

Branch: refs/heads/trunk
Commit: eed76ae9c3700649b0b9bdbed81865c86d5e0213
Parents: 70e318e 38e5cf7
Author: Brandon Williams 
Authored: Tue Jul 31 10:52:07 2012 -0500
Committer: Brandon Williams 
Committed: Tue Jul 31 10:52:07 2012 -0500

--
 .../apache/cassandra/service/StorageService.java   |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eed76ae9/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 8cd5b0b,4bbffc8..7a77d02
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -539,10 -586,10 +539,10 @@@ public class StorageService implements 
  // The one exception is if after the above sleep we still have no 
schema information, we'll assume
  // we're part of a fresh cluster start, and also skip bootstrap.  
This is less confusing for new users,
  // as well as avoiding the nonsensical state of trying to stream from 
cluster with no active peers.
 -Token token;
 -InetAddress current = null;
 -logger_.debug(String.format("Bootstrap variables: %s %s %s %s",
 +Set current = new HashSet();
 +Collection tokens;
- logger.debug("Bootstrap variables: %s %s %s %s",
-   new Object[] {DatabaseDescriptor.isAutoBootstrap(), 
SystemTable.bootstrapInProgress(), SystemTable.bootstrapComplete(), 
schemaPresent});
++logger.debug(String.format("Bootstrap variables: %s %s %s %s",
+   DatabaseDescriptor.isAutoBootstrap(), 
SystemTable.bootstrapInProgress(), SystemTable.bootstrapComplete(), 
schemaPresent));
  if (DatabaseDescriptor.isAutoBootstrap()
  && (SystemTable.bootstrapInProgress() || 
(!SystemTable.bootstrapComplete() && schemaPresent)))
  {

[1/8] git commit: merge from 1.1

2012-07-30 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.1 f9d1f93f0 -> 271405656
  refs/heads/trunk 9ecda7230 -> 02308f6f9


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 02308f6f9ae272fde101357a7d395f0118b80d0d
Parents: 9ecda72 2714056
Author: Jonathan Ellis 
Authored: Tue Jul 31 00:09:09 2012 -0500
Committer: Jonathan Ellis 
Committed: Tue Jul 31 00:09:51 2012 -0500

--
 CHANGES.txt|1 +
 NEWS.txt   |   14 
 conf/cassandra-env.sh  |   22 +++
 debian/cassandra.install   |1 +
 debian/changelog   |6 ++
 .../cassandra/config/DatabaseDescriptor.java   |4 -
 src/java/org/apache/cassandra/db/Directories.java  |2 +-
 .../cassandra/db/commitlog/CommitLogSegment.java   |1 +
 .../org/apache/cassandra/io/util/FileUtils.java|   47 +++
 .../cassandra/io/util/MmappedSegmentedFile.java|   27 +
 tools/bin/token-generator  |   16 +
 11 files changed, 99 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02308f6f/CHANGES.txt
--
diff --cc CHANGES.txt
index 09f4508,7348a99..c9f0551
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,42 -1,5 +1,43 @@@
 +1.2-dev
 + * clean up ioexceptions (CASSANDRA-2116)
 + * Introduce new json format with row level deletion (CASSANDRA-4054)
 + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433)
 + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047)
 + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881)
 + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
 + * split up rpc timeout by operation type (CASSANDRA-2819)
 + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762)
 + * update MS protocol with a version handshake + broadcast address id
 +   (CASSANDRA-4311)
 + * multithreaded hint replay (CASSANDRA-4189)
 + * add inter-node message compression (CASSANDRA-3127)
 + * remove COPP (CASSANDRA-2479)
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234)
 + * update MurmurHash to version 3 (CASSANDRA-2975)
 + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060)
 + * (CLI) jline version is bumped to 1.0 to properly  support
 +   'delete' key function (CASSANDRA-4132)
 + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 
4289)
 + * Add support for range tombstones (CASSANDRA-3708)
 + * Improve MessagingService efficiency (CASSANDRA-3617)
 + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794)
 + * Set thrift HSHA server thread limit to unlimited by default 
(CASSANDRA-4277)
 + * Avoids double serialization of CF id in RowMutation messages
 +   (CASSANDRA-4293)
 + * stream compressed sstables directly with java nio (CASSANDRA-4297)
 + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885)
 + * Add column metadata to system column families (CASSANDRA-4018)
 + * (cql3) Always use composite types by default (CASSANDRA-4329)
 + * (cql3) Add support for set, map and list (CASSANDRA-3647)
 + * Validate date type correctly (CASSANDRA-4441)
 + * (cql3) Allow definitions with only a PK (CASSANDRA-4361)
 + * (cql3) Add support for row key composites (CASSANDRA-4179)
 + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038)
 +
 +
  1.1.3
+  * munmap commitlog segments before rename (CASSANDRA-4337)
   * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
 multi-MB results as an attribute (CASSANDRA-4452)
   * flush based on data size, not throughput; overwritten columns no 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/02308f6f/NEWS.txt
--
diff --cc NEWS.txt
index c52bd89,b1d8969..04d1527
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -9,47 -9,19 +9,61 @@@ upgrade, just in case you need to roll 
  by version X, but the inverse is not necessarily the case.)
  
  
 +1.2
 +===
 +Upgrading
 +-
 +- 1.2 is NOT network-compatible with versions older than 1.0.  That
 +  means if you want to do a rolling, zero-downtime upgrade, you'll need
 +  to upgrade first to 1.0.x or 1.1.x, and then to 1.2.  1.2 retains
 +  the ability to read data files from Cassandra versions at least
 +  back to 0.6, so a

[2/4] git commit: merge from 1.1

2012-07-28 Thread jbellis

merge from 1.1


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

Branch: refs/heads/trunk
Commit: f223f5485aa4edcd7d7781f37c63dbba570748d2
Parents: 3d23188 0819ad1
Author: Jonathan Ellis 
Authored: Sat Jul 28 09:42:40 2012 -0500
Committer: Jonathan Ellis 
Committed: Sat Jul 28 09:42:40 2012 -0500

--
 CHANGES.txt|1 +
 src/java/org/apache/cassandra/config/Schema.java   |   32 -
 .../org/apache/cassandra/gms/VersionedValue.java   |2 +-
 .../apache/cassandra/service/MigrationManager.java |2 +-
 .../apache/cassandra/service/StorageService.java   |   52 ++-
 5 files changed, 53 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f223f548/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f223f548/src/java/org/apache/cassandra/config/Schema.java
--
diff --cc src/java/org/apache/cassandra/config/Schema.java
index c36ee77,95d092f..0c710e5
--- a/src/java/org/apache/cassandra/config/Schema.java
+++ b/src/java/org/apache/cassandra/config/Schema.java
@@@ -17,9 -18,12 +17,10 @@@
   */
  package org.apache.cassandra.config;
  
 -import java.io.IOError;
  import java.nio.ByteBuffer;
  import java.security.MessageDigest;
+ import java.security.NoSuchAlgorithmException;
  import java.util.*;
 -import java.util.concurrent.atomic.AtomicInteger;
  import java.util.concurrent.locks.ReadWriteLock;
  import java.util.concurrent.locks.ReentrantReadWriteLock;
  
@@@ -61,13 -67,23 +62,25 @@@ public class Schem
  private final Map tableInstances = new 
NonBlockingHashMap();
  
  /* metadata map for faster ColumnFamily lookup */
 -private final BiMap, Integer> cfIdMap = 
HashBiMap.create();
 +private final BiMap, UUID> cfIdMap = 
HashBiMap.create();
 +// mapping from old ColumnFamily Id (Integer) to a new version which is 
UUID
 +private final BiMap oldCfIdMap = HashBiMap.create();
  
  private volatile UUID version;
- private final ReadWriteLock versionLock = new ReentrantReadWriteLock();
  
+ public static final UUID emptyVersion;
+ 
+ static
+ {
+ try
+ {
+ emptyVersion = 
UUID.nameUUIDFromBytes(MessageDigest.getInstance("MD5").digest());
+ }
+ catch (NoSuchAlgorithmException e)
+ {
+ throw new AssertionError();
+ }
+ }
  
  /**
   * Initialize empty schema object

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f223f548/src/java/org/apache/cassandra/gms/VersionedValue.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f223f548/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 9246716,5591488..1e73567
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -510,30 -557,47 +510,47 @@@ public class StorageService implements 
  
  HintedHandOffManager.instance.start();
  
- if (DatabaseDescriptor.isAutoBootstrap()
- && 
DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress())
- && !SystemTable.bootstrapComplete())
- logger.info("This node will not auto bootstrap because it is 
configured to be a seed node.");
+ boolean schemaPresent = false;
+ if (DatabaseDescriptor.isAutoBootstrap() && 
!SystemTable.bootstrapComplete() && delay > 0)
+ {
+ // wait a couple gossip rounds so our schema check has something 
to go by
+ FBUtilities.sleep(2 * Gossiper.intervalInMillis);
+ }
 -for (Entry entry : 
Gossiper.instance.getEndpointStates())
++for (Map.Entry entry : 
Gossiper.instance.getEndpointStates())
+ {
+ if (entry.getKey().equals(FBUtilities.getBroadcastAddress()))
+ {
+ // skip ourselves to avoid confusing the tests, which always 
load a schema first thing
+ continue;
+ }
+ 
+ if 
(!entry.getValue().getApplicationState(ApplicationState.SCHEMA).value.equals(Schema.em

[14/50] [abbrv] git commit: merge from 1.1

2012-07-27 Thread yukim

merge from 1.1


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

Branch: refs/heads/cassandra-1.1
Commit: 5cde66bab30e7aa8f98bae9a7504b2a4a17cdda1
Parents: b167e9b cc0be1b
Author: Pavel Yaskevich 
Authored: Wed Jul 25 22:01:14 2012 +0300
Committer: Pavel Yaskevich 
Committed: Wed Jul 25 22:01:14 2012 +0300

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   33 +--
 .../cassandra/db/ColumnFamilyStoreMBean.java   |5 ++
 .../compaction/SizeTieredCompactionStrategy.java   |3 +-
 src/java/org/apache/cassandra/tools/NodeProbe.java |3 +-
 .../cassandra/db/compaction/CompactionsTest.java   |3 +-
 6 files changed, 29 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/tools/NodeProbe.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
--

[5/50] [abbrv] git commit: merge from 1.1

2012-07-27 Thread yukim

merge from 1.1


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

Branch: refs/heads/cassandra-1.1
Commit: 80baefddc5749a15edc21b6ea9fa84bdfb879883
Parents: 94e413f 070c1d8
Author: Jonathan Ellis 
Authored: Thu Jul 26 17:17:21 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Jul 26 17:17:21 2012 -0500

--
 CHANGES.txt|3 +
 .../db/index/PerColumnSecondaryIndex.java  |8 +
 .../cassandra/db/index/PerRowSecondaryIndex.java   |7 +
 .../apache/cassandra/db/index/SecondaryIndex.java  |3 +
 .../cassandra/db/index/SecondaryIndexManager.java  |   19 +-
 .../apache/cassandra/thrift/ThriftValidation.java  |   14 +-
 .../cassandra/db/SecondaryIndexColumnSizeTest.java |  215 +++
 .../cassandra/thrift/ThriftValidationTest.java |   58 +
 8 files changed, 259 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
--
diff --cc test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
index d57f9c1,af0e668..04f0d0f
--- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
+++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
@@@ -24,19 -24,15 +24,12 @@@ package org.apache.cassandra.thrift
  import org.junit.Test;
  
  import org.apache.cassandra.SchemaLoader;
--import org.apache.cassandra.config.CFMetaData;
--import org.apache.cassandra.config.ConfigurationException;
--import org.apache.cassandra.config.ColumnDefinition;
--import org.apache.cassandra.config.KSMetaData;
--import org.apache.cassandra.config.Schema;
++import org.apache.cassandra.config.*;
  import org.apache.cassandra.db.marshal.AsciiType;
  import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.locator.LocalStrategy;
  import org.apache.cassandra.locator.NetworkTopologyStrategy;
 +import org.apache.cassandra.utils.ByteBufferUtil;
- import org.apache.cassandra.utils.FBUtilities;
  
  public class ThriftValidationTest extends SchemaLoader
  {

[1/13] git commit: merge from 1.1

2012-07-26 Thread jbellis

Updated Branches:
  refs/heads/cassandra-1.0 27cd2bfda -> 1ad710b6e
  refs/heads/cassandra-1.1 10372c20d -> 070c1d8dd
  refs/heads/trunk 94e413f5a -> 80baefddc


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 80baefddc5749a15edc21b6ea9fa84bdfb879883
Parents: 94e413f 070c1d8
Author: Jonathan Ellis 
Authored: Thu Jul 26 17:17:21 2012 -0500
Committer: Jonathan Ellis 
Committed: Thu Jul 26 17:17:21 2012 -0500

--
 CHANGES.txt|3 +
 .../db/index/PerColumnSecondaryIndex.java  |8 +
 .../cassandra/db/index/PerRowSecondaryIndex.java   |7 +
 .../apache/cassandra/db/index/SecondaryIndex.java  |3 +
 .../cassandra/db/index/SecondaryIndexManager.java  |   19 +-
 .../apache/cassandra/thrift/ThriftValidation.java  |   14 +-
 .../cassandra/db/SecondaryIndexColumnSizeTest.java |  215 +++
 .../cassandra/thrift/ThriftValidationTest.java |   58 +
 8 files changed, 259 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/PerColumnSecondaryIndex.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/PerRowSecondaryIndex.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/80baefdd/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
--
diff --cc test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
index d57f9c1,af0e668..04f0d0f
--- a/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
+++ b/test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
@@@ -24,19 -24,15 +24,12 @@@ package org.apache.cassandra.thrift
  import org.junit.Test;
  
  import org.apache.cassandra.SchemaLoader;
--import org.apache.cassandra.config.CFMetaData;
--import org.apache.cassandra.config.ConfigurationException;
--import org.apache.cassandra.config.ColumnDefinition;
--import org.apache.cassandra.config.KSMetaData;
--import org.apache.cassandra.config.Schema;
++import org.apache.cassandra.config.*;
  import org.apache.cassandra.db.marshal.AsciiType;
  import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.locator.LocalStrategy;
  import org.apache.cassandra.locator.NetworkTopologyStrategy;
 +import org.apache.cassandra.utils.ByteBufferUtil;
- import org.apache.cassandra.utils.FBUtilities;
  
  public class ThriftValidationTest extends SchemaLoader
  {

[1/2] git commit: merge from 1.1

2012-07-25 Thread xedin

Updated Branches:
  refs/heads/trunk b167e9ba7 -> 5cde66bab


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 5cde66bab30e7aa8f98bae9a7504b2a4a17cdda1
Parents: b167e9b cc0be1b
Author: Pavel Yaskevich 
Authored: Wed Jul 25 22:01:14 2012 +0300
Committer: Pavel Yaskevich 
Committed: Wed Jul 25 22:01:14 2012 +0300

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   33 +--
 .../cassandra/db/ColumnFamilyStoreMBean.java   |5 ++
 .../compaction/SizeTieredCompactionStrategy.java   |3 +-
 src/java/org/apache/cassandra/tools/NodeProbe.java |3 +-
 .../cassandra/db/compaction/CompactionsTest.java   |3 +-
 6 files changed, 29 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/src/java/org/apache/cassandra/tools/NodeProbe.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cde66ba/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
--

[1/3] git commit: merge from 1.1

2012-07-11 Thread xedin

Updated Branches:
  refs/heads/trunk 26aff203b -> 93afc3555


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 93afc35552c14439b1e69f1a17d1975e1714c03d
Parents: 26aff20 97620fe
Author: Pavel Yaskevich 
Authored: Thu Jul 12 01:05:01 2012 +0300
Committer: Pavel Yaskevich 
Committed: Thu Jul 12 01:05:01 2012 +0300

--
 CHANGES.txt |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93afc355/CHANGES.txt
--

[1/2] git commit: merge from 1.1

2012-07-10 Thread xedin

Updated Branches:
  refs/heads/trunk 720e01752 -> 8e503d8d9


merge from 1.1


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

Branch: refs/heads/trunk
Commit: 8e503d8d9320d36741175c5e93dd019498550164
Parents: 720e017 346ac03
Author: Pavel Yaskevich 
Authored: Tue Jul 10 23:43:52 2012 +0300
Committer: Pavel Yaskevich 
Committed: Tue Jul 10 23:43:52 2012 +0300

--
 .../apache/cassandra/service/MigrationManager.java |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)
--


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

1 2 >

1 - 100 of 165 matches

Mail list logo