[3/3] git commit: merge from 2.0

2014-08-07 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/cassandra-2.1.0
Commit: 33de6dc112c7a1e7ebc84bf6079a7768d7d94492
Parents: eea547c 6e6a6c3
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Aug 7 09:21:59 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Aug 7 09:21:59 2014 -0500

--
 CHANGES.txt  | 1 +
 .../cassandra/concurrent/DebuggableThreadPoolExecutor.java   | 8 ++--
 .../apache/cassandra/db/compaction/CompactionManager.java| 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33de6dc1/CHANGES.txt
--
diff --cc CHANGES.txt
index 1043016,915aeea..dfeca21
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,71 -1,18 +1,72 @@@
 -2.0.10
 +2.1.0-final
 + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
 + * Fix binding null values inside UDT (CASSANDRA-7685)
 + * Fix UDT field selection with empty fields (CASSANDRA-7670)
 + * Bogus deserialization of static cells from sstable (CASSANDRA-7684)
 +Merged from 2.0:
+  * Avoid logging CompactionInterrupted at ERROR (CASSANDRA-7694)
   * Minor leak in sstable2jon (CASSANDRA-7709)
   * Add cassandra.auto_bootstrap system property (CASSANDRA-7650)
 - * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
 - * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 - * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
   * Update java driver (for hadoop) (CASSANDRA-7618)
 - * Fix truncate to always flush (CASSANDRA-7511)
 + * Remove CqlPagingRecordReader/CqlPagingInputFormat (CASSANDRA-7570)
 + * Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)
 +
 +
 +2.1.0-rc5
 + * Reject counters inside user types (CASSANDRA-7672)
 + * Switch to notification-based GCInspector (CASSANDRA-7638)
 + * (cqlsh) Handle nulls in UDTs and tuples correctly (CASSANDRA-7656)
 + * Don't use strict consistency when replacing (CASSANDRA-7568)
 + * Fix min/max cell name collection on 2.0 SSTables with range
 +   tombstones (CASSANDRA-7593)
 + * Tolerate min/max cell names of different lengths (CASSANDRA-7651)
 + * Filter cached results correctly (CASSANDRA-7636)
 + * Fix tracing on the new SEPExecutor (CASSANDRA-7644)
   * Remove shuffle and taketoken (CASSANDRA-7601)
 - * Switch liveRatio-related log messages to DEBUG (CASSANDRA-7467)
 - * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS 
(CASSANDRA-7611)
 - * Always merge ranges owned by a single node (CASSANDRA-6930)
 - * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Clean up Windows batch scripts (CASSANDRA-7619)
 + * Fix native protocol drop user type notification (CASSANDRA-7571)
 + * Give read access to system.schema_usertypes to all authenticated users
 +   (CASSANDRA-7578)
 + * (cqlsh) Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
 + * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
 + * Fix NPE when dropping index from non-existent keyspace, AssertionError when
 +   dropping non-existent index with IF EXISTS (CASSANDRA-7590)
 + * Fix sstablelevelresetter hang (CASSANDRA-7614)
 + * (cqlsh) Fix deserialization of blobs (CASSANDRA-7603)
 + * Use keyspace updated schema change message for UDT changes in v1 and
 +   v2 protocols (CASSANDRA-7617)
 + * Fix tracing of range slices and secondary index lookups that are local
 +   to the coordinator (CASSANDRA-7599)
 + * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
 + * Don't swap max/min col names when mutating sstable metadata 
(CASSANDRA-7596)
 + * (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
 + * (cqlsh) Improve waiting for a trace to complete (CASSANDRA-7626)
 + * Fix tracing of concurrent range slices and 2ary index queries 
(CASSANDRA-7626)
 + * Fix scrub against collection type (CASSANDRA-7665)
 +Merged from 2.0:
 + * Set gc_grace_seconds to seven days for system schema tables 
(CASSANDRA-7668)
 + * SimpleSeedProvider no longer caches seeds forever (CASSANDRA-7663)
 + * Always flush on truncate (CASSANDRA-7511)
   * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
 + * Always merge ranges owned by a single node (CASSANDRA-6930)
 + * Track max/min timestamps for range tombstones (CASSANDRA-7647)
 + * Fix NPE when listing saved caches dir (CASSANDRA-7632)
 +
 +
 +2.1.0-rc4
 + * Fix word count hadoop example (CASSANDRA-7200)
 + * Updated memtable_cleanup_threshold and memtable_flush_writers defaults

[3/3] git commit: merge from 2.0

2014-03-13 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/cassandra-2.1
Commit: 4c22b165cb5ba89f0454f563eeb76e4de2b01367
Parents: a2ceb22 da2d971
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Mar 13 13:14:15 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Mar 13 13:14:15 2014 -0500

--
 CHANGES.txt   | 1 +
 src/java/org/apache/cassandra/streaming/StreamWriter.java | 8 
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c22b165/CHANGES.txt
--
diff --cc CHANGES.txt
index eb82a1c,e208e21..6a44d80
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 -2.0.7
 +2.1.0-beta2
 + * Apply DONTNEED fadvise to commitlog segments (CASSANDRA-6759)
 + * Switch CRC component to Adler and include it for compressed sstables 
 +   (CASSANDRA-4165)
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE and apply update function correctly (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 + * Change caching option syntax (CASSANDRA-6745)
 + * Fix stress to do proper counter reads (CASSANDRA-6835)
 +Merged from 2.0:
+  * Fix leaking validator FH in StreamWriter (CASSANDRA-6832)
 + * fix nodetool getsstables for blob PK (CASSANDRA-6803)
   * Fix saving triggers to schema (CASSANDRA-6789)
   * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
   * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c22b165/src/java/org/apache/cassandra/streaming/StreamWriter.java
--

[3/3] git commit: merge from 2.0

2014-03-11 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/cassandra-2.1
Commit: 6e0378249a54e8005302aac3e4d4f8b67c6c8f39
Parents: e22d0b1 31cbdfd
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Mar 11 23:19:39 2014 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Mar 11 23:19:39 2014 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e037824/CHANGES.txt
--
diff --cc CHANGES.txt
index 06331ad,d8a348d..0442b4e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,10 +1,20 @@@
 -2.0.7
 +2.1.0-beta2
 + * Allow cassandra-stress to set compaction strategy options (CASSANDRA-6451)
 + * Add broadcast_rpc_address option to cassandra.yaml (CASSANDRA-5899)
 + * Auto reload GossipingPropertyFileSnitch config (CASSANDRA-5897)
 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573)
 + * Fix ABTC NPE (CASSANDRA-6692)
 + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660)
 + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742)
 + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705)
 + * Scrub should not always clear out repaired status (CASSANDRA-5351)
 + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446)
 + * Fix ClassCastException for compact table with composites (CASSANDRA-6738)
 + * Fix potentially repairing with wrong nodes (CASSANDRA-6808)
 +Merged from 2.0:
   * Fix saving triggers to schema (CASSANDRA-6789)
   * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790)
+  * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
 -
 -
 -2.0.6
   * Avoid race-prone second scrub of system keyspace (CASSANDRA-6797)
   * Pool CqlRecordWriter clients by inetaddress rather than Range 
 (CASSANDRA-6665)

[3/3] git commit: merge from 2.0

2014-02-06 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: f97a981d560539565db540263eff3b0c80dbab8e
Parents: 3a82adb 45955e6
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Feb 6 10:15:04 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Feb 6 10:15:04 2014 -0600

--
 CHANGES.txt |  2 ++
 .../cassandra/db/index/SecondaryIndexSearcher.java  |  8 
 .../db/index/composites/CompositesSearcher.java |  1 +
 .../apache/cassandra/db/index/keys/KeysSearcher.java|  1 +
 .../org/apache/cassandra/service/StorageService.java| 12 
 5 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f97a981d/CHANGES.txt
--
diff --cc CHANGES.txt
index 745e50b,b260b49..ddb6984
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,6 +1,36 @@@
 +2.1
 + * add listsnapshots command to nodetool (CASSANDRA-5742)
 + * Introduce AtomicBTreeColumns (CASSANDRA-6271)
 + * Multithreaded commitlog (CASSANDRA-3578)
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 + * Secondary index support for collections (CASSANDRA-4511, 6383)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 + * Push composites support in the storage engine
 +   (CASSANDRA-5417, CASSANDRA-6520)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
 + * Add cardinality estimator for key count estimation (CASSANDRA-5906)
 + * CF id is changed to be non-deterministic. Data dir/key cache are created
 +   uniquely for CF id (CASSANDRA-5202)
 + * New counters implementation (CASSANDRA-6504)
 + * Replace UnsortedColumns usage with ArrayBackedSortedColumns 
(CASSANDRA-6630)
 +
 +
  2.0.6
+  * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+  * Improve nodetool cfhistograms formatting (CASSANDRA-6360)
   * Expose bulk loading progress over JMX (CASSANDRA-4757)
   * Correctly handle null with IF conditions and TTL (CASSANDRA-6623)
  Merged from 1.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f97a981d/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
index a508a15,e93efd1..23f259b
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
@@@ -63,11 -59,11 +63,19 @@@ public abstract class SecondaryIndexSea
  for (IndexExpression expression : clause)
  {
  // skip columns belonging to a different index type
 -if (!columns.contains(expression.column_name))
 +if (!columns.contains(expression.column))
  continue;
  
++ HEAD
 +SecondaryIndex index = 
indexManager.getIndexForColumn(expression.column);
 +if (index == null || !expression.operator.allowsIndexQuery())
++||| merged common ancestors
++SecondaryIndex index = 
indexManager.getIndexForColumn(expression.column_name);
++if (index == null || (expression.op != IndexOperator.EQ))
++===
+ SecondaryIndex index = 
indexManager.getIndexForColumn(expression.column_name);
+ if (index == null || index.getIndexCfs() == null || expression.op 
!= IndexOperator.EQ)
++ cassandra-2.0
  continue;
  int columns = index.getIndexCfs().getMeanColumns();
  candidates.put(index, columns);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f97a981d/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java

[3/3] git commit: merge from 2.0

2014-02-03 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: b25a63a81d22e409e607ca28c39e20604332cb5d
Parents: 78f7142 039e9b9
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Feb 3 23:51:16 2014 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Feb 3 23:51:16 2014 -0600

--
 CHANGES.txt |   2 +
 .../cassandra/config/DatabaseDescriptor.java|  20 ++-
 .../org/apache/cassandra/io/util/Memory.java| 123 ++-
 .../cassandra/service/CassandraDaemon.java  |   2 +-
 .../cassandra/utils/FastByteComparisons.java|   6 +
 5 files changed, 145 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25a63a8/CHANGES.txt
--
diff --cc CHANGES.txt
index 6a4c507,b1fade1..28278c4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,6 +1,35 @@@
 +2.1
 + * add listsnapshots command to nodetool (CASSANDRA-5742)
 + * Introduce AtomicBTreeColumns (CASSANDRA-6271)
 + * Multithreaded commitlog (CASSANDRA-3578)
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 + * Secondary index support for collections (CASSANDRA-4511, 6383)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 + * Push composites support in the storage engine
 +   (CASSANDRA-5417, CASSANDRA-6520)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
 + * Add cardinality estimator for key count estimation (CASSANDRA-5906)
 + * CF id is changed to be non-deterministic. Data dir/key cache are created
 +   uniquely for CF id (CASSANDRA-5202)
 + * New counters implementation (CASSANDRA-6504)
 +
 +
  2.0.6
+  * Fix direct Memory on architectures that do not support unaligned long 
access
+(CASSANDRA-6628)
   * Let scrub optionally skip broken counter partitions (CASSANDRA-5930)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b25a63a8/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
diff --cc src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 2793237,bd5db69..378fa8a
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@@ -177,9 -177,9 +177,9 @@@ public class DatabaseDescripto
  /* evaluate the DiskAccessMode Config directive, which also affects 
indexAccessMode selection */
  if (conf.disk_access_mode == Config.DiskAccessMode.auto)
  {
- conf.disk_access_mode = 
System.getProperty(os.arch).contains(64) ? Config.DiskAccessMode.mmap : 
Config.DiskAccessMode.standard;
+ conf.disk_access_mode = hasLargeAddressSpace() ? 
Config.DiskAccessMode.mmap : Config.DiskAccessMode.standard;
  indexAccessMode = conf.disk_access_mode;
 -logger.info(DiskAccessMode 'auto' determined to be  + 
conf.disk_access_mode + , indexAccessMode is  + indexAccessMode );
 +logger.info(DiskAccessMode 'auto' determined to be {}, 
indexAccessMode is {}, conf.disk_access_mode, indexAccessMode);
  }
  else if (conf.disk_access_mode == 
Config.DiskAccessMode.mmap_index_only)
  {
@@@ -1384,8 -1324,19 +1384,24 @@@
  }
  }
  
 +public static int getIndexSummaryResizeIntervalInMinutes()
 +{
 +return conf.index_summary_resize_interval_in_minutes;
 +}
++
+ public static boolean hasLargeAddressSpace()
+ {
+ // currently we just check if it's a 64bit arch, but any we only 
really care if the address space is large
+ String datamodel = System.getProperty(sun.arch.data.model);
+ if (datamodel != null)
+ {
+ switch (datamodel)
+

[3/3] git commit: merge from 2.0

2013-12-17 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 90e585dde10189bc8e7044837ce2db91720ea2ce
Parents: 216139f ecec863
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 17 14:35:34 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 17 14:35:34 2013 -0600

--
 CHANGES.txt |  1 +
 .../compaction/AbstractCompactionStrategy.java  |  2 +-
 .../cassandra/db/compaction/CompactionTask.java |  2 +-
 .../compaction/LeveledCompactionStrategy.java   | 20 +++-
 .../db/compaction/LeveledCompactionTask.java|  8 +++
 .../db/compaction/LeveledManifest.java  | 25 
 .../SizeTieredCompactionStrategy.java   |  2 +-
 .../cassandra/db/compaction/Upgrader.java   |  2 +-
 .../cassandra/tools/StandaloneScrubber.java |  2 +-
 9 files changed, 39 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e585dd/CHANGES.txt
--
diff --cc CHANGES.txt
index dcc7e33,c2cd052..6c9f2e1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,5 +1,26 @@@
 +2.1
 + * Multithreaded commitlog (CASSANDRA-3578)
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 + * Secondary index support for collections (CASSANDRA-4511)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 + * Push composites support in the storage engine (CASSANDRA-5417)
 +
 +
  2.0.4
+  * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
   * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
   * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
   * Fix cleanup ClassCastException (CASSANDRA-6462)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e585dd/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e585dd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 59f2f2f,2a23966..cabe486
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@@ -119,12 -118,14 +119,12 @@@ public class CompactionTask extends Abs
  long totalkeysWritten = 0;
  
  long estimatedTotalKeys = Math.max(cfs.metadata.getIndexInterval(), 
SSTableReader.getApproximateKeyCount(actuallyCompact, cfs.metadata));
- long estimatedSSTables = Math.max(1, 
SSTableReader.getTotalBytes(actuallyCompact) / strategy.getMaxSSTableSize());
 -long estimatedSSTables = Math.max(1, 
SSTable.getTotalBytes(actuallyCompact) / strategy.getMaxSSTableBytes());
++long estimatedSSTables = Math.max(1, 
SSTableReader.getTotalBytes(actuallyCompact) / strategy.getMaxSSTableBytes());
  long keysPerSSTable = (long) Math.ceil((double) estimatedTotalKeys / 
estimatedSSTables);
  if (logger.isDebugEnabled())
 -logger.debug(Expected bloom filter size :  + keysPerSSTable);
 +logger.debug(Expected bloom filter size : {}, keysPerSSTable);
  
 -AbstractCompactionIterable ci = 
DatabaseDescriptor.isMultithreadedCompaction()
 -  ? new 
ParallelCompactionIterable(compactionType, 
strategy.getScanners(actuallyCompact), controller)
 -  : new 
CompactionIterable(compactionType, strategy.getScanners(actuallyCompact), 
controller);
 +AbstractCompactionIterable ci = new 
CompactionIterable(compactionType,

[3/3] git commit: merge from 2.0

2013-12-13 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: fe58dffef5d4f44255ff47623b7d4d50a2f4e56d
Parents: 74bf5aa c960975
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Dec 13 17:13:33 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Dec 13 17:13:33 2013 -0600

--
 CHANGES.txt |  2 ++
 .../SizeTieredCompactionStrategy.java   | 21 
 2 files changed, 19 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe58dffe/CHANGES.txt
--
diff --cc CHANGES.txt
index 4c74ea9,182bada..b673918
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,26 @@@
 +2.1
 + * Multithreaded commitlog (CASSANDRA-3578)
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 + * Secondary index support for collections (CASSANDRA-4511)
 + * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
 +
 +
  2.0.4
+  * Fix assertion failure in filterColdSSTables (CASSANDRA-6483)
+  * Fix row tombstones in larger-than-memory compactions (CASSANDRA-6008)
   * Fix cleanup ClassCastException (CASSANDRA-6462)
   * Reduce gossip memory use by interning VersionedValue strings 
(CASSANDRA-6410)
   * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)

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

[3/3] git commit: merge from 2.0

2013-11-29 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 2042bc3ca9332fabe1069ce741969eec5bfb3d6d
Parents: 2ddf2cd f065cbf
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Nov 29 13:26:43 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Nov 29 13:26:43 2013 -0600

--
 CHANGES.txt |  2 +
 .../apache/cassandra/repair/RepairSession.java  | 10 ++--
 .../cassandra/service/ActiveRepairService.java  | 27 +++---
 .../cassandra/service/StorageService.java   | 54 ++--
 .../cassandra/service/StorageServiceMBean.java  | 17 ++
 .../org/apache/cassandra/tools/NodeCmd.java | 12 -
 .../org/apache/cassandra/tools/NodeProbe.java   | 16 +++---
 .../apache/cassandra/tools/NodeToolHelp.yaml|  4 ++
 .../service/AntiEntropyServiceTestAbstract.java |  8 +--
 9 files changed, 120 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/CHANGES.txt
--
diff --cc CHANGES.txt
index 8d11a0a,12469f2..81ba65a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,8 +1,26 @@@
 +2.1
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 +
 +
  2.0.4
+  * Allow specifying datacenters to participate in a repair (CASSANDRA-6218)
+  * Fix divide-by-zero in PCI (CASSANDRA-6403)
   * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
   * Add sub-ms precision formats to the timestamp parser (CASSANDRA-6395)
 + * Add snapshot space used to cfstats (CASSANDRA-6231)
   * Expose a total memtable size metric for a CF (CASSANDRA-6391)
  Merged from 1.2:
   * Fix thundering herd on endpoint cache invalidation (CASSANDRA-6345)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/repair/RepairSession.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/service/StorageService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2042bc3c/src/java/org/apache/cassandra/service/StorageServiceMBean.java
--

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

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

[3/3] git commit: merge from 2.0

2013-11-22 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: a10150542c662a4cc69ce1b88f48636d1e6884f7
Parents: 87b39c8 02a9302
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Nov 22 17:07:37 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Nov 22 17:07:37 2013 -0600

--
 CHANGES.txt  |  4 
 .../apache/cassandra/db/compaction/LeveledManifest.java  | 11 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1015054/CHANGES.txt
--
diff --cc CHANGES.txt
index f54afe1,e85ba23..3fdb8e7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,24 @@@
 +2.1
 + * allocate fixed index summary memory pool and resample cold index summaries 
 +   to use less memory (CASSANDRA-5519)
 + * Removed multithreaded compaction (CASSANDRA-6142)
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871)
 + * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
 +
 +
+ 2.0.4
+  * Fix setting last compacted key in the wrong level for LCS (CASSANDRA-6284)
+ 
+ 
  2.0.3
   * Fix FD leak on slice read path (CASSANDRA-6275)
   * Cancel read meter task when closing SSTR (CASSANDRA-6358)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1015054/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index 2b79493,5690bd8..76f51d1
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@@ -145,13 -152,9 +150,9 @@@ public class LeveledManifes
  if (logger.isDebugEnabled())
  logger.debug(Adding [{}], toString(added));
  
- int minLevel = Integer.MAX_VALUE;
  for (SSTableReader ssTableReader : added)
- {
- minLevel = Math.min(minLevel, ssTableReader.getSSTableLevel());
  add(ssTableReader);
- }
 -lastCompactedKeys[minLevel] = SSTable.sstableOrdering.max(added).last;
 +lastCompactedKeys[minLevel] = 
SSTableReader.sstableOrdering.max(added).last;
  }
  
  public synchronized void repairOverlappingSSTables(int level)

[3/3] git commit: merge from 2.0

2013-11-07 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: f01166a5358777a6d749d488fdcee367f4b1a949
Parents: c2bd0d8 66df206
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Nov 7 13:54:41 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Nov 7 13:54:41 2013 -0600

--
 CHANGES.txt |   1 +
 .../db/commitlog/CommitLogReplayer.java | 101 ---
 2 files changed, 89 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f01166a5/CHANGES.txt
--
diff --cc CHANGES.txt
index 4b1f030,6ff2799..50956f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
 +2.1
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 + * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
 + * User-defined types for CQL3 (CASSANDRA-5590)
 + * Use of o.a.c.metrics in nodetool (CASSANDRA-5871)
 +
 +
  2.0.3
+  * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
   * Avoid flushing compaction_history after each operation (CASSANDRA-6287)
   * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
   * Skip loading corrupt key cache (CASSANDRA-6260)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f01166a5/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 532736b,74daecb..c9659c4
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@@ -110,9 -114,73 +114,72 @@@ public class CommitLogReplaye
  return replayedCount.get();
  }
  
+ private abstract static class ReplayFilter
+ {
+ public abstract IterableColumnFamily filter(RowMutation rm);
+ 
+ public static ReplayFilter create()
+ {
+ // If no replaylist is supplied an empty array of strings is used 
to replay everything.
+ if (System.getProperty(cassandra.replayList) == null)
+ return new AlwaysReplayFilter();
+ 
+ MultimapString, String toReplay = HashMultimap.create();
+ for (String rawPair : 
System.getProperty(cassandra.replayList).split(,))
+ {
+ String[] pair = rawPair.trim().split(.);
+ if (pair.length != 2)
+ throw new IllegalArgumentException(Each table to be 
replayed must be fully qualified with keyspace name, e.g., 'system.peers');
+ 
+ Keyspace ks = Schema.instance.getKeyspaceInstance(pair[0]);
+ if (ks == null)
+ throw new IllegalArgumentException(Unknown keyspace  + 
pair[0]);
+ if (ks.getColumnFamilyStore(pair[1]) == null)
+ throw new IllegalArgumentException(String.format(Unknown 
table %s.%s, pair[0], pair[1]));
+ 
+ toReplay.put(pair[0], pair[1]);
+ }
+ return new CustomReplayFilter(toReplay);
+ }
+ }
+ 
+ private static class AlwaysReplayFilter extends ReplayFilter
+ {
+ public IterableColumnFamily filter(RowMutation rm)
+ {
+ return rm.getColumnFamilies();
+ }
+ }
+ 
+ private static class CustomReplayFilter extends ReplayFilter
+ {
+ private MultimapString, String toReplay;
+ 
+ public CustomReplayFilter(MultimapString, String toReplay)
+ {
+ this.toReplay = toReplay;
+ }
+ 
+ public IterableColumnFamily filter(RowMutation rm)
+ {
+ final CollectionString cfNames = 
toReplay.get(rm.getKeyspaceName());
+ if (cfNames == null)
+ return Collections.emptySet();
+ 
+ return Iterables.filter(rm.getColumnFamilies(), new 
PredicateColumnFamily()
+ {
+ public boolean apply(ColumnFamily cf)
+ {
+ return cfNames.contains(cf.metadata().cfName);
+

[3/3] git commit: merge from 2.0

2013-11-02 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 5c21711e76731a6f48d67ca956ea865fda4574b4
Parents: bb95c1d ce206e2
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 3 00:08:41 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 3 00:08:41 2013 -0500

--
 .../apache/cassandra/auth/PasswordAuthenticator.java|  7 +++
 src/java/org/apache/cassandra/cli/CliClient.java|  4 ++--
 src/java/org/apache/cassandra/gms/VersionedValue.java   |  4 ++--
 src/java/org/apache/cassandra/locator/Ec2Snitch.java|  5 ++---
 .../apache/cassandra/serializers/AsciiSerializer.java   |  4 ++--
 .../apache/cassandra/serializers/UTF8Serializer.java|  4 ++--
 .../org/apache/cassandra/service/StorageService.java|  4 ++--
 src/java/org/apache/cassandra/transport/Client.java |  6 +++---
 src/java/org/apache/cassandra/transport/DataType.java   |  4 ++--
 src/java/org/apache/cassandra/utils/ByteBufferUtil.java |  8 
 test/unit/org/apache/cassandra/SchemaLoader.java|  1 -
 .../org/apache/cassandra/db/marshal/RoundTripTest.java  | 12 +---
 .../org/apache/cassandra/utils/FBUtilitiesTest.java |  4 ++--
 .../org/apache/cassandra/stress/operations/Reader.java  |  3 +--
 .../src/org/apache/cassandra/stress/util/Operation.java |  2 +-
 15 files changed, 33 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/src/java/org/apache/cassandra/cli/CliClient.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/src/java/org/apache/cassandra/locator/Ec2Snitch.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/src/java/org/apache/cassandra/service/StorageService.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c21711e/test/unit/org/apache/cassandra/SchemaLoader.java
--
diff --cc test/unit/org/apache/cassandra/SchemaLoader.java
index f9256da,58cc52f..ef20e64
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@@ -20,9 -20,9 +20,8 @@@ package org.apache.cassandra
  import java.io.File;
  import java.io.IOException;
  import java.nio.ByteBuffer;
 -import java.nio.charset.StandardCharsets;
  import java.util.*;
  
- import com.google.common.base.Charsets;
  import org.apache.cassandra.db.index.PerRowSecondaryIndexTest;
  import org.apache.cassandra.db.index.SecondaryIndex;
  import org.junit.AfterClass;

[3/3] git commit: merge from 2.0

2013-10-31 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 327cab8ab0fc4b7944df77beddca34a89bf41a56
Parents: d64aa99 cf8fa6e
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Oct 31 09:24:16 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Oct 31 09:24:16 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/327cab8a/CHANGES.txt
--
diff --cc CHANGES.txt
index ee4704c,d439032..cc878e4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +2.1
 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 + * Remove CFDefinition (CASSANDRA-6253)
 +
 +
  2.0.3
+  * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
   * Skip loading corrupt key cache (CASSANDRA-6260)
   * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
   * Compact hottest sstables first and optionally omit coldest from

[3/3] git commit: merge from 2.0

2013-10-08 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/cassandra-2.0
Commit: 471c2e654bc2201f09b62486978a1a76eae3b2b5
Parents: 9620e0c d8d764d
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Oct 8 15:45:46 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Oct 8 15:45:46 2013 -0500

--
 NEWS.txt | 8 
 1 file changed, 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/471c2e65/NEWS.txt
--
diff --cc NEWS.txt
index 37fbae7,9fb634f..817b170
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -14,30 -14,8 +14,22 @@@ restore snapshots created with the prev
  using the provided 'sstableupgrade' tool.
  
  
 -1.2.11
 -==
 +2.0.2
 +=
 +
 +New features
 +
 +- Speculative retry defaults to 99th percentile
 +  (See blog post at TODO)
 +- Configurable metrics reporting
 +  (see conf/metrics-reporter-config-sample.yaml)
 +- Compaction history and stats are now saved to system keyspace
 +  (system.compaction_history table). You can access historiy via
 +  new 'nodetool compactionhistory' command or CQL.
 +
- Upgrading
- -
- - tombstone_debug_threshold from 1.2.11 has been changed to
-   tombstone_warn_threshold and tombstone_failure_threshold.
-   Adjust these if your application relies on scanning a large
-   number of tombstones; see the comments in cassandra.yaml for why
-   this is dangerous.
- 
 +
 +2.0.1
 +=
  
  Upgrading
  -

[3/3] git commit: merge from 2.0

2013-09-23 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 8f5eb84b66e217c0d74ac83764beda35b279ef8e
Parents: 494cc32 7e59db2
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Sep 23 09:13:34 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Sep 23 09:13:34 2013 -0500

--
 CHANGES.txt |  4 +++
 .../cassandra/io/sstable/ColumnNameHelper.java  | 26 ++--
 .../apache/cassandra/utils/ByteBufferUtil.java  |  6 +
 3 files changed, 28 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5eb84b/CHANGES.txt
--
diff --cc CHANGES.txt
index da728d7,6df5559..fe81e20
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,15 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
+ 2.0.2
+  * Improve memory usage of metadata min/max column names (CASSANDRA-6077)
+ 
+ 
  2.0.1
   * Fix bug that could allow reading deleted data temporarily (CASSANDRA-6025)
   * Improve memory use defaults (CASSANDRA-5069)

[3/3] git commit: merge from 2.0

2013-09-19 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: fee30d5ad654a90391f5871a7393330b34fa8ebb
Parents: e5a7ced 72be2a4
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Sep 19 14:41:06 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Sep 19 14:41:06 2013 -0500

--
 CHANGES.txt  |  1 +
 NEWS.txt | 19 +++
 conf/cassandra.yaml  |  4 ++--
 src/java/org/apache/cassandra/config/Config.java |  2 +-
 .../cassandra/config/DatabaseDescriptor.java |  2 +-
 5 files changed, 20 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fee30d5a/CHANGES.txt
--
diff --cc CHANGES.txt
index 44c7f1b,979d6b0..2b5bf79
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 + * switch to LZ4 compression for internode communication (CASSANDRA-5887)
 + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
 + * Remove 1.2 network compatibility code (CASSANDRA-5960)
 + * Remove leveled json manifest migration code (CASSANDRA-5996)
 +
 +
  2.0.2
+  * Improve memory use defaults (CASSANDRA-5069)
   * Make ThriftServer more easlly extensible (CASSANDRA-6058)
   * Remove Hadoop dependency from ITransportFactory (CASSANDRA-6062)
  Merged from 1.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fee30d5a/NEWS.txt
--
diff --cc NEWS.txt
index 9b0938d,3712073..8990769
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,15 -13,15 +13,26 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +2.1
 +===
 +Upgrading
 +-
 +   - Rolling upgrades from anything pre-2.0 is not supported.
-- 2.0 must be atleast started before upgrading to 2.1 due to
-  the fact that the old JSON leveled manifest is migrated into
-  the sstable metadata files on startup in 2.0 and this code is
-  gone from 2.1.
++   - For leveled compaction users, 2.0 must be atleast started before
++ upgrading to 2.1 due to the fact that the old JSON leveled
++ manifest is migrated into the sstable metadata files on startup
++ in 2.0 and this code is gone from 2.1.
++
++
+ 2.0.2
+ =
+ 
+ Upgrading
+ -
+ - The default memtable allocation has changed from 1/3 of heap to 1/4
+   of heap.  Also, default (single-partition) read and write timeouts
+   have been reduced from 10s to 5s and 2s, respectively.
+ 
  
  2.0.0
  =

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

[3/3] git commit: merge from 2.0

2013-08-29 Thread jbellis 
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 73e27b07f588b0ace8255090d3840903893a7435
Parents: c146f43 c1e0f31
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Aug 29 12:52:58 2013 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Aug 29 12:52:58 2013 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/73e27b07/CHANGES.txt
--
diff --cc CHANGES.txt
index fdfcc0a,2d3ee24..7d7feaf
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,6 +1,10 @@@
 +2.1
 + * change logging from log4j to logback (CASSANDRA-5883)
 +
 +
  2.0.1
+  * Improve leveled compaction's ability to find non-overlapping L0 compactions
+to work on concurrently (CASSANDRA-5921)
   * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
   * Log Merkle tree stats (CASSANDRA-2698)
   * Switch from crc32 to adler32 for compressed sstable checksums 
(CASSANDRA-5862)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/73e27b07/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--