[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 2773f7cd8 - 9d7fba989 refs/heads/trunk 0bdd152fb - a812998e2 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/a812998e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a812998e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a812998e Branch: refs/heads/trunk Commit: a812998e2d5c3cea17de6938620ce2f146b1781c Parents: c44af8c 9d7fba9 Author: Brandon Williams brandonwilli...@apache.org Authored: Tue Oct 9 10:07:19 2012 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Tue Oct 9 10:07:19 2012 -0500 -- --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 db45670a3 - 789aab11e refs/heads/trunk 8fbbdf07a - cc2ced82b 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/cc2ced82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc2ced82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc2ced82 Branch: refs/heads/trunk Commit: cc2ced82b66157ab55bb6ceccbaddbcd0576c3c4 Parents: 8fbbdf0 789aab1 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Sep 24 10:43:44 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Sep 24 10:43:44 2012 -0500 -- CHANGES.txt|5 +++-- .../org/apache/cassandra/utils/ExpiringMap.java|3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc2ced82/CHANGES.txt -- diff --cc CHANGES.txt index 5f24e7f,56422ea..b2a397c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,79 -1,4 +1,77 @@@ +1.2-beta2 + * adjust blockFor calculation to account for pending ranges due to node + movement (CASSANDRA-833) + +1.2-beta1 + * add atomic_batch_mutate (CASSANDRA-4542, -4635) + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632) + * include message initiation time to replicas so they can more + accurately drop timed-out requests (CASSANDRA-2858) + * fix clientutil.jar dependencies (CASSANDRA-4566) + * optimize WriteResponse (CASSANDRA-4548) + * new metrics (CASSANDRA-4009) + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897) + * debug tracing (CASSANDRA-1123) + * parallelize row cache loading (CASSANDRA-4282) + * Make compaction, flush JBOD-aware (CASSANDRA-4292) + * run local range scans on the read stage (CASSANDRA-3687) + * clean up ioexceptions (CASSANDRA-2116) + * add disk_failure_policy (CASSANDRA-2118) + * Introduce new json format with row level deletion (CASSANDRA-4054) + * remove redundant name column from schema_keyspaces (CASSANDRA-4433) + * improve nodetool ring handling of multi-dc clusters (CASSANDRA-3047) + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimited by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885) + * Add column metadata to system column families (CASSANDRA-4018) + * (cql3) Always use composite types by default (CASSANDRA-4329) + * (cql3) Add support for set, map and list (CASSANDRA-3647) + * Validate date type correctly (CASSANDRA-4441) + * (cql3) Allow definitions with only a PK (CASSANDRA-4361) + * (cql3) Add support for row key composites (CASSANDRA-4179) + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038) + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680) + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477) + * remove schema agreement checking from all external APIs (Thrift, CQL and CQL3) (CASSANDRA-4487) + * add Murmur3Partitioner and make it default for new installations (CASSANDRA-3772, 4621) + * (cql3) update pseudo-map syntax to use map syntax (CASSANDRA-4497) + * Finer grained exceptions hierarchy and provides error code with exceptions (CASSANDRA-3979) + * Adds events push to binary protocol (CASSANDRA-4480) + * Rewrite nodetool help (CASSANDRA-2293) + * Make CQL3 the default for CQL (CASSANDRA-4640) + * update stress tool to be able to use
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 6a8ba0731 - aa7dafaca refs/heads/trunk 20d53c095 - 85fc72be8 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/85fc72be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85fc72be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85fc72be Branch: refs/heads/trunk Commit: 85fc72be8629827b2e92b6aaf2d35a2132f1ab27 Parents: 20d53c0 aa7dafa Author: Jonathan Ellis jbel...@apache.org Authored: Mon Sep 17 11:44:07 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Sep 17 11:44:07 2012 -0500 -- build.xml |4 .../apache/cassandra/thrift/ITransportFactory.java |2 -- 2 files changed, 4 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/85fc72be/build.xml --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 1e6cc9aeb - 5a63858d0 refs/heads/trunk 5bb13b426 - a946e61d1 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/a946e61d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a946e61d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a946e61d Branch: refs/heads/trunk Commit: a946e61d171e8033d4e193f50f82a7df0b951625 Parents: ae96aac 5a63858 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Sep 13 14:03:13 2012 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Sep 13 14:03:13 2012 -0500 -- bin/cqlsh| 23 +++ pylib/cqlshlib/pylexotron.py |4 2 files changed, 27 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a946e61d/bin/cqlsh --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 8b1336f00 - a343c85b7
refs/heads/trunk 1124615a6 - f70945eaa
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/f70945ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f70945ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f70945ea
Branch: refs/heads/trunk
Commit: f70945eaa6675ab9382b30eaa24406099a682a7a
Parents: d147175 a343c85
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Aug 17 10:11:21 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Aug 17 10:11:21 2012 -0500
--
.../cassandra/db/index/SecondaryIndexManager.java | 62 +--
1 files changed, 19 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f70945ea/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
--
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
index 1d62746,7258835..7c87941
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@@ -304,11 -279,13 +304,11 @@@ public class SecondaryIndexManage
/**
* Flush all indexes to disk
- * @throws ExecutionException
- * @throws InterruptedException
*/
-public void flushIndexesBlocking() throws IOException
+public void flushIndexesBlocking()
{
- for (Map.EntryByteBuffer, SecondaryIndex entry :
indexesByColumn.entrySet())
- entry.getValue().forceBlockingFlush();
+ for (SecondaryIndex index : indexesByColumn.values())
+ index.forceBlockingFlush();
}
/**
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 6f384c54d - f46232c0b
refs/heads/trunk d62f8c1e5 - b167e9ba7
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/b167e9ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b167e9ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b167e9ba
Branch: refs/heads/trunk
Commit: b167e9ba74fa917aeed55cfdcbff9133c13720d5
Parents: d62f8c1 f46232c
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jul 25 13:15:29 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jul 25 13:15:29 2012 -0500
--
CHANGES.txt|2 ++
.../apache/cassandra/service/StorageService.java |2 +-
.../cassandra/service/StorageServiceMBean.java |8 +---
src/java/org/apache/cassandra/tools/NodeCmd.java |2 +-
src/java/org/apache/cassandra/tools/NodeProbe.java |4 ++--
5 files changed, 11 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b167e9ba/CHANGES.txt
--
diff --cc CHANGES.txt
index c558c3f,c160d69..6dc6382
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,6 +1,41 @@@
+1.2-dev
+ * 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)
+
+
1.1.3
+ * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning
+multi-MB results as an attribute (CASSANDRA-4452)
* flush based on data size, not throughput; overwritten columns no
longer artificially inflate liveRatio (CASSANDRA-4399)
* update default commitlog segment size to 32MB and total commitlog
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b167e9ba/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index d8bed6f,bfc8c81..4af399d
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -3289,11 -3080,9 +3289,11 @@@ public class StorageService implements
/**
* #{@inheritDoc}
*/
- public ListString getRangeKeySample()
+ public ListString sampleKeyRange() // do not rename to getter - see
CASSANDRA-4452 for details
{
-ListDecoratedKey keys =
keySamples(ColumnFamilyStore.allUserDefined(), getLocalPrimaryRange());
+ListDecoratedKey keys = new ArrayListDecoratedKey();
+for (RangeToken range : getLocalPrimaryRanges())
+keys.addAll(keySamples(ColumnFamilyStore.allUserDefined(),
range));
ListString sampledKeys = new ArrayListString(keys.size());
for (DecoratedKey key : keys)
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 67dec69f5 - be969899c refs/heads/trunk 602e383d6 - 45b057bcf 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/45b057bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45b057bc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45b057bc Branch: refs/heads/trunk Commit: 45b057bcf816831732d62397d53450c7fefaf11f Parents: 9688a79 be96989 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Jul 3 12:01:20 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Jul 3 12:01:20 2012 -0500 -- CHANGES.txt|2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 28 +++ 2 files changed, 15 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/45b057bc/CHANGES.txt -- diff --cc CHANGES.txt index 4ce9884,7cd12a5..266fe35 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,6 +1,35 @@@ +1.2-dev + * 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) + * 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) + + 1.1.3 + * avoid using global partitioner to estimate ranges in index sstables +(CASSANDRA-4403) * restore pre-CASSANDRA-3862 approach to removing expired tombstones from row cache during compaction (CASSANDRA-4364) * (stress) support for CQL prepared statements (CASSANDRA-3633) http://git-wip-us.apache.org/repos/asf/cassandra/blob/45b057bc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.1 a4fab90af - f74ed12a7
refs/heads/trunk 8cd09 - 7398e9363
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/7398e936
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7398e936
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7398e936
Branch: refs/heads/trunk
Commit: 7398e9363ae99220d195d30eea3f3479485618f9
Parents: 8cd f74ed12
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Jun 15 12:27:40 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Jun 15 12:27:40 2012 -0500
--
CHANGES.txt|1 +
.../cassandra/db/compaction/LeveledManifest.java | 60 ++--
.../cassandra/db/compaction/CompactionsTest.java | 114 +++---
3 files changed, 103 insertions(+), 72 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7398e936/CHANGES.txt
--
diff --cc CHANGES.txt
index 2eb1b57,693b03b..7064eb0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,29 @@@
+1.2-dev
+ * update MS protocol with a version handshake + broadcast address id
+ (CASSANDRA-4311)
+ * multithreaded hint replay (CASSANDRA-4189)
+ * add inter-node message compression (CASSANDRA-3127)
+ * enforce 1m min keycache for auto (CASSANDRA-4306)
+ * 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)
+ * 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 unlimet by default (CASSANDRA-4277)
+ * Avoids double serialization of CF id in RowMutation messages
+ (CASSANDRA-4293)
+ * fix Summary component and caches to use correct partitioner
(CASSANDRA-4289)
+ * stream compressed sstables directly with java nio (CASSANDRA-4297)
+
+
1.1.2
+ * fix bug in sstable blacklisting with LCS (CASSANDRA-4343)
* LCS no longer promotes tiny sstables out of L0 (CASSANDRA-4341)
* skip tombstones during hint replay (CASSANDRA-4320)
* fix NPE in compactionstats (CASSANDRA-4318)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7398e936/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7398e936/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index 1476b4a,4f87c86..2b134d1
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@@ -85,69 -87,20 +85,69 @@@ public class CompactionsTest extends Sc
rm.apply();
inserted.add(key);
}
- store.forceBlockingFlush();
- assertMaxTimestamp(store, maxTimestampExpected);
- assertEquals(inserted.toString(), inserted.size(),
Util.getRangeSlice(store).size());
+ cfs.forceBlockingFlush();
+ assertMaxTimestamp(cfs, maxTimestampExpected);
+ assertEquals(inserted.toString(), inserted.size(),
Util.getRangeSlice(cfs).size());
}
- forceCompactions(store);
+ forceCompactions(cfs);
- assertEquals(inserted.size(), Util.getRangeSlice(store).size());
+ assertEquals(inserted.size(), Util.getRangeSlice(cfs).size());
// make sure max timestamp of compacted sstables is recorded properly
after compaction.
- assertMaxTimestamp(store, maxTimestampExpected);
- store.truncate();
+ assertMaxTimestamp(cfs, maxTimestampExpected);
+ cfs.truncate();
}
+/**
+ * Test to see if sstable has enough expired columns, it is compacted
itself.
+ */
+@Test
+public void testSingleSSTableCompaction() throws Exception
+{
+Table table = Table.open(TABLE1);
+ColumnFamilyStore store = table.getColumnFamilyStore(Standard1);
+store.clearUnsafe();
+store.metadata.gcGraceSeconds(1);
+
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 c37fe54f1 - 30e78d6dc refs/heads/trunk 6e8c23711 - 8104a70f0 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/8104a70f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8104a70f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8104a70f Branch: refs/heads/trunk Commit: 8104a70f0f289aca89e6eb723765f9171bea142d Parents: 6e8c237 30e78d6 Author: Jonathan Ellis jbel...@apache.org Authored: Wed May 23 16:33:49 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed May 23 16:33:49 2012 -0500 -- CHANGES.txt|2 ++ .../cassandra/db/commitlog/CommitLogAllocator.java |9 - 2 files changed, 10 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8104a70f/CHANGES.txt -- diff --cc CHANGES.txt index 987d455,c7e3207..95c5d0a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,6 +1,18 @@@ +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) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + + 1.1.1-dev + * preserve commitlog size cap when recycling segments at startup +(CASSANDRA-4201) * (Hadoop) fix split generation regression (CASSANDRA-4259) * ignore min/max compactions settings in LCS, while preserving behavior that min=max=0 disables autocompaction (CASSANDRA-4233) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8104a70f/src/java/org/apache/cassandra/db/commitlog/CommitLogAllocator.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 641346b0d - fd66ccf21 refs/heads/trunk 033486158 - 1bb2f32d8 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/1bb2f32d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bb2f32d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bb2f32d Branch: refs/heads/trunk Commit: 1bb2f32d8f25da023a167fb0cd3f31059f4266da Parents: 0334861 fd66ccf Author: Jonathan Ellis jbel...@apache.org Authored: Wed May 9 11:28:49 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed May 9 11:28:49 2012 -0500 -- CHANGES.txt|2 + .../org/apache/cassandra/config/CFMetaData.java|8 +- .../apache/cassandra/db/index/keys/KeysIndex.java | 19 +++ .../locator/AbstractReplicationStrategy.java |9 +++ .../apache/cassandra/locator/LocalStrategy.java|1 + .../apache/cassandra/locator/SimpleStrategy.java |3 ++ 6 files changed, 41 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/CHANGES.txt -- diff --cc CHANGES.txt index e693a40,f17ffd1..d6e62c8 --- 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 + * enable caching on index CFs based on data CF cache setting (CASSANDRA-4197) + * warn on invalid replication strategy creation options (CASSANDRA-4046) * remove [Freeable]Memory finalizers (CASSANDRA-4222) * include tombstone size in ColumnFamily.size, which can prevent OOM during sudden mass delete operations (CASSANDRA-3741) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/locator/LocalStrategy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bb2f32d/src/java/org/apache/cassandra/locator/SimpleStrategy.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 8b81c8f2f - 641346b0d refs/heads/trunk 70554b2a3 - 4357676f3 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/4357676f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4357676f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4357676f Branch: refs/heads/trunk Commit: 4357676f30b30291be9fb6f8d0de79cca767efbb Parents: 70554b2 641346b Author: Jonathan Ellis jbel...@apache.org Authored: Tue May 8 16:54:11 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue May 8 16:54:11 2012 -0500 -- CHANGES.txt|1 + src/java/org/apache/cassandra/cql3/Cql.g |7 + src/java/org/apache/cassandra/cql3/Relation.java | 13 +- src/java/org/apache/cassandra/cql3/Term.java | 70 --- .../cassandra/cql3/statements/SelectStatement.java | 157 +-- .../org/apache/cassandra/db/marshal/DateType.java |1 - src/java/org/apache/cassandra/tools/NodeCmd.java | 23 ++- 7 files changed, 174 insertions(+), 98 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4357676f/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4357676f/src/java/org/apache/cassandra/cql3/Relation.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4357676f/src/java/org/apache/cassandra/cql3/Term.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4357676f/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4357676f/src/java/org/apache/cassandra/db/marshal/DateType.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4357676f/src/java/org/apache/cassandra/tools/NodeCmd.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/trunk 4279ce466 - a0f5dc515
Merge branch 'cassandra-1.1' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a0f5dc51
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0f5dc51
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0f5dc51
Branch: refs/heads/trunk
Commit: a0f5dc5156b0d6fe393194cc99a263defcad1311
Parents: 4279ce4 6d38881
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Thu May 3 09:29:50 2012 +0200
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Thu May 3 09:29:50 2012 +0200
--
CHANGES.txt|6 +-
.../org/apache/cassandra/cql/SelectStatement.java |2 -
src/java/org/apache/cassandra/cql3/CFPropDefs.java |1 +
src/java/org/apache/cassandra/cql3/Cql.g | 44 ++--
.../cql3/statements/AlterTableStatement.java |7 +-
.../cassandra/cql3/statements/BatchStatement.java | 16 ++-
.../statements/CreateColumnFamilyStatement.java| 28 -
.../cassandra/cql3/statements/DeleteStatement.java | 13 ++-
.../cql3/statements/ModificationStatement.java |3 +
.../cassandra/cql3/statements/SelectStatement.java | 90 ++-
.../cassandra/cql3/statements/UpdateStatement.java | 17 ++-
.../org/apache/cassandra/db/marshal/DateType.java | 15 ++-
.../apache/cassandra/db/marshal/TimeUUIDType.java | 27 +
13 files changed, 176 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql/SelectStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
--
diff --cc
src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index b774475,9ee0f94..c034ad2
---
a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++
b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@@ -131,9 -135,10 +134,10 @@@ public class CreateColumnFamilyStatemen
private final ListColumnIdentifier keyAliases = new
ArrayListColumnIdentifier();
private final ListColumnIdentifier columnAliases = new
ArrayListColumnIdentifier();
+ private final MapColumnIdentifier, Boolean definedOrdering = new
HashMapColumnIdentifier, Boolean();
private boolean useCompactStorage;
-private MultisetColumnIdentifier definedNames =
HashMultiset.create(1);
+private final MultisetColumnIdentifier definedNames =
HashMultiset.create(1);
public RawStatement(CFName name)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/db/marshal/DateType.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f5dc51/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1.0 54729ad2c - 762b45597 refs/heads/trunk 92606cadb - a14f08b5f 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/a14f08b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a14f08b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a14f08b5 Branch: refs/heads/trunk Commit: a14f08b5fb5503b9353f7814096dfb496fa7384d Parents: 92606ca 3faff1a Author: Jonathan Ellis jbel...@apache.org Authored: Wed Apr 18 11:38:19 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Apr 18 11:38:19 2012 -0500 -- CHANGES.txt |2 ++ NEWS.txt|2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a14f08b5/CHANGES.txt --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 d685f45ee - 29376ff67 refs/heads/trunk 830495027 - abf0d991d 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/abf0d991 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abf0d991 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abf0d991 Branch: refs/heads/trunk Commit: abf0d991d86a3f34f429e2fd376fe93eaf54edfc Parents: 8304950 29376ff Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Mar 23 15:00:39 2012 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Mar 23 15:00:39 2012 -0500 -- .../cassandra/db/compaction/CompactionManager.java | 27 +++ .../db/compaction/CompactionManagerMBean.java | 10 + 2 files changed, 37 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abf0d991/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abf0d991/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 908e0e2d7 - ad4541e6b 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/ad4541e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad4541e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad4541e6 Branch: refs/heads/trunk Commit: ad4541e6bf3c178677be30a899e21fe63094a552 Parents: 908e0e2 86f5eaa Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Mar 22 13:50:37 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Mar 22 13:50:37 2012 +0100 -- CHANGES.txt|1 + .../org/apache/cassandra/config/CFMetaData.java| 163 +++-- .../apache/cassandra/config/ColumnDefinition.java | 13 +- .../org/apache/cassandra/config/KSMetaData.java| 43 +++- .../apache/cassandra/cql/AlterTableStatement.java | 64 +++--- .../cassandra/cql/CreateColumnFamilyStatement.java |9 +- .../cassandra/cql/CreateKeyspaceStatement.java | 20 -- .../org/apache/cassandra/cql/QueryProcessor.java | 38 ++-- .../cql3/statements/AlterTableStatement.java | 49 ++-- .../statements/CreateColumnFamilyStatement.java|7 +- .../cql3/statements/CreateIndexStatement.java | 21 +- .../cql3/statements/CreateKeyspaceStatement.java |6 +- .../cql3/statements/DropIndexStatement.java| 22 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../apache/cassandra/thrift/CassandraServer.java | 22 +- .../apache/cassandra/thrift/ThriftValidation.java | 178 --- test/unit/org/apache/cassandra/SchemaLoader.java |6 +- .../cassandra/thrift/ThriftValidationTest.java | 28 ++-- 18 files changed, 311 insertions(+), 381 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/config/CFMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/config/ColumnDefinition.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/config/KSMetaData.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/AlterTableStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql/QueryProcessor.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/cql3/statements/DropIndexStatement.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad4541e6/src/java/org/apache/cassandra/thrift/CassandraServer.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk 51a658d22 - 15ae2f630 Merge branch 'cassandra-1.1' into trunk Conflicts: src/java/org/apache/cassandra/db/migration/AddColumnFamily.java src/java/org/apache/cassandra/db/migration/AddKeyspace.java src/java/org/apache/cassandra/db/migration/DropColumnFamily.java src/java/org/apache/cassandra/db/migration/DropKeyspace.java src/java/org/apache/cassandra/db/migration/Migration.java src/java/org/apache/cassandra/db/migration/MigrationHelper.java src/java/org/apache/cassandra/db/migration/UpdateColumnFamily.java src/java/org/apache/cassandra/db/migration/UpdateKeyspace.java test/unit/org/apache/cassandra/io/sstable/SSTableTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15ae2f63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15ae2f63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15ae2f63 Branch: refs/heads/trunk Commit: 15ae2f6306406e8c68dbffe2987886c314665114 Parents: 51a658d fe98003 Author: Sylvain Lebresne sylv...@datastax.com Authored: Sun Mar 18 11:17:28 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Sun Mar 18 11:17:28 2012 +0100 -- CHANGES.txt|1 + .../org/apache/cassandra/config/CFMetaData.java| 25 +- .../apache/cassandra/config/ColumnDefinition.java |6 +- .../cassandra/config/DatabaseDescriptor.java |4 +- .../org/apache/cassandra/config/KSMetaData.java| 10 +- src/java/org/apache/cassandra/config/Schema.java | 22 +-- .../apache/cassandra/cql/DropIndexStatement.java |5 +- .../org/apache/cassandra/cql/QueryProcessor.java | 62 +--- .../cql3/statements/AlterTableStatement.java | 163 +- .../statements/CreateColumnFamilyStatement.java|7 +- .../cql3/statements/CreateIndexStatement.java | 82 ++--- .../cql3/statements/CreateKeyspaceStatement.java |7 +- .../cql3/statements/DropColumnFamilyStatement.java |7 +- .../cql3/statements/DropIndexStatement.java|7 +- .../cql3/statements/DropKeyspaceStatement.java |7 +- .../cql3/statements/SchemaAlteringStatement.java | 50 +--- src/java/org/apache/cassandra/db/DefsTable.java| 209 +++-- src/java/org/apache/cassandra/db/Directories.java |2 +- src/java/org/apache/cassandra/db/SystemTable.java |5 +- .../cassandra/db/migration/AddColumnFamily.java| 59 .../apache/cassandra/db/migration/AddKeyspace.java | 58 .../cassandra/db/migration/DropColumnFamily.java | 57 .../cassandra/db/migration/DropKeyspace.java | 53 --- .../apache/cassandra/db/migration/Migration.java | 127 .../cassandra/db/migration/MigrationHelper.java| 247 --- .../cassandra/db/migration/UpdateColumnFamily.java | 52 --- .../cassandra/db/migration/UpdateKeyspace.java | 58 .../apache/cassandra/service/MigrationManager.java | 119 +++- .../org/apache/cassandra/service/StorageProxy.java |3 +- .../apache/cassandra/thrift/CassandraServer.java | 47 +-- .../apache/cassandra/thrift/ThriftValidation.java |7 +- .../org/apache/cassandra/db/LongTableTest.java |4 +- .../apache/cassandra/db/MeteredFlusherTest.java|8 +- .../db/compaction/LongCompactionSpeedTest.java |4 +- .../cassandra/AbstractSerializationsTester.java|2 +- test/unit/org/apache/cassandra/CleanupHelper.java | 126 test/unit/org/apache/cassandra/EmbeddedServer.java |2 +- test/unit/org/apache/cassandra/SchemaLoader.java | 115 +++- test/unit/org/apache/cassandra/cli/CliTest.java|6 +- .../apache/cassandra/config/CFMetaDataTest.java|4 +- .../cassandra/config/DatabaseDescriptorTest.java | 12 +- .../unit/org/apache/cassandra/config/DefsTest.java | 94 ++ test/unit/org/apache/cassandra/db/CleanupTest.java |4 +- .../apache/cassandra/db/ColumnFamilyStoreTest.java |4 +- .../org/apache/cassandra/db/CommitLogTest.java |4 +- .../apache/cassandra/db/CounterMutationTest.java |4 +- .../unit/org/apache/cassandra/db/KeyCacheTest.java |4 +- .../org/apache/cassandra/db/KeyCollisionTest.java |4 +- .../org/apache/cassandra/db/MultitableTest.java|4 +- .../unit/org/apache/cassandra/db/NameSortTest.java |4 +- .../apache/cassandra/db/RecoveryManager2Test.java |4 +- .../apache/cassandra/db/RecoveryManager3Test.java |4 +- .../apache/cassandra/db/RecoveryManagerTest.java |4 +- .../cassandra/db/RecoveryManagerTruncateTest.java |4 +- .../cassandra/db/RemoveColumnFamilyTest.java |4 +- .../db/RemoveColumnFamilyWithFlush1Test.java |4 +- .../db/RemoveColumnFamilyWithFlush2Test.java |4 +-
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 555b73808 - 087644b6c refs/heads/trunk e36e68460 - 5ed172053 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/5ed17205 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ed17205 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ed17205 Branch: refs/heads/trunk Commit: 5ed172053b1d71dbd342f5979dec6f7432497d61 Parents: e36e684 087644b Author: Brandon Williams brandonwilli...@apache.org Authored: Fri Mar 16 15:27:28 2012 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri Mar 16 15:27:28 2012 -0500 -- .../cassandra/db/compaction/CompactionManager.java |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ed17205/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/trunk caba4ee62 - 29804fa9a 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/29804fa9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29804fa9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29804fa9 Branch: refs/heads/trunk Commit: 29804fa9a5e40047ae08f3fbb063650532d5ecab Parents: caba4ee 269ed63 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Mar 7 11:18:38 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Mar 7 11:18:38 2012 +0100 -- CHANGES.txt|1 + .../apache/cassandra/db/SliceFromReadCommand.java |2 +- .../org/apache/cassandra/cli/CliHelp.yaml | 29 +-- 3 files changed, 27 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29804fa9/src/java/org/apache/cassandra/db/SliceFromReadCommand.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 86d7c844c - f6ba989f9 refs/heads/trunk cc355ce6b - e0d9ade44 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/e0d9ade4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0d9ade4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0d9ade4 Branch: refs/heads/trunk Commit: e0d9ade447443abaa39f796c1d17b57f6dc79a9e Parents: cc355ce f6ba989 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Feb 28 10:35:14 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Feb 28 10:35:14 2012 -0600 -- --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 78142cb79 - 94860c6c3 refs/heads/trunk edd97d4e1 - 15269be39 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/15269be3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15269be3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15269be3 Branch: refs/heads/trunk Commit: 15269be394cc37c112c9242c9c6ae8945a03f97b Parents: edd97d4 94860c6 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Feb 16 09:26:54 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Feb 16 09:26:54 2012 -0600 -- CHANGES.txt|7 ++- .../db/compaction/CompactionController.java|8 .../org/apache/cassandra/dht/RangeStreamer.java|1 + .../io/sstable/SSTableSimpleWriterTest.java|3 ++- 4 files changed, 17 insertions(+), 2 deletions(-) --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 b0c0faeed - 33199c6ca refs/heads/trunk 875e05aa9 - edd97d4e1 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/edd97d4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edd97d4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edd97d4e Branch: refs/heads/trunk Commit: edd97d4e1b78376453cd04ab4062cf61a24d9c4f Parents: 875e05a 33199c6 Author: Jonathan Ellis jbel...@apache.org Authored: Wed Feb 15 17:34:20 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed Feb 15 17:34:20 2012 -0600 -- .rat-excludes |2 +- CHANGES.txt|2 +- build.xml |4 +- debian/changelog |6 +++ .../org/apache/cassandra/db/ColumnFamilyStore.java | 10 ++--- .../org/apache/cassandra/db/SnapshotCommand.java | 21 + src/java/org/apache/cassandra/db/SuperColumn.java |2 +- .../compaction/CompactionInterruptedException.java | 21 + .../apache/cassandra/db/filter/ExtendedFilter.java | 21 + .../org/apache/cassandra/thrift/RequestType.java | 35 --- .../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 21 + 11 files changed, 127 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edd97d4e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java --
[1/5] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches: refs/heads/cassandra-1.1 3eefbac13 - 5f5e00bc9 refs/heads/trunk ced22f76b - 30ee8337e 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/30ee8337 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/30ee8337 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/30ee8337 Branch: refs/heads/trunk Commit: 30ee8337e8f89ef3baf7d7606ca9aeda2431c99f Parents: ced22f7 5f5e00b Author: Jonathan Ellis jbel...@apache.org Authored: Fri Feb 10 17:42:47 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Feb 10 17:42:47 2012 -0600 -- CHANGES.txt|1 + src/java/org/apache/cassandra/cli/CliClient.java |6 -- .../dht/AbstractByteOrderedPartitioner.java|4 src/java/org/apache/cassandra/utils/Hex.java |3 ++- .../org/apache/cassandra/cli/CliHelp.yaml | 14 ++ test/unit/org/apache/cassandra/cli/CliTest.java|4 ++-- test/unit/org/apache/cassandra/utils/HexTest.java |8 7 files changed, 27 insertions(+), 13 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/30ee8337/src/resources/org/apache/cassandra/cli/CliHelp.yaml --
