[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-11-07 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 d909fb4fa - f32110c6c
  refs/heads/trunk 0507dbe1c - 41175282d


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 41175282dee8ef6dfae72eba364b91efbbf99caf
Parents: 0507dbe f32110c
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 7 11:49:20 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 7 11:49:20 2012 -0600

--

--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-10-09 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 19c3bd3b3 - f34bd79b9
  refs/heads/trunk ed6d24e59 - 5e425cb15


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 5e425cb15d91502c137545f5dec567595f04bdd8
Parents: ed6d24e f34bd79
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Oct 9 16:46:05 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Oct 9 16:46:05 2012 -0500

--
 .../cassandra/db/compaction/LeveledManifest.java   |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


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

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-09-26 Thread brandonwilliams 
Updated Branches:
  refs/heads/trunk c1724dd8a - 2edeeeba2


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 2edeeeba2db06e0fc5bd70c60471ab1f87d2ffc7
Parents: c1724dd 83b6f22
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Sep 26 10:08:32 2012 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Sep 26 10:08:32 2012 -0500

--
 bin/cqlsh  |2 +-
 pylib/cqlshlib/cql3handling.py |5 -
 pylib/cqlshlib/cqlhandling.py  |9 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2edeeeba/pylib/cqlshlib/cql3handling.py
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2edeeeba/pylib/cqlshlib/cqlhandling.py
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-09-06 Thread slebresne 
Updated Branches:
  refs/heads/trunk 0e3a9a55e - 42c55896b


Merge branch 'cassandra-1.1' into trunk

Conflicts:
CHANGES.txt
NEWS.txt
build.xml


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

Branch: refs/heads/trunk
Commit: 42c55896b9b5e9f506eb009b28884108d6ad41ef
Parents: 0e3a9a5 4177b58
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Sep 6 17:54:17 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Sep 6 17:54:17 2012 +0200

--
 CHANGES.txt|7 +-
 NEWS.txt   |   18 +++
 debian/changelog   |6 +
 .../cassandra/cql3/statements/SelectStatement.java |7 -
 .../db/columniterator/ISSTableColumnIterator.java  |   18 +++
 5 files changed, 53 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42c55896/CHANGES.txt
--
diff --cc CHANGES.txt
index b08117d,4a5bfe9..ec4992c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,56 -1,6 +1,56 @@@
- 1.2-dev
 -1.1.6
 -  * (cql3) fix potential NPE with both equal and unequal restriction 
(CASSANDRA-4532)
 -  * (cql3) improves ORDER BY validation (CASSANDRA-4624)
++1.2-beta1
 + * 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)
  
  
  1.1.5

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-08-22 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 aa81f84c3 - 8173c6f64
  refs/heads/trunk e1fef7248 - 66d52f9d2


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 66d52f9d2742877a31df3b05cf3a3fe8fe72377e
Parents: e1fef72 8173c6f
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Aug 22 10:34:57 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Aug 22 10:34:57 2012 -0500

--
 CHANGES.txt|1 +
 conf/cassandra-env.sh  |2 +-
 .../apache/cassandra/cache/AutoSavingCache.java|8 +++-
 .../cassandra/db/compaction/CompactionManager.java |4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66d52f9d/CHANGES.txt
--
diff --cc CHANGES.txt
index d9d67e4,3c7163a..7c0aa32
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,5 +1,49 @@@
 +1.2-dev
 + * Make compaction, flush JBOD-aware (CASSANDRA-4292)
 + * 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)
 + * add Murmur3Partitioner and make it default for new installations 
(CASSANDRA-3772)
 +
 +
  1.1.5
+  * increase stack size under Java7 to 180K
   * Log(info) schema changes (CASSANDRA-4547)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66d52f9d/src/java/org/apache/cassandra/cache/AutoSavingCache.java
--
diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java
index ec054fb,b4e77be..7ce2beb
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@@ -201,17 -198,23 +202,22 @@@ public class AutoSavingCacheK extends 
  info = new CompactionInfo(new CFMetaData(system, 
cacheType.toString(), null, null, null),
type,
0,
 -  estimatedTotalBytes);
 +  keys.size(),
 +

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-07-25 Thread brandonwilliams 
Updated Branches:
  refs/heads/trunk e73b2a68b - d62f8c1e5


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: d62f8c1e5f4a901652cd9dd7ef7f8ecb4b779450
Parents: e73b2a6 6f384c5
Author: Brandon Williams brandonwilli...@apache.org
Authored: Wed Jul 25 12:09:14 2012 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Wed Jul 25 12:09:14 2012 -0500

--
 examples/pig/test/populate-cli.txt |4 ++--
 .../cassandra/hadoop/pig/CassandraStorage.java |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


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

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-06-29 Thread slebresne 
Updated Branches:
  refs/heads/trunk b8578df60 - 3eff5455d


Merge branch 'cassandra-1.1' into trunk

Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
src/java/org/apache/cassandra/db/Table.java
src/java/org/apache/cassandra/db/compaction/CompactionController.java
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
src/java/org/apache/cassandra/io/sstable/SSTableReader.java
src/java/org/apache/cassandra/service/StorageService.java
src/java/org/apache/cassandra/tools/BulkLoader.java


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

Branch: refs/heads/trunk
Commit: 3eff5455dc58e6b7e0aadf987a635320f4bd5ef1
Parents: b8578df 09e5443
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Fri Jun 29 11:18:46 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Fri Jun 29 11:18:46 2012 +0200

--
 CHANGES.txt|3 +
 bin/sstablescrub   |   50 ++
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   28 +-
 src/java/org/apache/cassandra/db/DefsTable.java|2 +-
 src/java/org/apache/cassandra/db/Table.java|   20 +-
 .../db/compaction/CompactionController.java|   12 +-
 .../cassandra/db/compaction/CompactionManager.java |  228 +-
 .../cassandra/db/compaction/LeveledManifest.java   |  100 +++--
 .../apache/cassandra/db/compaction/Scrubber.java   |  357 +++
 src/java/org/apache/cassandra/dht/Bounds.java  |6 +
 .../apache/cassandra/hadoop/BulkRecordWriter.java  |6 +-
 .../apache/cassandra/io/sstable/SSTableLoader.java |   12 +-
 .../apache/cassandra/io/sstable/SSTableReader.java |   25 +
 .../apache/cassandra/io/sstable/SSTableWriter.java |4 +-
 .../apache/cassandra/service/StorageService.java   |9 +-
 .../org/apache/cassandra/tools/BulkLoader.java |   24 +-
 .../apache/cassandra/tools/StandaloneScrubber.java |  282 
 .../org/apache/cassandra/utils/OutputHandler.java  |   95 
 test/unit/org/apache/cassandra/db/ScrubTest.java   |   70 +++-
 19 files changed, 1017 insertions(+), 316 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3eff5455/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index dc2459b,a40e52e..a92665e
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -222,11 -227,16 +223,16 @@@ public class ColumnFamilyStore implemen
  
  // scan for sstables corresponding to this cf and load them
  data = new DataTracker(this);
- Directories.SSTableLister sstables = 
directories.sstableLister().skipCompacted(true).skipTemporary(true);
- 
data.addInitialSSTables(SSTableReader.batchOpen(sstables.list().entrySet(), 
data, metadata, this.partitioner));
 -SetDecoratedKey savedKeys = caching == Caching.NONE || caching == 
Caching.ROWS_ONLY
 -   ? Collections.DecoratedKeyemptySet()
 -   : 
CacheService.instance.keyCache.readSaved(table.name, columnFamily, partitioner);
+ 
+ if (loadSSTables)
+ {
+ Directories.SSTableLister sstables = 
directories.sstableLister().skipCompacted(true).skipTemporary(true);
 -
data.addInitialSSTables(SSTableReader.batchOpen(sstables.list().entrySet(), 
savedKeys, data, metadata, this.partitioner));
++
data.addInitialSSTables(SSTableReader.batchOpen(sstables.list().entrySet(), 
data, metadata, this.partitioner));
+ }
+ 
 +if (caching == Caching.ALL || caching == Caching.KEYS_ONLY)
 +CacheService.instance.keyCache.loadSaved(this);
 +
  // compaction strategy should be created after the CFS has been 
prepared
  this.compactionStrategy = 
metadata.createCompactionStrategyInstance(this);
  

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3eff5455/src/java/org/apache/cassandra/db/Table.java
--
diff --cc

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-06-27 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 54c647ffe - 8a3bb80e0
  refs/heads/trunk 2bfea99dd - 33c7273cb


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 33c7273cb8d44ec4f3b3f7a9f357f531946bd96b
Parents: 2bfea99 8a3bb80
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jun 27 11:40:13 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jun 27 11:40:13 2012 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/33c7273c/CHANGES.txt
--
diff --cc CHANGES.txt
index c2fecb2,8918dee..8af4eeb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,31 -1,5 +1,32 @@@
 +1.2-dev
 + * 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)
 + * 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)
 +
 +
  1.1.2
+  * Fix cleanup not deleting index entries (CASSANDRA-4379)
   * Use correct partitioner when saving + loading caches (CASSANDRA-4331)
   * Check schema before trying to export sstable (CASSANDRA-2760)
   * Raise a meaningful exception instead of NPE when PFS encounters

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33c7273c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/33c7273c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-06-25 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.1 7a510ac08 - eacdca02d
  refs/heads/trunk 2ce8274c6 - 708ab005a


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 708ab005a4faadb6804334ae63c3c8b1762a83e4
Parents: 2ce8274 eacdca0
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Jun 25 12:38:45 2012 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Jun 25 12:38:45 2012 -0500

--
 CHANGES.txt|2 +
 src/java/org/apache/cassandra/db/Table.java|2 +-
 .../cassandra/db/index/SecondaryIndexManager.java  |2 +-
 .../apache/cassandra/io/sstable/SSTableLoader.java |   13 +++-
 .../apache/cassandra/service/StorageService.java   |   16 +++---
 5 files changed, 28 insertions(+), 7 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/708ab005/src/java/org/apache/cassandra/db/Table.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/708ab005/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
--

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

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-06-20 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 170e14ab9 - 65b09c8c9
  refs/heads/trunk d59be21e8 - 97a1c789e


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 97a1c789ead586075cec2fc240b2ae3004f38071
Parents: d59be21 65b09c8
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jun 20 15:24:05 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jun 20 15:24:05 2012 -0500

--
 CHANGES.txt|2 +
 .../org/apache/cassandra/config/CFMetaData.java|   19 ++
 2 files changed, 15 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/97a1c789/src/java/org/apache/cassandra/config/CFMetaData.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-06-16 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 a21307a27 - 6dddf360e
  refs/heads/trunk 4d88a1dac - c34c70f0b


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: c34c70f0bbc6c87c0c713763fccb5b7cb19f16bf
Parents: 4d88a1d 6dddf36
Author: Jonathan Ellis jbel...@apache.org
Authored: Sat Jun 16 10:15:54 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sat Jun 16 10:15:54 2012 -0500

--
 build.xml |   23 +++
 1 files changed, 15 insertions(+), 8 deletions(-)
--


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

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-06-12 Thread slebresne 
Updated Branches:
  refs/heads/trunk 678f6ae38 - 682a34f36


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 682a34f36325769bc06b5d3fee85f23e2766cfaf
Parents: 678f6ae 26a087c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Jun 12 15:05:43 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Jun 12 15:05:43 2012 +0200

--
 CHANGES.txt|3 +
 build.xml  |   27 +-
 conf/cassandra-env.sh  |   10 +-
 doc/cql3/CQL.css   |  103 ++
 doc/cql3/CQL.textile   |  826 +++
 .../cql3/statements/CreateIndexStatement.java  |6 +-
 6 files changed, 961 insertions(+), 14 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/682a34f3/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-31 Thread yukim 
Updated Branches:
  refs/heads/cassandra-1.1 d484e28d1 - a5e0994a1
  refs/heads/trunk dc9e70eda - 90869e251


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 90869e25133db17adf8d390df72187ffe69df258
Parents: dc9e70e a5e0994
Author: Yuki Morishita yu...@apache.org
Authored: Thu May 31 15:34:27 2012 -0500
Committer: Yuki Morishita yu...@apache.org
Committed: Thu May 31 15:34:27 2012 -0500

--
 0 files changed, 0 insertions(+), 0 deletions(-)
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-30 Thread dbrosius 
Updated Branches:
  refs/heads/trunk 52e09c100 - 25c7a7147


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 25c7a71476504d4a90b7c369cc14b523b0df8e67
Parents: 52e09c1 59f349d
Author: Dave Brosius dbros...@apache.org
Authored: Wed May 30 20:35:33 2012 -0400
Committer: Dave Brosius dbros...@apache.org
Committed: Wed May 30 20:35:33 2012 -0400

--
 CHANGES.txt|3 +
 .../org/apache/cassandra/cql/QueryProcessor.java   |   39 +--
 .../org/apache/cassandra/cql3/QueryProcessor.java  |   40 +--
 3 files changed, 51 insertions(+), 31 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/src/java/org/apache/cassandra/cql/QueryProcessor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/25c7a714/src/java/org/apache/cassandra/cql3/QueryProcessor.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-16 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 1e8685d83 - 7dae25d87
  refs/heads/trunk 34bdc7cc9 - 71b38b094


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 71b38b09428abd95a9d70ae29ae9fd0061c5a0f4
Parents: 34bdc7c 7dae25d
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed May 16 11:52:57 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed May 16 11:52:57 2012 -0500

--
 CHANGES.txt|2 ++
 .../org/apache/cassandra/db/ColumnFamilyStore.java |1 +
 .../org/apache/cassandra/utils/FBUtilities.java|2 +-
 3 files changed, 4 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/71b38b09/CHANGES.txt
--
diff --cc CHANGES.txt
index 38c78f7,d59480a..27c5e58
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +1.2-dev
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442)
 + * 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)
 +
 +
  1.1.1-dev
+  * log number of rows read from saved cache (CASSANDRA-4249)
   * calculate exact size required for cleanup operations (CASSANDRA-1404)
   * avoid blocking additional writes during flush when the commitlog
 gets behind temporarily (CASSANDRA-1991)

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/71b38b09/src/java/org/apache/cassandra/utils/FBUtilities.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-14 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 f58a51bc5 - 68bae3131
  refs/heads/trunk 347b5775e - 19ce000b2


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 19ce000b2d0958efc3803e6b365d70f4737e588c
Parents: 347b577 68bae31
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon May 14 18:10:03 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon May 14 18:10:03 2012 -0500

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/config/CFMetaData.java|   31 ++
 .../cql3/statements/DropIndexStatement.java|   17 +---
 .../cassandra/cql3/statements/SelectStatement.java |7 ++-
 4 files changed, 37 insertions(+), 19 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19ce000b/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19ce000b/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/19ce000b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-02 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 1686a36ed - 46e422a94
  refs/heads/trunk 4b9a80231 - 06a7bf36b


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 06a7bf36b7b2ab6f45ca0765c547949cc9647bc3
Parents: 4b9a802 46e422a
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed May 2 12:48:30 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed May 2 12:48:30 2012 -0500

--
 CHANGES.txt|2 +
 .../cassandra/cql3/statements/SelectStatement.java |8 +-
 .../db/compaction/AbstractCompactionIterable.java  |   17 +--
 .../db/compaction/AbstractCompactionStrategy.java  |   23 +++-
 .../db/compaction/CompactionIterable.java  |   20 +---
 .../cassandra/db/compaction/CompactionManager.java |   16 +--
 .../cassandra/db/compaction/CompactionTask.java|7 +-
 .../db/compaction/ICompactionScanner.java  |   34 +
 .../db/compaction/LeveledCompactionStrategy.java   |  103 ++-
 .../cassandra/db/compaction/LeveledManifest.java   |3 +-
 .../db/compaction/ParallelCompactionIterable.java  |   24 ++--
 .../apache/cassandra/io/sstable/SSTableReader.java |2 +
 .../cassandra/io/sstable/SSTableScanner.java   |   13 ++-
 .../cassandra/service/AntiEntropyService.java  |4 +-
 test/conf/cassandra.yaml   |1 +
 test/unit/org/apache/cassandra/SchemaLoader.java   |9 +-
 .../compaction/LeveledCompactionStrategyTest.java  |   87 
 .../cassandra/io/LazilyCompactedRowTest.java   |   14 +-
 18 files changed, 305 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a7bf36/CHANGES.txt
--
diff --cc CHANGES.txt
index 890c577,83c171b..bac8b0e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +1.2-dev
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442)
 + * 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)
 +
 +
  1.1.1-dev
+  * Open 1 sstableScanner per level for leveled compaction (CASSANDRA-4142)
   * Optimize reads when row deletion timestamps allow us to restrict
 the set of sstables we check (CASSANDRA-4116)
   * incremental repair by token range (CASSANDRA-3912)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a7bf36/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a7bf36/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a7bf36/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
--
diff --cc 
src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
index 5e0a911,3f51b88..41128b0
--- 
a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
+++ 
b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
@@@ -15,8 -15,10 +15,9 @@@
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
 -
  package org.apache.cassandra.db.compaction;
  
+ import java.io.IOException;
  import java.util.*;
  import java.util.concurrent.TimeUnit;
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a7bf36/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a7bf36/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a7bf36/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 96a4273,b66f20b..be7fc81
---

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-05-01 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 116d8a1a7 - 3a04d8548
  refs/heads/trunk 8d0dd61b3 - b51a0d64f


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: b51a0d64f0667dbf46ba7213eefbd96d67f8d463
Parents: 8d0dd61 3a04d85
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue May 1 23:30:48 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue May 1 23:30:48 2012 -0500

--
 CHANGES.txt|2 +
 .../apache/cassandra/db/CollationController.java   |   48 -
 .../cassandra/db/commitlog/CommitLogAllocator.java |4 +
 .../cassandra/db/commitlog/CommitLogSegment.java   |9 +-
 .../cassandra/db/CollationControllerTest.java  |   83 +++
 5 files changed, 135 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51a0d64/CHANGES.txt
--
diff --cc CHANGES.txt
index fbb0eb2,c37dd93..bcf15bd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,16 @@@
 +1.2-dev
 + * Track tombstone expiration and compact when tombstone content is
 +   higher than a configurable threshold, default 20% (CASSANDRA-3442)
 + * 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)
 +
 +
  1.1.1-dev
+  * Optimize reads when row deletion timestamps allow us to restrict
+the set of sstables we check (CASSANDRA-4116)
   * incremental repair by token range (CASSANDRA-3912)
   * streaming commitlog backup + pitr (CASSANDRA-3690)
   * avoid generating redundant compaction tasks during streaming

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51a0d64/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b51a0d64/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-04-26 Thread slebresne 
Updated Branches:
  refs/heads/trunk a05a5641f - a6c5d3c43


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: a6c5d3c4302661516e539f2c98bca908e51bb072
Parents: a05a564 698a2bb
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Apr 26 16:36:10 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Apr 26 16:36:10 2012 +0200

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


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

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

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-04-12 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.1 33cdcaf73 - c215a4c96
  refs/heads/trunk 531d01c04 - 8ab2473fe


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 8ab2473fe37c1e75ebb2c803f05649360e0a6861
Parents: 531d01c c215a4c
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Apr 12 11:14:21 2012 -0500
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Apr 12 11:14:21 2012 -0500

--
 .../apache/cassandra/io/CompactSerializerTest.java |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-04-09 Thread slebresne 
Updated Branches:
  refs/heads/trunk 64305dd9f - b2cb52d8a


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: b2cb52d8a76e85eef6f2213694a7943d49826ab8
Parents: 64305dd 1ea2a60
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Apr 9 19:03:13 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Apr 9 19:03:13 2012 +0200

--
 CHANGES.txt|1 +
 interface/cassandra.thrift |2 -
 .../org/apache/cassandra/thrift/Cassandra.java |  330 +++
 .../org/apache/cassandra/thrift/CfDef.java |  258 +---
 .../org/apache/cassandra/thrift/CqlMetadata.java   |   44 +-
 .../apache/cassandra/thrift/CqlPreparedResult.java |   16 +-
 .../org/apache/cassandra/thrift/CqlResult.java |   18 +-
 .../org/apache/cassandra/thrift/CqlRow.java|   18 +-
 .../org/apache/cassandra/thrift/KsDef.java |   40 +-
 src/java/org/apache/cassandra/config/Avro.java |2 +-
 .../org/apache/cassandra/config/CFMetaData.java|  131 +++---
 .../apache/cassandra/config/ColumnDefinition.java  |   59 ++-
 .../org/apache/cassandra/config/KSMetaData.java|2 +-
 .../apache/cassandra/cql/AlterTableStatement.java  |1 +
 .../cassandra/cql/CreateColumnFamilyStatement.java |2 +-
 .../cql3/statements/AlterTableStatement.java   |4 +-
 .../statements/CreateColumnFamilyStatement.java|3 +-
 test/unit/org/apache/cassandra/SchemaLoader.java   |4 +-
 .../cassandra/config/ColumnDefinitionTest.java |4 +-
 .../unit/org/apache/cassandra/config/DefsTest.java |   10 +-
 .../apache/cassandra/db/ColumnFamilyStoreTest.java |2 +-
 .../cassandra/thrift/ThriftValidationTest.java |2 +-
 22 files changed, 370 insertions(+), 583 deletions(-)
--


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

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

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

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/cql/AlterTableStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2cb52d8/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-04-03 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.1 26c136d30 - 031e89417
  refs/heads/trunk 4e8b92796 - f4595a791


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: f4595a7910639b5713d1b8207255f1e127de6457
Parents: 4e8b927 031e894
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Apr 3 11:14:51 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Apr 3 11:14:51 2012 -0500

--

--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-03-29 Thread slebresne 
Updated Branches:
  refs/heads/trunk 25b2a4275 - 27e322b63


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 27e322b63776076d593a3b64aabd62bea304aca1
Parents: 25b2a42 27c999a
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Mar 29 16:34:26 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Mar 29 16:34:26 2012 +0200

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/cql/DeleteStatement.java  |7 ---
 .../cassandra/cql3/statements/DeleteStatement.java |1 -
 3 files changed, 5 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27e322b6/src/java/org/apache/cassandra/cql/DeleteStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/27e322b6/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-03-27 Thread slebresne 
Updated Branches:
  refs/heads/trunk ad37161c0 - 486368de9


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 486368de99c2af444573f73df042840fa68ec5ee
Parents: ad37161 dcf89bf
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Mar 27 17:35:21 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Mar 27 17:35:21 2012 +0200

--
 CHANGES.txt|2 ++
 src/java/org/apache/cassandra/config/Avro.java |2 +-
 .../org/apache/cassandra/config/CFMetaData.java|5 -
 .../apache/cassandra/cql/AlterTableStatement.java  |2 ++
 src/java/org/apache/cassandra/cql/CFPropDefs.java  |5 -
 .../cassandra/cql/CreateColumnFamilyStatement.java |4 +++-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |5 -
 .../cql3/statements/AlterTableStatement.java   |2 ++
 .../statements/CreateColumnFamilyStatement.java|4 +++-
 9 files changed, 25 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql/AlterTableStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql/CFPropDefs.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/486368de/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
--

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-02-23 Thread slebresne 
Updated Branches:
  refs/heads/trunk 7f3704172 - 950632012


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 95063201240ef88a7b00eace621a3a35141fb22f
Parents: 7f37041 5888fcd
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu Feb 23 18:23:06 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu Feb 23 18:23:06 2012 +0100

--
 CHANGES.txt|1 +
 src/java/org/apache/cassandra/config/Schema.java   |2 +-
 .../org/apache/cassandra/cql/QueryProcessor.java   |1 -
 .../cql3/statements/SchemaAlteringStatement.java   |1 -
 src/java/org/apache/cassandra/db/DefsTable.java|7 +
 .../cassandra/db/migration/AddColumnFamily.java|6 +-
 .../apache/cassandra/db/migration/AddKeyspace.java |6 +-
 .../cassandra/db/migration/DropColumnFamily.java   |6 +-
 .../cassandra/db/migration/DropKeyspace.java   |6 +-
 .../apache/cassandra/db/migration/Migration.java   |   20 +++-
 .../cassandra/db/migration/MigrationHelper.java|   86 ++-
 .../cassandra/db/migration/UpdateColumnFamily.java |6 +-
 .../cassandra/db/migration/UpdateKeyspace.java |8 +-
 .../apache/cassandra/service/MigrationManager.java |   14 ++-
 .../apache/cassandra/service/StorageService.java   |2 +-
 .../apache/cassandra/thrift/CassandraServer.java   |1 -
 .../cassandra/config/DatabaseDescriptorTest.java   |   42 +---
 test/unit/org/apache/cassandra/db/DefsTest.java|   15 +++
 18 files changed, 160 insertions(+), 70 deletions(-)
--


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

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

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-02-22 Thread slebresne 
Updated Branches:
  refs/heads/trunk a9e091910 - aa187053b


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: aa187053ba2cf9e003c87aa8da8bd284f67a0841
Parents: a9e0919 40bb550
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Feb 22 11:35:11 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Feb 22 11:35:11 2012 +0100

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


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

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-02-22 Thread slebresne 
Updated Branches:
  refs/heads/trunk aa187053b - a9769371b


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: a9769371be6c2caed978f8a3ecffd1aec6ed1eac
Parents: aa18705 87b786f
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Feb 22 11:40:28 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Feb 22 11:40:28 2012 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9769371/CHANGES.txt
--
diff --cc CHANGES.txt
index a04cbd6,0732d3e..086eb0b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -8,9 -8,10 +8,11 @@@
   * Fix bug with counters in super columns (CASSANDRA-3821)
  Merged from 1.0:
   * remove the wait on hint future during write (CASSANDRA-3870)
+  * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
+  * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
  
  
 +
  1.1-beta1
   * add nodetool rebuild_index (CASSANDRA-3583)
   * add nodetool rangekeysample (CASSANDRA-2917)

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-02-22 Thread slebresne 
Updated Branches:
  refs/heads/trunk a9769371b - d359d8f61


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: d359d8f6176c7ea823a61a9695b52ecd89ec1cb3
Parents: a976937 5191780
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Wed Feb 22 14:23:48 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Wed Feb 22 14:23:48 2012 +0100

--
 CHANGES.txt|2 +
 .../cassandra/db/RetriedSliceFromReadCommand.java  |2 +-
 .../apache/cassandra/db/SliceFromReadCommand.java  |   25 ++
 3 files changed, 21 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d359d8f6/CHANGES.txt
--
diff --cc CHANGES.txt
index 086eb0b,ae921d1..3f5a3f4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,9 -10,9 +10,10 @@@ Merged from 1.0
   * remove the wait on hint future during write (CASSANDRA-3870)
   * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
   * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
+  * Fix short read protection (CASSANDRA-3934)
  
  
 +
  1.1-beta1
   * add nodetool rebuild_index (CASSANDRA-3583)
   * add nodetool rangekeysample (CASSANDRA-2917)

[1/4] git commit: Merge branch 'cassandra-1.1' into trunk

2012-02-09 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.0 22b8a9725 - c3dc78941
  refs/heads/trunk 819a74d8a - 6feb729c8


Merge branch 'cassandra-1.1' into trunk


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

Branch: refs/heads/trunk
Commit: 6feb729c87d485d9295f1e75e1365b3933bb4efa
Parents: 819a74d a576408
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Feb 9 15:35:58 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Feb 9 15:35:58 2012 -0600

--
 CHANGES.txt|7 ---
 .../service/RangeSliceResponseResolver.java|   10 +++---
 .../org/apache/cassandra/service/StorageProxy.java |3 ++-
 3 files changed, 13 insertions(+), 7 deletions(-)
--