[1/6] git commit: merge from 1.1
Updated Branches: refs/heads/cassandra-1.1 c9b249b2a - e400d0eca refs/heads/trunk 8495560c2 - db2c2999d 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/db2c2999 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db2c2999 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/db2c2999 Branch: refs/heads/trunk Commit: db2c2999d10989c26da198f241cb81921759bd1c Parents: 8495560 e400d0e Author: Jonathan Ellis jbel...@apache.org Authored: Thu Oct 18 15:19:30 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Thu Oct 18 15:19:30 2012 -0500 -- CHANGES.txt|3 +++ src/java/org/apache/cassandra/config/Config.java |4 ++-- .../org/apache/cassandra/db/ColumnFamilyStore.java |4 +++- .../io/compress/CompressedRandomAccessReader.java |7 +++ .../apache/cassandra/thrift/CassandraServer.java |1 - 5 files changed, 15 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/db2c2999/CHANGES.txt -- diff --cc CHANGES.txt index 922e808,49164b6..ee61379 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,108 -1,8 +1,111 @@@ +1.2-beta2 + * 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) + + +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
[1/6] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.0 5bcfcbc3e - 84a1d6059
refs/heads/cassandra-1.1 c716fc7fa - 485c87898
refs/heads/trunk 19a45370d - 3c90be1d6
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/3c90be1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c90be1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c90be1d
Branch: refs/heads/trunk
Commit: 3c90be1d63a1c29c3cc8d952a9ae22b982ee0550
Parents: 19a4537 485c878
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Jul 10 12:06:42 2012 -0500
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Jul 10 12:06:42 2012 -0500
--
.../cassandra/db/AbstractColumnContainer.java |3 +-
.../cassandra/db/compaction/CompactionsTest.java | 53 +--
2 files changed, 49 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c90be1d/src/java/org/apache/cassandra/db/AbstractColumnContainer.java
--
diff --cc src/java/org/apache/cassandra/db/AbstractColumnContainer.java
index 23bf6f8,aece78a..f58f6ab
--- a/src/java/org/apache/cassandra/db/AbstractColumnContainer.java
+++ b/src/java/org/apache/cassandra/db/AbstractColumnContainer.java
@@@ -197,11 -199,12 +197,12 @@@ public abstract class AbstractColumnCon
public boolean hasIrrelevantData(int gcBefore)
{
-if (getLocalDeletionTime() gcBefore)
+if (deletionInfo().purge(gcBefore) == DeletionInfo.LIVE)
return true;
-long deletedAt = getMarkedForDeleteAt();
++long deletedAt = deletionInfo().maxTimestamp();
for (IColumn column : columns)
- if (column.mostRecentLiveChangeAt()
deletionInfo().maxTimestamp() || column.hasIrrelevantData(gcBefore))
+ if (column.mostRecentLiveChangeAt() = deletedAt ||
column.hasIrrelevantData(gcBefore))
return true;
return false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c90be1d/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
--
diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
index 2b134d1,6339224..b1ae773
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
@@@ -18,30 -18,34 +18,34 @@@
*/
package org.apache.cassandra.db.compaction;
--import java.io.*;
++import java.io.ByteArrayOutputStream;
++import java.io.IOException;
++import java.io.PrintStream;
++import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
+import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
import org.junit.Test;
--import static junit.framework.Assert.assertEquals;
--import static junit.framework.Assert.assertNotNull;
- import static junit.framework.Assert.assertTrue;
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
- import org.apache.cassandra.db.compaction.OperationType;
-import org.apache.cassandra.db.columniterator.IColumnIterator;
+ import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
-import org.apache.cassandra.db.compaction.OperationType;
++import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.filter.QueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
--import org.apache.cassandra.io.sstable.*;
++import org.apache.cassandra.io.sstable.SSTableReader;
++import org.apache.cassandra.io.sstable.SSTableScanner;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
++import static junit.framework.Assert.*;
++
public class CompactionsTest extends SchemaLoader
{
public static final String TABLE1 = Keyspace1;
@@@ -191,6 -146,43 +195,43 @@@
assertMaxTimestamp(cfs, maxTimestampExpected);
}
+ @Test
+ public void testSuperColumnTombstones() throws IOException,
ExecutionException, InterruptedException
+ {
+ Table table = Table.open(TABLE1);
+ ColumnFamilyStore cfs = table.getColumnFamilyStore(Super1);
+ cfs.disableAutoCompaction();
+
+ DecoratedKey key = Util.dk(tskey);
+ ByteBuffer scName = ByteBufferUtil.bytes(TestSuperColumn);
+
+ // a subcolumn
+
[1/6] git commit: merge from 1.1
Updated Branches: refs/heads/cassandra-1.1 89e7a5742 - 39dd85501 refs/heads/trunk f211e507b - 9bf0386b6 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/9bf0386b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9bf0386b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9bf0386b Branch: refs/heads/trunk Commit: 9bf0386b6ba16f23cab001290f45dce387b87e83 Parents: 4a3fa3c 39dd855 Author: Jonathan Ellis jbel...@apache.org Authored: Sat May 19 17:34:29 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Sat May 19 17:34:29 2012 -0500 -- CHANGES.txt|1 + .../apache/cassandra/io/sstable/SSTableReader.java |4 ++-- .../cassandra/streaming/StreamInSession.java | 10 +- 3 files changed, 8 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf0386b/CHANGES.txt -- diff --cc CHANGES.txt index d851369,6a00d41..bb4bbe5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +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) + * Add support for range tombstones (CASSANDRA-3708) + + 1.1.1-dev + * (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) * log number of rows read from saved cache (CASSANDRA-4249) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf0386b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9bf0386b/src/java/org/apache/cassandra/streaming/StreamInSession.java --
[1/6] git commit: merge from 1.1
Updated Branches: refs/heads/cassandra-1.1 08848e795 - a2a28a408 refs/heads/trunk 4d7e70356 - 6f65c8ca8 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/6f65c8ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f65c8ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f65c8ca Branch: refs/heads/trunk Commit: 6f65c8ca80e46c96fca5f7a44852587a4018050c Parents: 4d7e703 a2a28a4 Author: Jonathan Ellis jbel...@apache.org Authored: Wed May 9 14:56:54 2012 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Wed May 9 14:56:54 2012 -0500 -- .../db/compaction/LeveledCompactionStrategy.java | 19 +- 1 files changed, 2 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f65c8ca/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java --
[1/6] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.1 ae3d197a8 - 39b501561
refs/heads/cassandra-1.1.0 85934a1e2 - a043998c9
refs/heads/trunk 7f182c362 - a91b258dc
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/a91b258d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a91b258d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a91b258d
Branch: refs/heads/trunk
Commit: a91b258dcb20316a650a8355be3949487c292a94
Parents: 7f182c3 39b5015
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Feb 27 13:44:44 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Feb 27 13:44:44 2012 -0600
--
CHANGES.txt|7 ++-
.../apache/cassandra/db/HintedHandOffManager.java | 12 +---
2 files changed, 7 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a91b258d/src/java/org/apache/cassandra/db/HintedHandOffManager.java
--
diff --cc src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 6ec3d79,8e6acb2..ec62f24
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@@ -266,11 -267,10 +266,10 @@@ public class HintedHandOffManager imple
if (hintStore.isEmpty())
return; // nothing to do, don't confuse users by logging a no-op
handoff
-logger_.debug(Checking remote({}) schema before delivering hints,
endpoint);
+logger.debug(Checking remote({}) schema before delivering hints,
endpoint);
- int waited;
try
{
- waited = waitForSchemaAgreement(endpoint);
+ waitForSchemaAgreement(endpoint);
}
catch (TimeoutException e)
{
[1/6] git commit: merge from 1.1
Updated Branches:
refs/heads/cassandra-1.1 25565b6bb - 449e03719
refs/heads/cassandra-1.1.0 930721d71 - aa7516847
refs/heads/trunk 1bd40539e - 1c507e5f9
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/1c507e5f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c507e5f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c507e5f
Branch: refs/heads/trunk
Commit: 1c507e5f94a2de1a9ad3671b0e8814bbcba71268
Parents: 1bd4053 449e037
Author: Jonathan Ellis jbel...@apache.org
Authored: Mon Feb 27 22:55:30 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Mon Feb 27 22:55:30 2012 -0600
--
.../apache/cassandra/service/StorageService.java |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c507e5f/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 3f3779e,9ae666c..9f81d71
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -158,7 -159,7 +158,7 @@@ public class StorageService implements
String newdelay = System.getProperty(cassandra.ring_delay_ms);
if (newdelay != null)
{
- logger.warn(Overriding RING_DELAY to {}ms, newdelay);
-logger_.info(Overriding RING_DELAY to {}ms, newdelay);
++logger.info(Overriding RING_DELAY to {}ms, newdelay);
return Integer.parseInt(newdelay);
}
else
