Updated Branches: refs/heads/trunk 14da6bca0 -> 3205e5dbb
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/test/unit/org/apache/cassandra/db/RowIterationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java b/test/unit/org/apache/cassandra/db/RowIterationTest.java index 084be2d..c083b19 100644 --- a/test/unit/org/apache/cassandra/db/RowIterationTest.java +++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java @@ -85,7 +85,7 @@ public class RowIterationTest extends SchemaLoader rm.apply(); store.forceBlockingFlush(); - ColumnFamily cf = Util.getRangeSlice(store).get(0).cf; + ColumnFamily cf = Util.getRangeSlice(store).iterator().next().cf; assert cf.deletionInfo().equals(delInfo2); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/Session.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/Session.java b/tools/stress/src/org/apache/cassandra/stress/Session.java index 5897552..49449eb 100644 --- a/tools/stress/src/org/apache/cassandra/stress/Session.java +++ b/tools/stress/src/org/apache/cassandra/stress/Session.java @@ -17,24 +17,17 @@ */ package org.apache.cassandra.stress; -import java.io.BufferedReader; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintStream; -import java.io.Serializable; +import java.io.*; import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.cli.*; +import org.apache.commons.lang3.StringUtils; + +import com.yammer.metrics.Metrics; import org.apache.cassandra.cli.transport.FramedTransportFactory; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.EncryptionOptions; @@ -43,18 +36,14 @@ 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.metrics.CassandraMetricRegistry; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.thrift.*; import org.apache.cassandra.transport.SimpleClient; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.commons.cli.*; -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 { @@ -69,7 +58,7 @@ public class Session implements Serializable public final AtomicInteger operations = new AtomicInteger(); public final AtomicInteger keys = new AtomicInteger(); - public final com.codahale.metrics.Timer latency = CassandraMetricRegistry.get().timer(MetricRegistry.name(Session.class, "latency")); + public final com.yammer.metrics.core.Timer latency = Metrics.newTimer(Session.class, "latency"); private static final String SSL_TRUSTSTORE = "truststore"; private static final String SSL_TRUSTSTORE_PW = "truststore-password"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/StressAction.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressAction.java b/tools/stress/src/org/apache/cassandra/stress/StressAction.java index 4c7489a..46005a1 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.util.concurrent.Uninterruptibles; import com.google.common.util.concurrent.RateLimiter; -import com.codahale.metrics.Snapshot; +import com.yammer.metrics.stats.Snapshot; import org.apache.cassandra.stress.operations.*; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java b/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java index 3981180..2f7d72d 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressStatistics.java @@ -22,7 +22,8 @@ import java.io.PrintStream; import org.apache.commons.lang3.time.DurationFormatUtils; -import com.codahale.metrics.Snapshot; +import com.yammer.metrics.stats.Snapshot; + /** * Gathers and aggregates statistics for an operation http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java b/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java index 39c2586..ab6ae9d 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.stress.operations; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; @@ -71,7 +71,7 @@ public class CounterAdder extends Operation ? getSuperColumnsMutationMap(superColumns) : getColumnsMutationMap(columns)); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java b/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java index 2980df9..56ef243 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java @@ -17,21 +17,16 @@ */ package org.apache.cassandra.stress.operations; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.List; - -import com.codahale.metrics.Timer.Context; - -import org.apache.cassandra.db.ColumnFamilyType; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; -import org.apache.cassandra.thrift.Cassandra; -import org.apache.cassandra.thrift.ColumnOrSuperColumn; -import org.apache.cassandra.thrift.ColumnParent; -import org.apache.cassandra.thrift.SlicePredicate; -import org.apache.cassandra.thrift.SliceRange; +import org.apache.cassandra.db.ColumnFamilyType; +import org.apache.cassandra.thrift.*; + +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.List; public class CounterGetter extends Operation { @@ -73,7 +68,7 @@ public class CounterGetter extends Operation String superColumn = 'S' + Integer.toString(j); ColumnParent parent = new ColumnParent("SuperCounter1").setSuper_column(superColumn.getBytes()); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; @@ -118,7 +113,7 @@ public class CounterGetter extends Operation byte[] key = generateKey(); ByteBuffer keyBuffer = ByteBuffer.wrap(key); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java index 3569af5..31e8371 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterAdder.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.db.ColumnFamilyType; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; @@ -75,7 +75,7 @@ public class CqlCounterAdder extends CQLOperation String key = String.format("%0" + session.getTotalKeysLength() + "d", index); List<String> queryParams = Collections.singletonList(getUnQuotedCqlBlob(key, session.cqlVersion.startsWith("3"))); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterGetter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterGetter.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterGetter.java index 0a1dfdf..a4d037a 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterGetter.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlCounterGetter.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.db.ColumnFamilyType; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; @@ -73,7 +73,7 @@ public class CqlCounterGetter extends CQLOperation byte[] key = generateKey(); List<String> queryParams = Collections.singletonList(getUnQuotedCqlBlob(key, session.cqlVersion.startsWith("3"))); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java index 52fe73f..bf416cc 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.cql3.ResultSet; import org.apache.cassandra.db.ColumnFamilyType; import org.apache.cassandra.stress.Session; @@ -86,7 +86,7 @@ public class CqlIndexedRangeSlicer extends CQLOperation while (received < expectedPerValue) { - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java index 10d060e..3572c36 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlInserter.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.db.ColumnFamilyType; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; @@ -98,7 +98,7 @@ public class CqlInserter extends CQLOperation String key = String.format("%0" + session.getTotalKeysLength() + "d", index); queryParms.add(getUnQuotedCqlBlob(key, session.cqlVersion.startsWith("3"))); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java index d1329bf..c01767b 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.db.ColumnFamilyType; @@ -67,7 +67,7 @@ public class CqlRangeSlicer extends CQLOperation String key = String.format("%0" + session.getTotalKeysLength() + "d", index); List<String> queryParams = Collections.singletonList(getUnQuotedCqlBlob(key, session.cqlVersion.startsWith("3"))); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java index c53535c..70273c1 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java @@ -26,7 +26,7 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.db.ColumnFamilyType; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; @@ -88,7 +88,7 @@ public class CqlReader extends CQLOperation byte[] key = generateKey(); queryParams.add(getUnQuotedCqlBlob(key, session.cqlVersion.startsWith("3"))); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java b/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java index 44e915c..b7c72a2 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.stress.operations; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; @@ -67,7 +67,7 @@ public class IndexedRangeSlicer extends Operation session.getKeysPerCall()); List<KeySlice> results = null; - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java b/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java index 35c7471..cbf6b98 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.stress.operations; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; @@ -74,7 +74,7 @@ public class Inserter extends Operation : getColumnsMutationMap(columns); Map<ByteBuffer, Map<String, List<Mutation>>> record = Collections.singletonMap(ByteBufferUtil.bytes(rawKey), row); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java b/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java index b0657f0..12a39fb 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.stress.operations; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; @@ -56,7 +56,7 @@ public class MultiGetter extends Operation { ColumnParent parent = new ColumnParent("Super1").setSuper_column(ByteBufferUtil.bytes("S" + j)); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; @@ -99,7 +99,7 @@ public class MultiGetter extends Operation List<ByteBuffer> keys = generateKeys(offset, offset + session.getKeysPerCall()); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java b/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java index d1b52b4..f9ba115 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.stress.operations; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; @@ -62,7 +62,7 @@ public class RangeSlicer extends Operation String superColumnName = "S" + Integer.toString(i); ColumnParent parent = new ColumnParent("Super1").setSuper_column(ByteBufferUtil.bytes(superColumnName)); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; @@ -105,7 +105,7 @@ public class RangeSlicer extends Operation List<KeySlice> slices = new ArrayList<KeySlice>(); KeyRange range = new KeyRange(count).setStart_key(start).setEnd_key(ByteBufferUtil.EMPTY_BYTE_BUFFER); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3205e5db/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java b/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java index e15241f..f75502a 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java @@ -17,7 +17,7 @@ */ package org.apache.cassandra.stress.operations; -import com.codahale.metrics.Timer.Context; +import com.yammer.metrics.core.TimerContext; import org.apache.cassandra.stress.Session; import org.apache.cassandra.stress.util.CassandraClient; import org.apache.cassandra.stress.util.Operation; @@ -67,7 +67,7 @@ public class Reader extends Operation String superColumn = 'S' + Integer.toString(j); ColumnParent parent = new ColumnParent("Super1").setSuper_column(superColumn.getBytes(UTF_8)); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null; @@ -112,7 +112,7 @@ public class Reader extends Operation byte[] key = generateKey(); ByteBuffer keyBuffer = ByteBuffer.wrap(key); - Context context = session.latency.time(); + TimerContext context = session.latency.time(); boolean success = false; String exceptionMessage = null;
