Updated Branches: refs/heads/cassandra-1.1 189e133a5 -> 150b3167f refs/heads/trunk 048741868 -> d94314a14
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/d94314a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d94314a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d94314a1 Branch: refs/heads/trunk Commit: d94314a1430792a964353b42853e4da0716f2453 Parents: 0487418 150b316 Author: Jonathan Ellis <[email protected]> Authored: Tue Apr 24 13:12:19 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Apr 24 13:12:19 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 18 +- NEWS.txt | 55 +- NOTICE.txt | 4 + build.xml | 2 +- debian/changelog | 6 + lib/licenses/snaptree-0.1-SNAPSHOT.txt | 776 --------------- lib/licenses/snaptree-0.1.txt | 776 +++++++++++++++ src/java/org/apache/cassandra/cli/CliClient.java | 219 ++++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 11 - .../cql3/statements/AlterTableStatement.java | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 7 +- .../cassandra/streaming/StreamInSession.java | 6 +- 12 files changed, 1058 insertions(+), 824 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d94314a1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7538980,47f95ce..a316a49 --- 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 + * avoid generating redundant compaction tasks during streaming + (CASSANDRA-4174) * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to StorageService mbean (CASSANDRA-556) * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d94314a1/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d94314a1/src/java/org/apache/cassandra/cli/CliClient.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cli/CliClient.java index e3c2bb3,8296253..f2ba4eb --- a/src/java/org/apache/cassandra/cli/CliClient.java +++ b/src/java/org/apache/cassandra/cli/CliClient.java @@@ -142,13 -149,14 +149,14 @@@ public class CliClien private final String NEWLINE = System.getProperty("line.separator"); private final String TAB = " "; - private Cassandra.Client thriftClient = null; - private CliSessionState sessionState = null; + private final Cassandra.Client thriftClient; + private final CliSessionState sessionState; private String keySpace = null; private String username = null; - private Map<String, KsDef> keyspacesMap = new HashMap<String, KsDef>(); - private Map<String, AbstractType<?>> cfKeysComparators; + private final Map<String, KsDef> keyspacesMap = new HashMap<String, KsDef>(); + private final Map<String, AbstractType<?>> cfKeysComparators; private ConsistencyLevel consistencyLevel = ConsistencyLevel.ONE; + private final CfAssumptions assumptions = new CfAssumptions(); private CliUserHelp help; public CliClient(CliSessionState cliSessionState, Cassandra.Client thriftClient) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/d94314a1/src/java/org/apache/cassandra/cql3/CFPropDefs.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d94314a1/src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d94314a1/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d94314a1/src/java/org/apache/cassandra/streaming/StreamInSession.java ----------------------------------------------------------------------
