Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/service/StorageService.java
tools/stress/src/org/apache/cassandra/stress/Session.java
tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5b5d41d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b5d41d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b5d41d4
Branch: refs/heads/trunk
Commit: 5b5d41d4b833630d24a8f180cce1ae6a72d7ebcf
Parents: 73e27b0 bffd9ea
Author: Aleksey Yeschenko <[email protected]>
Authored: Fri Aug 30 03:03:29 2013 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Fri Aug 30 03:03:29 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 4 +-
.../thrift/AuthenticationException.java | 25 +-
.../cassandra/thrift/AuthenticationRequest.java | 35 +-
.../thrift/AuthorizationException.java | 14 +-
.../org/apache/cassandra/thrift/CASResult.java | 24 +-
.../org/apache/cassandra/thrift/Cassandra.java | 4881 ++++++++++++++----
.../org/apache/cassandra/thrift/CfDef.java | 216 +-
.../org/apache/cassandra/thrift/CfSplit.java | 22 +-
.../org/apache/cassandra/thrift/Column.java | 26 +-
.../org/apache/cassandra/thrift/ColumnDef.java | 51 +-
.../cassandra/thrift/ColumnOrSuperColumn.java | 26 +-
.../apache/cassandra/thrift/ColumnParent.java | 18 +-
.../org/apache/cassandra/thrift/ColumnPath.java | 22 +-
.../apache/cassandra/thrift/Compression.java | 2 +-
.../cassandra/thrift/ConsistencyLevel.java | 2 +-
.../apache/cassandra/thrift/CounterColumn.java | 18 +-
.../cassandra/thrift/CounterSuperColumn.java | 24 +-
.../apache/cassandra/thrift/CqlMetadata.java | 70 +-
.../cassandra/thrift/CqlPreparedResult.java | 44 +-
.../org/apache/cassandra/thrift/CqlResult.java | 32 +-
.../apache/cassandra/thrift/CqlResultType.java | 2 +-
.../org/apache/cassandra/thrift/CqlRow.java | 24 +-
.../org/apache/cassandra/thrift/Deletion.java | 22 +-
.../cassandra/thrift/EndpointDetails.java | 22 +-
.../apache/cassandra/thrift/IndexClause.java | 28 +-
.../cassandra/thrift/IndexExpression.java | 22 +-
.../apache/cassandra/thrift/IndexOperator.java | 2 +-
.../org/apache/cassandra/thrift/IndexType.java | 2 +-
.../thrift/InvalidRequestException.java | 14 +-
.../org/apache/cassandra/thrift/KeyCount.java | 18 +-
.../org/apache/cassandra/thrift/KeyRange.java | 40 +-
.../org/apache/cassandra/thrift/KeySlice.java | 24 +-
.../org/apache/cassandra/thrift/KsDef.java | 61 +-
.../org/apache/cassandra/thrift/Mutation.java | 18 +-
.../cassandra/thrift/NotFoundException.java | 10 +-
.../thrift/SchemaDisagreementException.java | 10 +-
.../apache/cassandra/thrift/SlicePredicate.java | 29 +-
.../org/apache/cassandra/thrift/SliceRange.java | 26 +-
.../apache/cassandra/thrift/SuperColumn.java | 24 +-
.../cassandra/thrift/TimedOutException.java | 22 +-
.../org/apache/cassandra/thrift/TokenRange.java | 63 +-
.../org/apache/cassandra/thrift/TriggerDef.java | 39 +-
.../cassandra/thrift/UnavailableException.java | 21 +-
.../cassandra/thrift/cassandraConstants.java | 6 +-
lib/commons-lang-2.6.jar | Bin 284220 -> 0 bytes
lib/commons-lang3-3.1.jar | Bin 0 -> 315805 bytes
lib/libthrift-0.9.0.jar | Bin 347531 -> 0 bytes
lib/libthrift-0.9.1.jar | Bin 0 -> 217054 bytes
lib/licenses/commons-lang-3.1.txt | 202 +
lib/licenses/libthrift-0.9.1.txt | 202 +
lib/licenses/libthrift-0.9.txt | 202 -
lib/thrift-python-internal-only-0.7.0.zip | Bin 42854 -> 0 bytes
lib/thrift-python-internal-only-0.9.1.zip | Bin 0 -> 52477 bytes
src/java/org/apache/cassandra/auth/Auth.java | 2 +-
.../cassandra/auth/CassandraAuthorizer.java | 2 +-
.../org/apache/cassandra/auth/DataResource.java | 2 +-
.../cassandra/auth/PasswordAuthenticator.java | 2 +-
.../org/apache/cassandra/cli/CliClient.java | 2 +-
src/java/org/apache/cassandra/cli/CliUtils.java | 2 +-
.../org/apache/cassandra/config/CFMetaData.java | 10 +-
.../org/apache/cassandra/config/KSMetaData.java | 4 +-
.../org/apache/cassandra/cql/CFPropDefs.java | 2 +-
.../cql3/statements/CreateTableStatement.java | 2 +-
.../org/apache/cassandra/db/ColumnFamily.java | 2 +-
.../org/apache/cassandra/db/Directories.java | 2 +-
.../apache/cassandra/db/RangeSliceReply.java | 2 +-
.../org/apache/cassandra/db/RowMutation.java | 2 +-
.../org/apache/cassandra/db/SystemKeyspace.java | 2 +-
.../cassandra/db/commitlog/CommitLog.java | 2 +-
.../db/commitlog/CommitLogReplayer.java | 2 +-
.../cassandra/db/compaction/CompactionTask.java | 2 +-
.../cassandra/db/filter/NamesQueryFilter.java | 2 +-
.../cassandra/db/index/SecondaryIndex.java | 2 +-
.../db/index/SecondaryIndexManager.java | 2 +-
.../apache/cassandra/db/marshal/DateType.java | 2 +-
.../db/marshal/LocalByPartionerType.java | 3 +-
.../cassandra/db/marshal/TimestampType.java | 2 +-
.../apache/cassandra/db/marshal/TypeParser.java | 2 +-
.../apache/cassandra/db/marshal/UUIDType.java | 2 +-
.../dht/AbstractByteOrderedPartitioner.java | 2 +-
src/java/org/apache/cassandra/dht/Range.java | 2 +-
.../org/apache/cassandra/dht/RangeStreamer.java | 2 +-
.../apache/cassandra/gms/FailureDetector.java | 2 +-
.../apache/cassandra/gms/VersionedValue.java | 2 +-
.../hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../io/compress/CompressionParameters.java | 4 +-
.../apache/cassandra/locator/TokenMetadata.java | 2 +-
.../apache/cassandra/security/SSLFactory.java | 2 +-
.../apache/cassandra/service/ClientState.java | 2 +-
.../apache/cassandra/service/ReadCallback.java | 2 +-
.../apache/cassandra/service/StorageProxy.java | 2 +-
.../cassandra/service/StorageService.java | 4 +-
.../thrift/CustomTNonBlockingServer.java | 18 +-
.../org/apache/cassandra/utils/FBUtilities.java | 2 +-
.../apache/cassandra/utils/SemanticVersion.java | 2 +-
test/data/serialization/2.0/db.RowMutation.bin | Bin 3599 -> 3599 bytes
.../apache/cassandra/client/TestRingCache.java | 2 +-
.../cassandra/db/ColumnFamilyStoreTest.java | 6 +-
.../org/apache/cassandra/db/KeyspaceTest.java | 2 +-
.../org/apache/cassandra/dht/RangeTest.java | 2 +-
.../ReplicationStrategyEndpointCacheTest.java | 2 +-
.../org/apache/cassandra/stress/Session.java | 5 +-
.../cassandra/stress/StressStatistics.java | 6 +-
104 files changed, 4888 insertions(+), 1964 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 33e4f51,4d8ae14..2692f4a
--- a/build.xml
+++ b/build.xml
@@@ -354,11 -353,9 +354,11 @@@
<dependency groupId="com.googlecode.json-simple"
artifactId="json-simple" version="1.1"/>
<dependency groupId="com.github.stephenc.high-scale-lib"
artifactId="high-scale-lib" version="1.1.2"/>
<dependency groupId="com.github.stephenc" artifactId="jamm"
version="0.2.5"/>
- <dependency groupId="com.thinkaurelius.thrift"
artifactId="thrift-server" version="0.3.0"/>
+ <dependency groupId="com.thinkaurelius.thrift"
artifactId="thrift-server" version="0.3.0">
+ <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
+ </dependency>
<dependency groupId="org.yaml" artifactId="snakeyaml"
version="1.11"/>
- <dependency groupId="org.apache.thrift" artifactId="libthrift"
version="0.9.0"/>
+ <dependency groupId="org.apache.thrift" artifactId="libthrift"
version="0.9.1"/>
<dependency groupId="junit" artifactId="junit" version="4.6" />
<dependency groupId="commons-logging" artifactId="commons-logging"
version="1.1.1"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/db/commitlog/CommitLog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index a03ba47,6dbad93..b1f0a84
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -42,10 -40,12 +42,10 @@@ import com.google.common.util.concurren
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.Uninterruptibles;
--
- import org.apache.commons.lang.StringUtils;
+ import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Level;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.auth.Auth;
import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor;
import org.apache.cassandra.concurrent.Stage;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/test/unit/org/apache/cassandra/db/KeyspaceTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/tools/stress/src/org/apache/cassandra/stress/Session.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/Session.java
index d51ea20,f8642b2..5897552
--- a/tools/stress/src/org/apache/cassandra/stress/Session.java
+++ b/tools/stress/src/org/apache/cassandra/stress/Session.java
@@@ -28,34 -21,30 +28,33 @@@ import java.io.Serializable
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
- import com.codahale.metrics.MetricRegistry;
-
-import com.yammer.metrics.Metrics;
import org.apache.cassandra.cli.transport.FramedTransportFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.EncryptionOptions;
import org.apache.cassandra.config.EncryptionOptions.ClientEncryptionOptions;
+import org.apache.cassandra.db.ColumnFamilyType;
+import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.exceptions.SyntaxException;
-import org.apache.cassandra.db.marshal.*;
-import org.apache.commons.cli.*;
-
-import org.apache.cassandra.db.ColumnFamilyType;
+import org.apache.cassandra.metrics.CassandraMetricRegistry;
import org.apache.cassandra.stress.util.CassandraClient;
-import org.apache.cassandra.transport.SimpleClient;
import org.apache.cassandra.thrift.*;
-import org.apache.commons.lang3.StringUtils;
-
+import org.apache.cassandra.transport.SimpleClient;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.commons.cli.*;
- import org.apache.commons.lang.StringUtils;
++import org.apache.commons.lang3.StringUtils;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransport;
import org.apache.thrift.transport.TTransportFactory;
++import com.codahale.metrics.MetricRegistry;
public class Session implements Serializable
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b5d41d4/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
----------------------------------------------------------------------
diff --cc tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
index aa0dcca,e735f97..3981180
--- a/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
+++ b/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java
@@@ -18,12 -18,10 +18,12 @@@
package org.apache.cassandra.stress;
- import com.codahale.metrics.Snapshot;
-
-import com.yammer.metrics.stats.Snapshot;
import java.io.PrintStream;
+
- import org.apache.commons.lang.time.DurationFormatUtils;
+ import org.apache.commons.lang3.time.DurationFormatUtils;
+
++import com.codahale.metrics.Snapshot;
+
/**
* Gathers and aggregates statistics for an operation
*/
