[1/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 91e63d054 - 7a0f496f2 refs/heads/trunk edb5f0883 - 70d8ad119 Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9eabb3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9eabb3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9eabb3f Branch: refs/heads/cassandra-2.1 Commit: d9eabb3f22ed1772df2aea335b58ba1fd78d5904 Parents: 254df46 44764c0 Author: Brandon Williams brandonwilli...@apache.org Authored: Thu Aug 14 16:39:44 2014 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Thu Aug 14 16:39:44 2014 -0500 -- --
[1/5] git commit: merge
Repository: cassandra Updated Branches: refs/heads/trunk 56141aee8 - d1e41c01e merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e682ffc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e682ffc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e682ffc4 Branch: refs/heads/trunk Commit: e682ffc4700ddd57a1a961c8d7fbbb3a87d89ff9 Parents: 24d8571 ddda541 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Aug 7 09:27:14 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Aug 7 09:27:14 2014 -0500 -- --
[1/5] git commit: Merge commit '4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c' into cassandra-2.1.0
Repository: cassandra Updated Branches: refs/heads/trunk 740bcb540 - f7fab28ec Merge commit '4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b112db6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b112db6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b112db6 Branch: refs/heads/trunk Commit: 7b112db6b208162c8509b25fcf9986ea2d0ec333 Parents: 9f1e957 4b6d6eb Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Aug 5 16:03:49 2014 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Aug 5 16:03:49 2014 +0200 -- --
[1/5] git commit: Merge branch 'cassandra-2.1' into trunk
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 da444a690 - 9405ce0e2 refs/heads/trunk 346d8fb6d - 9b1232929 Merge branch 'cassandra-2.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/4082e536 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4082e536 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4082e536 Branch: refs/heads/trunk Commit: 4082e5366ca4ac2efd183c53dfc7e976002a2df0 Parents: 2037a8d 6e03782 Author: Jonathan Ellis jbel...@apache.org Authored: Tue Mar 11 23:19:46 2014 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Mar 11 23:19:46 2014 -0500 -- CHANGES.txt | 1 + .../cassandra/service/FileCacheService.java | 3 + .../org/apache/cassandra/tools/NodeTool.java| 217 +-- 3 files changed, 106 insertions(+), 115 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4082e536/CHANGES.txt --
[1/5] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk ccbd1d528 - b5d07e582 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5d07e58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5d07e58 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5d07e58 Branch: refs/heads/trunk Commit: b5d07e582f19bc11b92f8461fad07631c39d0313 Parents: ccbd1d5 38aa459 Author: Aleksey Yeschenko alek...@apache.org Authored: Fri Dec 14 21:39:55 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Fri Dec 14 21:39:55 2012 +0300 -- CHANGES.txt|3 ++- .../io/compress/CompressionParameters.java |4 2 files changed, 6 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5d07e58/CHANGES.txt --
[1/5] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Updated Branches: refs/heads/cassandra-1.2 90ce4f78d - df580d426 Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df580d42 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df580d42 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df580d42 Branch: refs/heads/cassandra-1.2 Commit: df580d426662e9f9d6be9aae9155ce571ce7979a Parents: 90ce4f7 a399a56 Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Dec 11 08:54:37 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Dec 11 08:54:37 2012 +0100 -- CHANGES.txt|1 + .../cassandra/cql3/statements/SelectStatement.java |2 +- 2 files changed, 2 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df580d42/CHANGES.txt --
[1/5] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk be3a22906 - 43f7a776f Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43f7a776 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43f7a776 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43f7a776 Branch: refs/heads/trunk Commit: 43f7a776fc7ace2c61637c552c0cf7f08a40f02e Parents: be3a229 114651b Author: Sylvain Lebresne sylv...@datastax.com Authored: Thu Nov 29 10:20:39 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Thu Nov 29 10:20:39 2012 +0100 -- conf/cassandra.yaml|9 ++--- src/java/org/apache/cassandra/config/Config.java |3 ++- .../cassandra/config/DatabaseDescriptor.java |5 + .../transport/RequestThreadPoolExecutor.java | 13 +++-- .../org/apache/cassandra/transport/Server.java |2 ++ .../apache/cassandra/transport/SimpleClient.java |2 ++ src/java/org/apache/cassandra/utils/UUIDGen.java |9 - .../unit/org/apache/cassandra/utils/UUIDTests.java | 12 8 files changed, 40 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43f7a776/conf/cassandra.yaml -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43f7a776/src/java/org/apache/cassandra/config/Config.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/43f7a776/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
[1/5] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Updated Branches: refs/heads/cassandra-1.2 2f7fbbaae - 6e21cad71 Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e21cad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e21cad7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e21cad7 Branch: refs/heads/cassandra-1.2 Commit: 6e21cad7115d7df3ee28832ac489b0fc5c529813 Parents: 2f7fbba b44abad Author: Sylvain Lebresne sylv...@datastax.com Authored: Mon Nov 26 19:22:58 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Mon Nov 26 19:22:58 2012 +0100 -- CHANGES.txt|2 ++ .../statements/CreateColumnFamilyStatement.java|3 +++ .../cassandra/cql3/statements/SelectStatement.java |5 + 3 files changed, 10 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e21cad7/CHANGES.txt --
[1/5] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk c12d7cf44 - be89a954b Merge branch 'cassandra-1.2' into trunk Conflicts: src/java/org/apache/cassandra/db/CounterColumn.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89a954 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89a954 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be89a954 Branch: refs/heads/trunk Commit: be89a954b369802896599a8bd2003499b95f1112 Parents: c12d7cf d97a5ca Author: Sylvain Lebresne sylv...@datastax.com Authored: Fri Nov 23 10:44:18 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Fri Nov 23 10:44:18 2012 +0100 -- CHANGES.txt|2 + src/java/org/apache/cassandra/cql3/Cql.g |8 - .../cassandra/cql3/statements/SelectStatement.java | 24 ++- .../org/apache/cassandra/db/CounterColumn.java | 12 ++- 4 files changed, 42 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be89a954/CHANGES.txt --
[1/5] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk cedf6655c - f02ee5412 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f02ee541 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f02ee541 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f02ee541 Branch: refs/heads/trunk Commit: f02ee541248450090e02ec0da694f53c30be983d Parents: cedf665 791affd Author: Aleksey Yeschenko alek...@apache.org Authored: Mon Nov 19 21:49:38 2012 +0300 Committer: Aleksey Yeschenko alek...@apache.org Committed: Mon Nov 19 21:49:38 2012 +0300 -- CHANGES.txt|1 + doc/native_protocol.spec |4 + .../org/apache/cassandra/hadoop/ConfigHelper.java | 22 .../cassandra/hadoop/pig/CassandraStorage.java | 83 ++ 4 files changed, 86 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f02ee541/CHANGES.txt --
[1/5] git commit: merge from 1.1
Updated Branches: refs/heads/cassandra-1.2.0 8dd1d56b4 - bd0b9 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd0b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd0b Branch: refs/heads/cassandra-1.2.0 Commit: bd0b9ff745322e2e3030e4920ee4eef6a47d Parents: 8dd1d56 dd1633b Author: Pavel Yaskevich pyaskev...@twitter.com Authored: Fri Nov 16 15:05:34 2012 -0800 Committer: Pavel Yaskevich pyaskev...@twitter.com Committed: Fri Nov 16 15:05:34 2012 -0800 -- CHANGES.txt|3 ++ .../cassandra/db/DefinitionsUpdateVerbHandler.java |4 +- src/java/org/apache/cassandra/db/DefsTable.java| 26 +++--- src/java/org/apache/cassandra/db/RowMutation.java |3 ++ .../org/apache/cassandra/net/MessagingService.java |8 ++-- .../apache/cassandra/service/MigrationManager.java |9 +++-- .../org/apache/cassandra/cli/CliHelp.yaml |2 +- 7 files changed, 38 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd0b/CHANGES.txt -- diff --cc CHANGES.txt index c499919,2ed9666..b935425 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -18,64 -2,7 +18,67 @@@ Merged from 1.1 * reset getRangeSlice filter after finishing a row for get_paged_slice (CASSANDRA-4919) * expunge row cache post-truncate (CASSANDRA-4940) + * remove IAuthority2 (CASSANDRA-4875) ++ * Allow static CF definition with compact storage (CASSANDRA-4910) ++ * Fix endless loop/compaction of schema_* CFs due to broken timestamps (CASSANDRA-4880) + + +1.2-beta2 + * fp rate of 1.0 disables BF entirely; LCS defaults to 1.0 (CASSANDRA-4876) + * off-heap bloom filters for row keys (CASSANDRA_4865) + * add extension point for sstable components (CASSANDRA-4049) + * improve tracing output (CASSANDRA-4852, 4862) + * make TRACE verb droppable (CASSANDRA-4672) + * fix BulkLoader recognition of CQL3 columnfamilies (CASSANDRA-4755) + * Sort commitlog segments for replay by id instead of mtime (CASSANDRA-4793) + * Make hint delivery asynchronous (CASSANDRA-4761) + * Pluggable Thrift transport factories for CLI and cqlsh (CASSANDRA-4609, 4610) + * cassandra-cli: allow Double value type to be inserted to a column (CASSANDRA-4661) + * Add ability to use custom TServerFactory implementations (CASSANDRA-4608) + * optimize batchlog flushing to skip successful batches (CASSANDRA-4667) + * include metadata for system keyspace itself in schema tables (CASSANDRA-4416) + * add check to PropertyFileSnitch to verify presence of location for + local node (CASSANDRA-4728) + * add PBSPredictor consistency modeler (CASSANDRA-4261) + * remove vestiges of Thrift unframed mode (CASSANDRA-4729) + * optimize single-row PK lookups (CASSANDRA-4710) + * adjust blockFor calculation to account for pending ranges due to node + movement (CASSANDRA-833) + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649) + * (CQL3) Make prepared statement global instead of per connection + (CASSANDRA-4449) + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685) + * (CQL3) Fix validation when using counter and regular columns in the same + table (CASSANDRA-4706) + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648) + * Add support for batchlog in CQL3 (CASSANDRA-4545, 4738) + * Add support for multiple column family outputs in CFOF (CASSANDRA-4208) + * Support repairing only the local DC nodes (CASSANDRA-4747) + * Use rpc_address for binary protocol and change default port (CASSANRA-4751) + * Fix use of collections in prepared statements (CASSANDRA-4739) + * Store more information into peers table (CASSANDRA-4351, 4814) + * Configurable bucket size for size tiered compaction (CASSANDRA-4704) + * Run leveled compaction in parallel (CASSANDRA-4310) + * Fix potential NPE during CFS reload (CASSANDRA-4786) + * Composite indexes may miss results (CASSANDRA-4796) + * Move consistency level to the protocol level (CASSANDRA-4734, 4824) + * Fix Subcolumn slice ends not respected (CASSANDRA-4826) + * Fix Assertion error in cql3 select (CASSANDRA-4783) + * Fix list prepend logic (CQL3) (CASSANDRA-4835) + * Add booleans as literals in CQL3 (CASSANDRA-4776) + * Allow renaming PK columns in CQL3 (CASSANDRA-4822) + * Fix binary protocol NEW_NODE event (CASSANDRA-4679) + * Fix potential infinite loop in tombstone compaction (CASSANDRA-4781) + * Remove system tables accounting from schema (CASSANDRA-4850) + * Force provided columns in clustering key order in 'CLUSTERING ORDER BY' (CASSANDRA-4881) + * Fix composite
[1/5] git commit: Merge branch 'cassandra-1.2' into trunk
Updated Branches: refs/heads/trunk 46689d88d - 85cd442e7 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85cd442e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85cd442e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85cd442e Branch: refs/heads/trunk Commit: 85cd442e7e8e661d41942e10cc85a07e94b20f7d Parents: 46689d8 489355d Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Nov 13 08:58:19 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Nov 13 08:58:19 2012 +0100 -- CHANGES.txt|1 + .../apache/cassandra/db/CollationController.java | 33 +++ src/java/org/apache/cassandra/db/DataTracker.java | 31 ++ .../cassandra/db/CollationControllerTest.java | 20 + 4 files changed, 41 insertions(+), 44 deletions(-) --
[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 from 1.1
Updated Branches: refs/heads/cassandra-1.1 988ea81d4 - 93bd3d896 refs/heads/trunk 1078e6f51 - 5df3f13b6 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5df3f13b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5df3f13b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5df3f13b Branch: refs/heads/trunk Commit: 5df3f13b6ca993c9987c4e4b0319e01ff3895d54 Parents: 1078e6f 93bd3d8 Author: Jonathan Ellis jbel...@apache.org Authored: Thu Sep 27 09:30:28 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Sep 27 09:30:28 2012 -0500 -- CHANGES.txt|2 + .../org/apache/cassandra/db/ColumnSerializer.java |5 -- src/java/org/apache/cassandra/db/RowMutation.java | 46 +++ .../cassandra/locator/NetworkTopologyStrategy.java |3 +- 4 files changed, 50 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5df3f13b/CHANGES.txt -- diff --cc CHANGES.txt index 576f7a6,e48fbfd..f50f368 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,85 -1,5 +1,86 @@@ +1.2-beta2 + * optimize single-row PK lookups (CASSANDRA-4710) + * adjust blockFor calculation to account for pending ranges due to node + movement (CASSANDRA-833) + * Change CQL version to 3.0.0 and stop accepting 3.0.0-beta1 (CASSANDRA-4649) + * (CQL3) Make prepared statement global instead of per connection (CASSANDRA-4449) + * Fix scrubbing of CQL3 created tables (CASSANDRA-4685) + * (CQL3) Fix validation when using counter and regular columns in the same table + (CASSANDRA-4706) + * Fix bug starting Cassandra with simple authentication (CASSANDRA-4648 + * ) + +1.2-beta1 + * add atomic_batch_mutate (CASSANDRA-4542, -4635) + * increase default max_hint_window_in_ms to 3h (CASSANDRA-4632) + * include message initiation time to replicas so they can more + accurately drop timed-out requests (CASSANDRA-2858) + * fix clientutil.jar dependencies (CASSANDRA-4566) + * optimize WriteResponse (CASSANDRA-4548) + * new metrics (CASSANDRA-4009) + * redesign KEYS indexes to avoid read-before-write (CASSANDRA-2897) + * debug tracing (CASSANDRA-1123) + * parallelize row cache loading (CASSANDRA-4282) + * Make compaction, flush JBOD-aware (CASSANDRA-4292) + * run local range scans on the read stage (CASSANDRA-3687) + * clean up ioexceptions (CASSANDRA-2116) + * add disk_failure_policy (CASSANDRA-2118) + * Introduce new json format with row level deletion (CASSANDRA-4054) + * remove redundant name column from schema_keyspaces (CASSANDRA-4433) + * improve nodetool ring handling of multi-dc clusters (CASSANDRA-3047) + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392, 4289) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimited by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885) + * Add column metadata to system column families (CASSANDRA-4018) + * (cql3) Always use composite types by default (CASSANDRA-4329) + * (cql3) Add support for set, map and list (CASSANDRA-3647) + * Validate date type correctly (CASSANDRA-4441) + * (cql3) Allow definitions with only a PK (CASSANDRA-4361) + * (cql3) Add support for row key composites (CASSANDRA-4179) + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038) + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680) + * (cql3) fix defining more than one PK to be invalid
[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 from 1.1
Updated Branches: refs/heads/cassandra-1.1 efba67888 - 867478493 refs/heads/trunk 086c06ad7 - 76ada1106 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76ada110 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76ada110 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76ada110 Branch: refs/heads/trunk Commit: 76ada1106f6a8306c1f3abd3b334380d4e4818d3 Parents: ed8e353 Author: Jonathan Ellis jbel...@apache.org Authored: Mon Jul 2 13:32:00 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Jul 2 13:32:00 2012 -0500 -- .../org/apache/cassandra/db/ColumnFamilyStore.java |8 +--- .../apache/cassandra/service/StorageService.java |1 + 2 files changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/76ada110/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 6d46f9e..6496278 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -29,7 +29,10 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Pattern; import javax.management.*; -import com.google.common.collect.*; +import com.google.common.collect.AbstractIterator; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; import com.google.common.util.concurrent.Futures; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -47,8 +50,8 @@ import org.apache.cassandra.db.commitlog.ReplayPosition; import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; -import org.apache.cassandra.db.filter.ExtendedFilter; import org.apache.cassandra.db.compaction.OperationType; +import org.apache.cassandra.db.filter.ExtendedFilter; import org.apache.cassandra.db.filter.IFilter; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; @@ -56,7 +59,6 @@ import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndexManager; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.dht.*; -import org.apache.cassandra.dht.Range; import org.apache.cassandra.io.compress.CompressionParameters; import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.io.sstable.Descriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/76ada110/src/java/org/apache/cassandra/service/StorageService.java -- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 94506e0..fba8d44 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -34,6 +34,7 @@ import javax.management.ObjectName; import com.google.common.base.Supplier; import com.google.common.collect.*; +import org.apache.cassandra.dht.Range; import org.apache.cassandra.metrics.ClientRequestMetrics; import org.apache.log4j.Level; import org.apache.commons.lang.StringUtils;
[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 '4247-3' into trunk
Updated Branches: refs/heads/trunk ac362dadd - 5f1d7b06b Merge branch '4247-3' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5f1d7b06 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f1d7b06 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f1d7b06 Branch: refs/heads/trunk Commit: 5f1d7b06be208b1685dc839794491296e068d1d2 Parents: ac362da cbd6865 Author: Jonathan Ellis jbel...@apache.org Authored: Mon May 21 16:00:18 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon May 21 16:00:18 2012 -0500 -- CHANGES.txt|1 + NEWS.txt |3 + .../org/apache/cassandra/db/IndexScanCommand.java | 13 +- .../org/apache/cassandra/db/RangeSliceCommand.java | 142 --- src/java/org/apache/cassandra/db/TypeSizes.java| 12 ++ .../org/apache/cassandra/net/MessagingService.java |3 +- .../cassandra/service/AntiEntropyService.java | 12 -- .../apache/cassandra/streaming/PendingFile.java| 22 +-- .../apache/cassandra/streaming/StreamRequest.java | 38 ++--- .../org/apache/cassandra/utils/FBUtilities.java|4 +- .../org/apache/cassandra/utils/MerkleTree.java |2 +- .../serialization/1.2/db.RangeSliceCommand.bin | Bin 819 - 701 bytes test/data/serialization/1.2/db.Row.bin | Bin 495 - 495 bytes test/data/serialization/1.2/db.RowMutation.bin | Bin 3266 - 3266 bytes test/data/serialization/1.2/gms.EndpointState.bin | Bin 73 - 110 bytes .../serialization/1.2/service.TreeResponse.bin | Bin 930 - 930 bytes .../serialization/1.2/streaming.PendingFile.bin| Bin 3466 - 3466 bytes .../serialization/1.2/streaming.StreamHeader.bin | Bin 175486 - 175486 bytes .../1.2/streaming.StreamRequestMessage.bin | Bin 7127 - 7127 bytes test/data/serialization/1.2/utils.BloomFilter.bin | Bin 2500016 - 2500016 bytes 20 files changed, 168 insertions(+), 84 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f1d7b06/CHANGES.txt --
[1/5] git commit: merge from 1.1
Updated Branches: refs/heads/cassandra-1.1 38748b43d - d90f0f3e7 refs/heads/trunk 46b658f76 - 213974d84 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213974d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213974d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213974d8 Branch: refs/heads/trunk Commit: 213974d84d9a5a6abb3beb68e71d8e4f47bdc2ee Parents: 46b658f d90f0f3 Author: Jonathan Ellis jbel...@apache.org Authored: Fri May 18 11:39:17 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri May 18 11:39:17 2012 -0500 -- CHANGES.txt|2 + .../apache/cassandra/db/CollationController.java |2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java |2 +- .../db/compaction/LeveledCompactionStrategy.java | 20 +-- .../db/compaction/LeveledCompactionTask.java |5 +++ .../cassandra/db/compaction/LeveledManifest.java |2 +- .../apache/cassandra/service/StorageService.java |8 + 7 files changed, 24 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/CHANGES.txt -- diff --cc CHANGES.txt index 4d0951e,a375f36..9504d25 --- 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 + * ignore min/max compactions settings in LCS, while preserving +behavior that min=max=0 disables autocompaction (CASSANDRA-4233) * 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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/CollationController.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/service/StorageService.java -- diff --cc src/java/org/apache/cassandra/service/StorageService.java index eed37df,10f9351..dc91747 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -2426,9 -2434,8 +2423,8 @@@ public class StorageService implements } setMode(Mode.MOVING, fetching new ranges and streaming old ranges, true); - -if (logger_.isDebugEnabled()) -logger_.debug([Move-STREAMING] Work Map: + rangesToStreamByTable); +if (logger.isDebugEnabled()) +logger.debug([Move-STREAMING] Work Map: + rangesToStreamByTable); CountDownLatch streamLatch = streamRanges(rangesToStreamByTable);
[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 from 1.1
Updated Branches: refs/heads/cassandra-1.1 0f9c391a1 - 44e7a0890 refs/heads/trunk 090fe813a - c5f2b57ad Merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5f2b57a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5f2b57a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5f2b57a Branch: refs/heads/trunk Commit: c5f2b57ad50c6bcadb6ca1d1b8b5ff0f3f023074 Parents: 090fe81 44e7a08 Author: Brandon Williams brandonwilli...@apache.org Authored: Fri May 4 12:45:11 2012 -0500 Committer: Brandon Williams brandonwilli...@apache.org Committed: Fri May 4 12:45:11 2012 -0500 -- bin/cqlsh|2 +- src/java/org/apache/cassandra/cql3/Cql.g |1 + 2 files changed, 2 insertions(+), 1 deletions(-) --
[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.0' into cassandra-1.1
Updated Branches: refs/heads/cassandra-1.1 b69fd1aff - 7c50df3f6 Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7c50df3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c50df3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c50df3f Branch: refs/heads/cassandra-1.1 Commit: 7c50df3f61d84ec5ce842dee94457fe668676476 Parents: b69fd1a a4a83fc Author: Sylvain Lebresne sylv...@datastax.com Authored: Tue Apr 17 18:14:30 2012 +0200 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Tue Apr 17 18:14:30 2012 +0200 -- .../apache/cassandra/db/HintedHandOffManager.java |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
[1/5] git commit: merge from 1.1.0
Updated Branches: refs/heads/cassandra-1.1 f73383667 - be89c8b18 merge from 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89c8b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89c8b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be89c8b1 Branch: refs/heads/cassandra-1.1 Commit: be89c8b181c71be3ffea5e43732dc5ed27be91b9 Parents: f733836 25da034 Author: Pavel Yaskevich xe...@apache.org Authored: Fri Apr 6 23:36:03 2012 +0300 Committer: Pavel Yaskevich xe...@apache.org Committed: Fri Apr 6 23:36:03 2012 +0300 -- CHANGES.txt|2 ++ .../src/org/apache/cassandra/stress/Stress.java|2 +- .../org/apache/cassandra/stress/StressAction.java |6 +- 3 files changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be89c8b1/CHANGES.txt --
[1/5] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.1 b565fdbdc - 45af95ab3
refs/heads/trunk 9f0b09b00 - 1ba6dc1b0
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ba6dc1b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ba6dc1b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ba6dc1b
Branch: refs/heads/trunk
Commit: 1ba6dc1b0adf492df27a6b2127a888b2014def46
Parents: 9f0b09b 45af95a
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Mar 26 16:01:54 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Mar 26 16:01:54 2012 -0500
--
.../org/apache/cassandra/db/ColumnFamilyStore.java | 34 +-
src/java/org/apache/cassandra/db/DataTracker.java | 16 ++--
.../db/compaction/CompactionController.java| 51 +--
.../cassandra/utils/IntervalTree/IntervalTree.java | 23 ---
4 files changed, 54 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ba6dc1b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ba6dc1b/src/java/org/apache/cassandra/db/DataTracker.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ba6dc1b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java
index afb2879,1da6f9c..cb4e87a
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@@ -17,31 -19,33 +17,34 @@@
*/
package org.apache.cassandra.db.compaction;
--import java.util.*;
++import java.util.Collection;
++import java.util.Collections;
++import java.util.List;
++import java.util.Set;
-import com.google.common.collect.ImmutableSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
- import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.ColumnFamilyStore;
++import org.apache.cassandra.db.DataTracker;
+import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
--import org.apache.cassandra.service.CacheService;
+ import org.apache.cassandra.utils.IntervalTree.Interval;
+ import org.apache.cassandra.utils.IntervalTree.IntervalTree;
/**
* Manage compaction options.
*/
public class CompactionController
{
-private static Logger logger =
LoggerFactory.getLogger(CompactionController.class);
+private static final Logger logger =
LoggerFactory.getLogger(CompactionController.class);
private final ColumnFamilyStore cfs;
- private final SetSSTableReader sstables;
- private final boolean forceDeserialize;
-private final boolean deserializeRequired;
+ private final IntervalTreeSSTableReader overlappingTree;
public final int gcBefore;
-public boolean keyExistenceIsExpensive;
public final int mergeShardBefore;
public CompactionController(ColumnFamilyStore cfs,
CollectionSSTableReader sstables, int gcBefore, boolean forceDeserialize)
@@@ -55,7 -58,10 +57,8 @@@
// add 5 minutes to be sure we're on the safe side in terms of thread
safety (though we should be fine in our
// current 'stop all write during memtable switch' situation).
this.mergeShardBefore = (int) ((cfs.oldestUnflushedMemtable() + 5 *
3600) / 1000);
- this.forceDeserialize = forceDeserialize;
-deserializeRequired = forceDeserialize || !allLatestVersion(sstables);
+ SetSSTableReader overlappingSSTables =
cfs.getOverlappingSSTables(sstables);
+ overlappingTree = DataTracker.buildIntervalTree(overlappingSSTables);
-keyExistenceIsExpensive =
cfs.getCompactionStrategy().isKeyExistenceExpensive(ImmutableSet.copyOf(sstables));
}
public String getKeyspace()
@@@ -74,40 -80,42 +77,20 @@@
*/
public boolean shouldPurge(DecoratedKey key)
{
- return !cfs.isKeyInRemainingSSTables(key, sstables);
- }
-
- public boolean needDeserialize()
- {
- if (forceDeserialize)
- return true;
-
- for (SSTableReader sstable : sstables)
- if (!sstable.descriptor.isLatestVersion)
- return true;
-
- return false;
+ ListSSTableReader filteredSSTables = overlappingTree.search(new
[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.0' into cassandra-1.1.0
Updated Branches: refs/heads/cassandra-1.1.0 5f3175750 - d78db44cb Merge branch 'cassandra-1.0' into cassandra-1.1.0 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java src/java/org/apache/cassandra/db/DataTracker.java src/java/org/apache/cassandra/db/compaction/LeveledManifest.java src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d78db44c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d78db44c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d78db44c Branch: refs/heads/cassandra-1.1.0 Commit: d78db44cb6b77acaee3fe05711ad6e8a14bb4558 Parents: 5f31757 f239907 Author: Sylvain Lebresne sylv...@datastax.com Authored: Wed Mar 7 18:53:07 2012 +0100 Committer: Sylvain Lebresne sylv...@datastax.com Committed: Wed Mar 7 18:53:07 2012 +0100 -- CHANGES.txt|7 +++ src/java/org/apache/cassandra/db/ColumnFamily.java | 20 +++ .../org/apache/cassandra/db/ColumnFamilyStore.java | 16 -- src/java/org/apache/cassandra/db/DataTracker.java | 15 +++--- .../cassandra/db/compaction/CompactionManager.java |8 ++- .../cassandra/db/compaction/CompactionTask.java| 16 -- .../db/compaction/LeveledCompactionStrategy.java | 13 - .../cassandra/db/compaction/LeveledManifest.java | 41 ++- .../cassandra/db/compaction/OperationType.java |1 + .../org/apache/cassandra/io/util/FileUtils.java| 17 -- .../SSTableListChangedNotification.java| 11 +++- .../cassandra/db/compaction/CompactionsTest.java |3 +- 12 files changed, 112 insertions(+), 56 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d78db44c/CHANGES.txt -- diff --cc CHANGES.txt index a9e1c10,925a4a9..d7a595b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,4 +1,35 @@@ ++ HEAD +1.1-dev + * start hint replay as soon as FD notifies that the target is back up + (CASSANDRA-3958) + * avoid unproductive deserializing of cached rows during compaction + (CASSANDRA-3921) + * fix concurrency issues with CQL keyspace creation (CASSANDRA-3903) + * Show Effective Owership via Nodetool ring keyspace (CASSANDRA-3412) + * Update ORDER BY syntax for CQL3 (CASSANDRA-3925) + * Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop (CASSANDRA-3944) + * Fix bug with counters in super columns (CASSANDRA-3821) + * Remove deprecated merge_shard_chance (CASSANDRA-3940) + * add a convenient way to reset a node's schema (CASSANDRA-2963) + * fix for intermittent SchemaDisagreementException (CASSANDRA-3884) + * ignore deprecated KsDef/CfDef/ColumnDef fields in native schema (CASSANDRA-3963) + * CLI to report when unsupported column_metadata pair was given (CASSANDRA-3959) + * reincarnate removed and deprecated KsDef/CfDef attributes (CASSANDRA-3953) + * Fix race between writes and read for cache (CASSANDRA-3862) + * perform static initialization of StorageProxy on start-up (CASSANDRA-3797) + * support trickling fsync() on writes (CASSANDRA-3950) + * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671) + * avoid quadratic startup time in LeveledManifest (CASSANDRA-3952) +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) + * don't change manifest level for cleanup, scrub, and upgradesstables + operations under LeveledCompactionStrategy (CASSANDRA-3989) ++=== + 1.0.9 ++ cassandra-1.0 * always compact away deleted hints immediately after handoff (CASSANDRA-3955) * delete hints from dropped ColumnFamilies on handoff instead of erroring out (CASSANDRA-3975) @@@ -34,89 -7,11 +38,92 @@@ * Pig: Composite column support (CASSANDRA-384) * Avoid NPE during repair when a keyspace has no CFs (CASSANDRA-3988) * Fix division-by-zero error on get_slice (CASSANDRA-4000) + * don't change manifest level for cleanup, scrub, and upgradesstables +operations under LeveledCompactionStrategy (CASSANDRA-3989) + * fix race leading to super columns assertion failure (CASSANDRA-3957) +1.1-beta1 + * add nodetool rebuild_index (CASSANDRA-3583) + * add nodetool rangekeysample (CASSANDRA-2917) + * Fix streaming too much data during move operations (CASSANDRA-3639) + * Nodetool and CLI connect to localhost by default (CASSANDRA-3568) + * Reduce memory used by primary index sample (CASSANDRA-3743)
[1/5] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Updated Branches:
refs/heads/cassandra-1.1 1c56ec2da - 6e5722d7b
Merge branch 'cassandra-1.1.0' into cassandra-1.1
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e5722d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e5722d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e5722d7
Branch: refs/heads/cassandra-1.1
Commit: 6e5722d7bf6f1526131373ac671e26f9be683cf1
Parents: 1c56ec2 7d3416c
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Sun Mar 4 11:15:35 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Sun Mar 4 11:15:35 2012 +0100
--
CHANGES.txt|1 +
.../apache/cassandra/service/StorageService.java | 10 ++
2 files changed, 11 insertions(+), 0 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e5722d7/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e5722d7/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index b3c06c8,5fddf4a..7724df6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1873,7 -1871,9 +1873,9 @@@ public class StorageService implements
ListAntiEntropyService.RepairFuture futures = new
ArrayListAntiEntropyService.RepairFuture(ranges.size());
for (RangeToken range : ranges)
{
-AntiEntropyService.RepairFuture future = forceTableRepair(range,
tableName, columnFamilies);
+AntiEntropyService.RepairFuture future = forceTableRepair(range,
tableName, isSequential, columnFamilies);
+ if (future == null)
+ continue;
futures.add(future);
// wait for a session to be done with its differencing before
starting the next one
try
@@@ -1913,7 -1913,9 +1915,9 @@@
if (Table.SYSTEM_TABLE.equals(tableName))
return;
-AntiEntropyService.RepairFuture future =
forceTableRepair(getLocalPrimaryRange(), tableName, columnFamilies);
+AntiEntropyService.RepairFuture future =
forceTableRepair(getLocalPrimaryRange(), tableName, isSequential,
columnFamilies);
+ if (future == null)
+ return;
try
{
future.get();
@@@ -1933,7 -1935,13 +1937,13 @@@
names.add(cfStore.getColumnFamilyName());
}
+ if (names.isEmpty())
+ {
+ logger_.info(No column family to repair for keyspace +
tableName);
+ return null;
+ }
+
-return AntiEntropyService.instance.submitRepairSession(range,
tableName, names.toArray(new String[names.size()]));
+return AntiEntropyService.instance.submitRepairSession(range,
tableName, isSequential, names.toArray(new String[names.size()]));
}
public void forceTerminateAllRepairSessions() {
[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 from 1.0
Updated Branches: refs/heads/cassandra-1.1 9a842c7b3 - c5986871c merge from 1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5986871 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5986871 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5986871 Branch: refs/heads/cassandra-1.1 Commit: c5986871c007f8c552ff624d1fcf064ce6a45c92 Parents: 9a842c7 b55ab4f Author: Jonathan Ellis jbel...@apache.org Authored: Mon Feb 13 15:41:30 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Mon Feb 13 15:41:30 2012 -0600 -- CHANGES.txt|3 -- .../cassandra/hadoop/pig/CassandraStorage.java | 14 ++- .../cassandra/locator/NetworkTopologyStrategy.java |2 +- .../apache/cassandra/locator/TokenMetadata.java| 28 +++ .../apache/cassandra/service/StorageService.java |6 ++-- 5 files changed, 37 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5986871/CHANGES.txt -- diff --cc CHANGES.txt index e115a2a,0875da5..359e699 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,83 -1,3 +1,80 @@@ +1.1-dev + * add nodetool rebuild_index (CASSANDRA-3583) + * add nodetool rangekeysample (CASSANDRA-2917) + * Fix streaming too much data during move operations (CASSANDRA-3639) + * Nodetool and CLI connect to localhost by default (CASSANDRA-3568) + * Reduce memory used by primary index sample (CASSANDRA-3743) + * (Hadoop) separate input/output configurations (CASSANDRA-3197, 3765) + * avoid returning internal Cassandra classes over JMX (CASSANDRA-2805) + * add row-level isolation via SnapTree (CASSANDRA-2893) + * Optimize key count estimation when opening sstable on startup + (CASSANDRA-2988) + * multi-dc replication optimization supporting CL ONE (CASSANDRA-3577) + * add command to stop compactions (CASSANDRA-1740, 3566, 3582) + * multithreaded streaming (CASSANDRA-3494) + * removed in-tree redhat spec (CASSANDRA-3567) + * defragment rows for name-based queries under STCS, again (CASSANDRA-2503) + * Recycle commitlog segments for improved performance + (CASSANDRA-3411, 3543, 3557, 3615) + * update size-tiered compaction to prioritize small tiers (CASSANDRA-2407) + * add message expiration logic to OutboundTcpConnection (CASSANDRA-3005) + * off-heap cache to use sun.misc.Unsafe instead of JNA (CASSANDRA-3271) + * EACH_QUORUM is only supported for writes (CASSANDRA-3272) + * replace compactionlock use in schema migration by checking CFS.isValid + (CASSANDRA-3116) + * recognize that SELECT first ... * isn't really SELECT * (CASSANDRA-3445) + * Use faster bytes comparison (CASSANDRA-3434) + * Bulk loader is no longer a fat client, (HADOOP) bulk load output format + (CASSANDRA-3045) + * (Hadoop) add support for KeyRange.filter + * remove assumption that keys and token are in bijection + (CASSANDRA-1034, 3574, 3604) + * always remove endpoints from delevery queue in HH (CASSANDRA-3546) + * fix race between cf flush and its 2ndary indexes flush (CASSANDRA-3547) + * fix potential race in AES when a repair fails (CASSANDRA-3548) + * Remove columns shadowed by a deleted container even when we cannot purge + (CASSANDRA-3538) + * Improve memtable slice iteration performance (CASSANDRA-3545) + * more efficient allocation of small bloom filters (CASSANDRA-3618) + * Use separate writer thread in SSTableSimpleUnsortedWriter (CASSANDRA-3619) + * fsync the directory after new sstable or commitlog segment are created (CASSANDRA-3250) + * fix minor issues reported by FindBugs (CASSANDRA-3658) + * global key/row caches (CASSANDRA-3143, 3849) + * optimize memtable iteration during range scan (CASSANDRA-3638) + * introduce 'crc_check_chance' in CompressionParameters to support + a checksum percentage checking chance similarly to read-repair (CASSANDRA-3611) + * a way to deactivate global key/row cache on per-CF basis (CASSANDRA-3667) + * fix LeveledCompactionStrategy broken because of generation pre-allocation + in LeveledManifest (CASSANDRA-3691) + * finer-grained control over data directories (CASSANDRA-2749) + * Fix ClassCastException during hinted handoff (CASSANDRA-3694) + * Upgrade Thrift to 0.7 (CASSANDRA-3213) + * Make stress.java insert operation to use microseconds (CASSANDRA-3725) + * Allows (internally) doing a range query with a limit of columns instead of + rows (CASSANDRA-3742) + * Allow rangeSlice queries to be start/end inclusive/exclusive (CASSANDRA-3749) + * Fix BulkLoader to support new SSTable layout and add stream + throttling to prevent an NPE when there is no yaml config (CASSANDRA-3752) + * Allow concurrent schema
[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 --
[1/5] git commit: Merge branch 'cassandra-1.0' into cassandra-1.1
Updated Branches:
refs/heads/cassandra-1.1 cbac7af79 - e36b2130f
Merge branch 'cassandra-1.0' into cassandra-1.1
Conflicts:
NEWS.txt
src/java/org/apache/cassandra/config/DatabaseDescriptor.java
src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
src/java/org/apache/cassandra/service/MigrationManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e36b2130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e36b2130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e36b2130
Branch: refs/heads/cassandra-1.1
Commit: e36b2130ff2123fa1ebc3627d026407956611d84
Parents: cbac7af a35f878
Author: Sylvain Lebresne sylv...@riptano.com
Authored: Sun Feb 5 22:38:45 2012 +0100
Committer: Sylvain Lebresne sylv...@riptano.com
Committed: Sun Feb 5 22:38:45 2012 +0100
--
CHANGES.txt|1 +
NEWS.txt |8
conf/cassandra.yaml|7 +++
src/java/org/apache/cassandra/config/Config.java |2 ++
.../cassandra/config/DatabaseDescriptor.java |5 +
.../cassandra/net/OutboundTcpConnection.java |5 +
.../cassandra/net/OutboundTcpConnectionPool.java |2 +-
.../apache/cassandra/streaming/FileStreamTask.java |1 +
.../cassandra/streaming/IncomingStreamReader.java |1 +
9 files changed, 31 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36b2130/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36b2130/NEWS.txt
--
diff --cc NEWS.txt
index 8fca1cd,e36b9e8..fc401b8
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -8,69 -8,13 +8,77 @@@ upgrade, just in case you need to roll
(Cassandra version X + 1 will always be able to read data files created
by version X, but the inverse is not necessarily the case.)
+
+1.1
+===
+
+Upgrading
+-
+- The KsDef.replication_factor field (deprecated since 0.8) has
+ been removed. Older clients will need to be updated to be able
+ to continue to created and update keyspaces.
+- If you are running a multi datacenter setup, you should upgrade to
+ the latest 1.0.x (or 0.8.x) release before upgrading. Versions
+ 0.8.8 and 1.0.3-1.0.5 generate cross-dc forwarding that is incompatible
+ with 1.1.
+- EACH_QUORUM ConsistencyLevel is only supported for writes and will now
+ throw an InvalidRequestException when used for reads. (Previous
+ versions would silently perform a LOCAL_QUORUM read instead.)
+- ANY ConsistencyLevel is only supported for writes and will now
+ throw an InvalidRequestException when used for reads. (Previous
+ versions would silently perform a ONE read for range queries;
+ single-row and multiget reads already rejected ANY.)
+- The largest mutation batch accepted by the commitlog is now 128MB.
+ (In practice, batches larger than ~10MB always caused poor
+ performance due to load volatility and GC promotion failures.)
+ Larger batches will continue to be accepted but will not be
+ durable. Consider setting durable_writes=false if you really
+ want to use such large batches.
+- Make sure that global settings: key_cache_{size_in_mb, save_period}
+ and row_cache_{size_in_mb, save_period} in conf/cassandra.yaml are
+ used instead of per-ColumnFamily options.
+- JMX methods no longer return custom Cassandra objects. Any such methods
+ will now return standard Maps, Lists, etc.
+- Hadoop input and output details are now separated. If you were
+ previously using methods such as getRpcPort you now need to use
+ getInputRpcPort or getOutputRpcPort depending on the circumstance.
+- CQL changes:
+ + Prior to 1.1, you could use KEY as the primary key name in some
+select statements, even if the PK was actually given a different
+name. In 1.1+ you must use the defined PK name.
+
+
+Features
+
+- Cassandra 1.1 adds row-level isolation. Multi-column updates to
+ a single row have always been *atomic* (either all will be applied,
+ or none) thanks to the CommitLog, but until 1.1 they were not *isolated*
+ -- a reader may see mixed old and new values while the update happens.
+- Finer-grained control over data directories, allowing a ColumnFamily to
+ be pinned to specfic media.
+- Hadoop: a new BulkOutputFormat is included which will directly write
+ SSTables locally and then stream them into
[1/5] git commit: Merge branch 'cassandra-1.0' into trunk
Updated Branches: refs/heads/cassandra-1.0 68d4e28d9 - 2a1ec27e2 refs/heads/trunk a5b3abb66 - 73f7104cd Merge branch 'cassandra-1.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/73f7104c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/73f7104c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/73f7104c Branch: refs/heads/trunk Commit: 73f7104cd356485332298f0a2fdddf9aecfbbca6 Parents: a5b3abb 2a1ec27 Author: Jonathan Ellis jbel...@apache.org Authored: Fri Jan 27 09:29:35 2012 -0600 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Jan 27 09:29:35 2012 -0600 -- bin/cassandra-cli.bat |2 +- bin/cassandra.bat |2 +- bin/json2sstable.bat |8 bin/nodetool.bat |5 ++--- bin/sstable2json.bat |8 bin/sstablekeys.bat |8 6 files changed, 16 insertions(+), 17 deletions(-) --
[1/5] git commit: merge from 1.0
Updated Branches:
refs/heads/cassandra-1.0 89ed0b6ec - b10d5bd70
refs/heads/trunk 73f7104cd - aa20c7206
merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa20c720
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa20c720
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa20c720
Branch: refs/heads/trunk
Commit: aa20c7206cdc1efc1983466de05c224eccac1084
Parents: 73f7104 b10d5bd
Author: Jonathan Ellis jbel...@apache.org
Authored: Fri Jan 27 22:27:49 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Fri Jan 27 22:27:49 2012 -0600
--
CHANGES.txt|2 +-
build.xml | 25
.../apache/cassandra/locator/TokenMetadata.java| 41 +
.../apache/cassandra/service/StorageService.java | 14 +++--
src/java/org/apache/cassandra/utils/UUIDGen.java | 39 +++-
.../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 48 +++
6 files changed, 148 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa20c720/CHANGES.txt
--
diff --cc CHANGES.txt
index 8f62ab3,db24da4..df4b030
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -217,10 -154,9 +218,9 @@@ Merged from 0.8
1.0.2
* defragment rows for name-based queries under STCS (CASSANDRA-2503)
- * cleanup usage of StorageService.setMode() (CASANDRA-3388)
* Add timing information to cassandra-cli GET/SET/LIST queries
(CASSANDRA-3326)
* Only create one CompressionMetadata object per sstable (CASSANDRA-3427)
+ * cleanup usage of StorageService.setMode() (CASANDRA-3388)
- * synchronize BiMap of bootstrapping tokens (CASSANDRA-3417)
* Avoid large array allocation for compressed chunk offsets (CASSANDRA-3432)
* fix DecimalType bytebuffer marshalling (CASSANDRA-3421)
* fix bug that caused first column in per row indexes to be ignored
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa20c720/build.xml
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa20c720/src/java/org/apache/cassandra/locator/TokenMetadata.java
--
diff --cc src/java/org/apache/cassandra/locator/TokenMetadata.java
index 6d6f009,ebb094b..bf8e190
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@@ -108,10 -108,13 +108,13 @@@ public class TokenMetadat
public int pendingRangeChanges(InetAddress source)
{
int n = 0;
-Range sourceRange = getPrimaryRangeFor(getToken(source));
+RangeToken sourceRange = getPrimaryRangeFor(getToken(source));
- for (Token token : bootstrapTokens.keySet())
- if (sourceRange.contains(token))
- n++;
+ synchronized (bootstrapTokens)
+ {
+ for (Token token : bootstrapTokens.keySet())
+ if (sourceRange.contains(token))
+ n++;
+ }
return n;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa20c720/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 975b729,9f60e58..4cf17c2
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1295,14 -1252,17 +1295,16 @@@ public class StorageService implements
// For each of the bootstrapping nodes, simply add and remove them
one by one to
// allLeftMetadata and check in between what their ranges would be.
- for (Map.EntryToken, InetAddress entry : bootstrapTokens.entrySet())
+ synchronized (bootstrapTokens)
{
- InetAddress endpoint = entry.getValue();
+ for (Map.EntryToken, InetAddress entry :
bootstrapTokens.entrySet())
+ {
+ InetAddress endpoint = entry.getValue();
- allLeftMetadata.updateNormalToken(entry.getKey(), endpoint);
- for (RangeToken range :
strategy.getAddressRanges(allLeftMetadata).get(endpoint))
- pendingRanges.put(range, endpoint);
- allLeftMetadata.removeEndpoint(endpoint);
+ allLeftMetadata.updateNormalToken(entry.getKey(), endpoint);
-for (Range range :
strategy.getAddressRanges(allLeftMetadata).get(endpoint))
++for (RangeToken range :
strategy.getAddressRanges(allLeftMetadata).get(endpoint))
+
[1/5] git commit: merge from 1.0
Updated Branches:
refs/heads/trunk 980663a39 - a4fc7e270
merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4fc7e27
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4fc7e27
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4fc7e27
Branch: refs/heads/trunk
Commit: a4fc7e27045113ff680327558eef49f6d0c317d9
Parents: 980663a 185eca5
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jan 11 13:50:29 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jan 11 13:50:29 2012 -0600
--
CHANGES.txt|7 +++
NEWS.txt | 15 +
bin/cqlsh | 27 +
debian/changelog |6 ++
.../concurrent/DebuggableThreadPoolExecutor.java |2 +-
.../cassandra/concurrent/NamedThreadFactory.java |1 +
src/java/org/apache/cassandra/db/Memtable.java |8 +++-
.../cassandra/db/compaction/LeveledManifest.java | 20 +---
.../org/apache/cassandra/net/MessagingService.java | 10 +---
.../cassandra/service/AbstractCassandraDaemon.java | 13 +++--
.../apache/cassandra/service/StorageService.java |9 ++--
.../cassandra/thrift/CustomTThreadPoolServer.java | 43 +++
.../org/apache/cassandra/utils/ExpiringMap.java| 17 ++
.../org/apache/cassandra/service/RemoveTest.java |2 +-
14 files changed, 129 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4fc7e27/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4fc7e27/NEWS.txt
--
diff --cc NEWS.txt
index 036399b,2356faa..0f54918
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -8,65 -8,14 +8,73 @@@ upgrade, just in case you need to roll
(Cassandra version X + 1 will always be able to read data files created
by version X, but the inverse is not necessarily the case.)
+
+1.1
+===
+
+Upgrading
+-
+- If you are running a multi datacenter setup, you should upgrade to
+ the latest 1.0.x (or 0.8.x) release before upgrading. Versions
+ 0.8.8 and 1.0.3-1.0.5 generate cross-dc forwarding that is incompatible
+ with 1.1.
+- EACH_QUORUM ConsistencyLevel is only supported for writes and will now
+ throw an InvalidRequestException when used for reads. (Previous
+ versions would silently perform a LOCAL_QUORUM read instead.)
+- ANY ConsistencyLevel is only supported for writes and will now
+ throw an InvalidRequestException when used for reads. (Previous
+ versions would silently perform a ONE read for range queries;
+ single-row and multiget reads already rejected ANY.)
+- The largest mutation batch accepted by the commitlog is now 128MB.
+ (In practice, batches larger than ~10MB always caused poor
+ performance due to load volatility and GC promotion failures.)
+ Larger batches will continue to be accepted but will not be
+ durable. Consider setting durable_writes=false if you really
+ want to use such large batches.
+- Make sure that global settings: key_cache_{size_in_mb, save_period}
+ and row_cache_{size_in_mb, save_period} in conf/cassandra.yaml are
+ used instead of per-ColumnFamily options.
+- JMX methods no longer return custom Cassandra objects. Any such methods
+ will now return standard Maps, Lists, etc.
+- Hadoop input and output details are now separated. If you were
+ previously using methods such as getRpcPort you now need to use
+ getInputRpcPort or getOutputRpcPort depending on the circumstance.
+- CQL changes:
+ + Prior to 1.1, you could use KEY as the primary key name in some
+select statements, even if the PK was actually given a different
+name. In 1.1+ you must use the defined PK name.
+
+
+Features
+
+- Cassandra 1.1 adds row-level isolation. Multi-column updates to
+ a single row have always been *atomic* (either all will be applied,
+ or none) thanks to the CommitLog, but until 1.1 they were not *isolated*
+ -- a reader may see mixed old and new values while the update happens.
+- Finer-grained control over data directories, allowing a ColumnFamily to
+ be pinned to specfic media.
+- Hadoop: a new BulkOutputFormat is included which will directly write
+ SSTables locally and then stream them into the cluster.
+- The bulk loader is not longer a fat client; it can be run from an
+ existing machine in a cluster.
+- A new write
[1/5] git commit: merge from 1.0
Updated Branches:
refs/heads/trunk 95ca3a21f - 710609baf
merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/710609ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/710609ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/710609ba
Branch: refs/heads/trunk
Commit: 710609baf6c798476d990ac4046b9aea93df760d
Parents: 95ca3a2 621bc0c
Author: Pavel Yaskevich pove...@gmail.com
Authored: Sat Jan 7 17:38:03 2012 +0200
Committer: Pavel Yaskevich pove...@gmail.com
Committed: Sat Jan 7 17:38:03 2012 +0200
--
CHANGES.txt|2 +
src/java/org/apache/cassandra/cli/CliClient.java |4 +
.../cassandra/config/DatabaseDescriptor.java |5 +
.../org/apache/cassandra/cql/QueryProcessor.java |2 +-
src/java/org/apache/cassandra/cql/Relation.java| 23 +
src/java/org/apache/cassandra/cql/WhereClause.java | 76 ++---
.../apache/cassandra/db/HintedHandOffManager.java | 86 ++-
.../org/apache/cassandra/service/StorageProxy.java | 10 ++
.../cassandra/service/StorageProxyMBean.java |3 +
9 files changed, 120 insertions(+), 91 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/CHANGES.txt
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/cli/CliClient.java
--
diff --cc src/java/org/apache/cassandra/cli/CliClient.java
index ee6b609,60ed3ef..b09561b
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@@ -1637,9 -1659,11 +1637,12 @@@ public class CliClien
writeAttr(sb, false, min_compaction_threshold,
cfDef.min_compaction_threshold);
writeAttr(sb, false, max_compaction_threshold,
cfDef.max_compaction_threshold);
writeAttr(sb, false, replicate_on_write, cfDef.replicate_on_write);
-writeAttr(sb, false, row_cache_provider,
normaliseType(cfDef.row_cache_provider, org.apache.cassandra.cache));
writeAttr(sb, false, compaction_strategy,
cfDef.compaction_strategy);
+writeAttr(sb, false, caching, cfDef.caching);
+
+ if (cfDef.isSetBloom_filter_fp_chance())
+ writeAttr(sb, false, bloom_filter_fp_chance,
cfDef.bloom_filter_fp_chance);
+
if (!cfDef.compaction_strategy_options.isEmpty())
{
StringBuilder cOptions = new StringBuilder();
@@@ -1970,7 -1999,7 +1973,8 @@@
sessionState.out.printf( Compaction min/max thresholds:
%s/%s%n, cf_def.min_compaction_threshold, cf_def.max_compaction_threshold);
sessionState.out.printf( Read repair chance: %s%n,
cf_def.read_repair_chance);
sessionState.out.printf( Replicate on write: %s%n,
cf_def.replicate_on_write);
+sessionState.out.printf( Caching: %s%n, cf_def.caching);
+ sessionState.out.printf( Bloom Filter FP chance: %s%n,
cf_def.isSetBloom_filter_fp_chance() ? cf_def.bloom_filter_fp_chance :
default);
// if we have connection to the cfMBean established
if (cfMBean != null)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/cql/QueryProcessor.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/cql/WhereClause.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/710609ba/src/java/org/apache/cassandra/service/StorageProxy.java
--
