Repository: cassandra Updated Branches: refs/heads/trunk bbb1592e8 -> 8896a70b0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/long/org/apache/cassandra/utils/LongBTreeTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/utils/LongBTreeTest.java b/test/long/org/apache/cassandra/utils/LongBTreeTest.java index eb75671..133c6c5 100644 --- a/test/long/org/apache/cassandra/utils/LongBTreeTest.java +++ b/test/long/org/apache/cassandra/utils/LongBTreeTest.java @@ -46,10 +46,10 @@ import com.google.common.util.concurrent.ListenableFutureTask; import org.junit.Assert; import org.junit.Test; -import com.yammer.metrics.Metrics; -import com.yammer.metrics.core.Timer; -import com.yammer.metrics.core.TimerContext; -import com.yammer.metrics.stats.Snapshot; + +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Snapshot; +import com.codahale.metrics.Timer; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.utils.btree.BTree; import org.apache.cassandra.utils.btree.BTreeSearchIterator; @@ -60,8 +60,9 @@ import org.apache.cassandra.utils.btree.UpdateFunction; public class LongBTreeTest { - private static final Timer BTREE_TIMER = Metrics.newTimer(BTree.class, "BTREE", TimeUnit.NANOSECONDS, TimeUnit.NANOSECONDS); - private static final Timer TREE_TIMER = Metrics.newTimer(BTree.class, "TREE", TimeUnit.NANOSECONDS, TimeUnit.NANOSECONDS); + private static final MetricRegistry metrics = new MetricRegistry(); + private static final Timer BTREE_TIMER = metrics.timer(MetricRegistry.name(BTree.class, "BTREE")); + private static final Timer TREE_TIMER = metrics.timer(MetricRegistry.name(BTree.class, "TREE")); private static final ExecutorService MODIFY = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new NamedThreadFactory("MODIFY")); private static final ExecutorService COMPARE = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), new NamedThreadFactory("COMPARE")); private static final RandomAbort<Integer> SPORADIC_ABORT = new RandomAbort<>(new Random(), 0.0001f); @@ -236,7 +237,7 @@ public class LongBTreeTest } mods -= c; } - TimerContext ctxt; + Timer.Context ctxt; ctxt = TREE_TIMER.time(); canon.putAll(buffer); ctxt.stop(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java index f09eb93..45ed56e 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java @@ -53,8 +53,8 @@ public class ColumnFamilyMetricTest store.truncateBlocking(); - assertEquals(0, store.metric.liveDiskSpaceUsed.count()); - assertEquals(0, store.metric.totalDiskSpaceUsed.count()); + assertEquals(0, store.metric.liveDiskSpaceUsed.getCount()); + assertEquals(0, store.metric.totalDiskSpaceUsed.getCount()); for (int j = 0; j < 10; j++) { @@ -72,14 +72,14 @@ public class ColumnFamilyMetricTest } // size metrics should show the sum of all SSTable sizes - assertEquals(size, store.metric.liveDiskSpaceUsed.count()); - assertEquals(size, store.metric.totalDiskSpaceUsed.count()); + assertEquals(size, store.metric.liveDiskSpaceUsed.getCount()); + assertEquals(size, store.metric.totalDiskSpaceUsed.getCount()); store.truncateBlocking(); // after truncate, size metrics should be down to 0 - assertEquals(0, store.metric.liveDiskSpaceUsed.count()); - assertEquals(0, store.metric.totalDiskSpaceUsed.count()); + assertEquals(0, store.metric.liveDiskSpaceUsed.getCount()); + assertEquals(0, store.metric.totalDiskSpaceUsed.getCount()); store.enableAutoCompaction(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index 7c086f7..5679ba5 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -81,6 +81,7 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.metrics.ClearableHistogram; import org.apache.cassandra.service.ActiveRepairService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.thrift.SlicePredicate; @@ -178,9 +179,9 @@ public class ColumnFamilyStoreTest rm.applyUnsafe(); cfs.forceBlockingFlush(); - cfs.getRecentSSTablesPerReadHistogram(); // resets counts + ((ClearableHistogram)cfs.metric.sstablesPerReadHistogram.cf).clear(); // resets counts cfs.getColumnFamily(Util.namesQueryFilter(cfs, Util.dk("key1"), "Column1")); - assertEquals(1, cfs.getRecentSSTablesPerReadHistogram()[0]); + assertEquals(1, cfs.metric.sstablesPerReadHistogram.cf.getCount()); } @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/db/KeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/KeyspaceTest.java b/test/unit/org/apache/cassandra/db/KeyspaceTest.java index 01038c4..4c97ea2 100644 --- a/test/unit/org/apache/cassandra/db/KeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/KeyspaceTest.java @@ -45,6 +45,7 @@ import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.SimpleStrategy; +import org.apache.cassandra.metrics.ClearableHistogram; import org.apache.cassandra.utils.WrappedRunnable; import static org.apache.cassandra.Util.column; import static org.apache.cassandra.Util.expiringColumn; @@ -481,18 +482,18 @@ public class KeyspaceTest rm.applyUnsafe(); cfStore.forceBlockingFlush(); } - cfStore.metric.sstablesPerReadHistogram.cf.clear(); + ((ClearableHistogram)cfStore.metric.sstablesPerReadHistogram.cf).clear(); ColumnFamily cf = cfStore.getColumnFamily(key, Composites.EMPTY, cellname("col1499"), false, 1000, System.currentTimeMillis()); - assertEquals(cfStore.metric.sstablesPerReadHistogram.cf.max(), 5, 0.1); + assertEquals(cfStore.metric.sstablesPerReadHistogram.cf.getSnapshot().getMax(), 5, 0.1); int i = 0; for (Cell c : cf.getSortedColumns()) { assertEquals(ByteBufferUtil.string(c.name().toByteBuffer()), "col" + (1000 + i++)); } assertEquals(i, 500); - cfStore.metric.sstablesPerReadHistogram.cf.clear(); + ((ClearableHistogram)cfStore.metric.sstablesPerReadHistogram.cf).clear(); cf = cfStore.getColumnFamily(key, cellname("col1500"), cellname("col2000"), false, 1000, System.currentTimeMillis()); - assertEquals(cfStore.metric.sstablesPerReadHistogram.cf.max(), 5, 0.1); + assertEquals(cfStore.metric.sstablesPerReadHistogram.cf.getSnapshot().getMax(), 5, 0.1); for (Cell c : cf.getSortedColumns()) { @@ -501,9 +502,9 @@ public class KeyspaceTest assertEquals(i, 1000); // reverse - cfStore.metric.sstablesPerReadHistogram.cf.clear(); + ((ClearableHistogram)cfStore.metric.sstablesPerReadHistogram.cf).clear(); cf = cfStore.getColumnFamily(key, cellname("col2000"), cellname("col1500"), true, 1000, System.currentTimeMillis()); - assertEquals(cfStore.metric.sstablesPerReadHistogram.cf.max(), 5, 0.1); + assertEquals(cfStore.metric.sstablesPerReadHistogram.cf.getSnapshot().getMax(), 5, 0.1); i = 500; for (Cell c : cf.getSortedColumns()) { @@ -550,13 +551,13 @@ public class KeyspaceTest } Composite start = type.builder().add(ByteBufferUtil.bytes("a5")).add(ByteBufferUtil.bytes(85)).build(); Composite finish = type.builder().add(ByteBufferUtil.bytes("a5")).build().end(); - cfs.metric.sstablesPerReadHistogram.cf.clear(); + ((ClearableHistogram)cfs.metric.sstablesPerReadHistogram.cf).clear(); ColumnFamily cf = cfs.getColumnFamily(key, start, finish, false, 1000, System.currentTimeMillis()); int colCount = 0; for (Cell c : cf) colCount++; assertEquals(2, colCount); - assertEquals(2, cfs.metric.sstablesPerReadHistogram.cf.max(), 0.1); + assertEquals(2, cfs.metric.sstablesPerReadHistogram.cf.getSnapshot().getMax(), 0.1); } private void validateSliceLarge(ColumnFamilyStore cfStore) throws IOException http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/db/RowCacheTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowCacheTest.java b/test/unit/org/apache/cassandra/db/RowCacheTest.java index 3d5617f..a4b7514 100644 --- a/test/unit/org/apache/cassandra/db/RowCacheTest.java +++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java @@ -185,8 +185,8 @@ public class RowCacheTest Keyspace keyspace = Keyspace.open(KEYSPACE_CACHED); String cf = "CachedIntCF"; ColumnFamilyStore cachedStore = keyspace.getColumnFamilyStore(cf); - long startRowCacheHits = cachedStore.metric.rowCacheHit.count(); - long startRowCacheOutOfRange = cachedStore.metric.rowCacheHitOutOfRange.count(); + long startRowCacheHits = cachedStore.metric.rowCacheHit.getCount(); + long startRowCacheOutOfRange = cachedStore.metric.rowCacheHitOutOfRange.getCount(); // empty the row cache CacheService.instance.invalidateRowCache(); @@ -206,31 +206,31 @@ public class RowCacheTest Composites.EMPTY, Composites.EMPTY, false, 10, System.currentTimeMillis())); - assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.count()); + assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.getCount()); // do another query, limit is 20, which is < 100 that we cache, we should get a hit and it should be in range cachedStore.getColumnFamily(QueryFilter.getSliceFilter(dk, cf, Composites.EMPTY, Composites.EMPTY, false, 20, System.currentTimeMillis())); - assertEquals(++startRowCacheHits, cachedStore.metric.rowCacheHit.count()); - assertEquals(startRowCacheOutOfRange, cachedStore.metric.rowCacheHitOutOfRange.count()); + assertEquals(++startRowCacheHits, cachedStore.metric.rowCacheHit.getCount()); + assertEquals(startRowCacheOutOfRange, cachedStore.metric.rowCacheHitOutOfRange.getCount()); // get a slice from 95 to 105, 95->99 are in cache, we should not get a hit and then row cache is out of range cachedStore.getColumnFamily(QueryFilter.getSliceFilter(dk, cf, CellNames.simpleDense(ByteBufferUtil.bytes(95)), CellNames.simpleDense(ByteBufferUtil.bytes(105)), false, 10, System.currentTimeMillis())); - assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.count()); - assertEquals(++startRowCacheOutOfRange, cachedStore.metric.rowCacheHitOutOfRange.count()); + assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.getCount()); + assertEquals(++startRowCacheOutOfRange, cachedStore.metric.rowCacheHitOutOfRange.getCount()); // get a slice with limit > 100, we should get a hit out of range. cachedStore.getColumnFamily(QueryFilter.getSliceFilter(dk, cf, Composites.EMPTY, Composites.EMPTY, false, 101, System.currentTimeMillis())); - assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.count()); - assertEquals(++startRowCacheOutOfRange, cachedStore.metric.rowCacheHitOutOfRange.count()); + assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.getCount()); + assertEquals(++startRowCacheOutOfRange, cachedStore.metric.rowCacheHitOutOfRange.getCount()); CacheService.instance.invalidateRowCache(); @@ -240,7 +240,7 @@ public class RowCacheTest Composites.EMPTY, Composites.EMPTY, false, 105, System.currentTimeMillis())); - assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.count()); + assertEquals(startRowCacheHits, cachedStore.metric.rowCacheHit.getCount()); // validate the stuff in cache; ColumnFamily cachedCf = (ColumnFamily)CacheService.instance.rowCache.get(rck); assertEquals(cachedCf.getColumnCount(), 100); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java index 018d643..60c5e69 100644 --- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java @@ -143,8 +143,8 @@ public class AntiCompactionTest long sum = 0; for (SSTableReader x : cfs.getSSTables()) sum += x.bytesOnDisk(); - assertEquals(sum, cfs.metric.liveDiskSpaceUsed.count()); - assertEquals(origSize, cfs.metric.liveDiskSpaceUsed.count(), 100000); + assertEquals(sum, cfs.metric.liveDiskSpaceUsed.getCount()); + assertEquals(origSize, cfs.metric.liveDiskSpaceUsed.getCount(), 100000); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index 25f906f..8aa402a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -200,7 +200,7 @@ public class SSTableReaderTest store.forceBlockingFlush(); clearAndLoad(store); - assert store.getMaxRowSize() != 0; + assert store.metric.maxRowSize.getValue() != 0; } private void clearAndLoad(ColumnFamilyStore cfs) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java index 97625f4..c823215 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java @@ -250,7 +250,7 @@ public class SSTableRewriterTest extends SchemaLoader SSTableReader s = writeFile(cfs, 1000); cfs.addSSTable(s); - long startStorageMetricsLoad = StorageMetrics.load.count(); + long startStorageMetricsLoad = StorageMetrics.load.getCount(); Set<SSTableReader> compacting = Sets.newHashSet(s); SSTableRewriter.overrideOpenInterval(10000000); SSTableRewriter rewriter = new SSTableRewriter(cfs, compacting, 1000, false); @@ -268,8 +268,8 @@ public class SSTableRewriterTest extends SchemaLoader rewriter.switchWriter(getWriter(cfs, s.descriptor.directory)); files++; assertEquals(cfs.getSSTables().size(), files); // we have one original file plus the ones we have switched out. - assertEquals(s.bytesOnDisk(), cfs.metric.liveDiskSpaceUsed.count()); - assertEquals(s.bytesOnDisk(), cfs.metric.totalDiskSpaceUsed.count()); + assertEquals(s.bytesOnDisk(), cfs.metric.liveDiskSpaceUsed.getCount()); + assertEquals(s.bytesOnDisk(), cfs.metric.totalDiskSpaceUsed.getCount()); } } @@ -279,13 +279,13 @@ public class SSTableRewriterTest extends SchemaLoader long sum = 0; for (SSTableReader x : cfs.getSSTables()) sum += x.bytesOnDisk(); - assertEquals(sum, cfs.metric.liveDiskSpaceUsed.count()); - assertEquals(startStorageMetricsLoad - s.bytesOnDisk() + sum, StorageMetrics.load.count()); + assertEquals(sum, cfs.metric.liveDiskSpaceUsed.getCount()); + assertEquals(startStorageMetricsLoad - s.bytesOnDisk() + sum, StorageMetrics.load.getCount()); assertEquals(files, sstables.size()); assertEquals(files, cfs.getSSTables().size()); Thread.sleep(1000); // tmplink and tmp files should be gone: - assertEquals(sum, cfs.metric.totalDiskSpaceUsed.count()); + assertEquals(sum, cfs.metric.totalDiskSpaceUsed.getCount()); assertFileCounts(s.descriptor.directory.list(), 0, 0); validateCFS(cfs); } @@ -340,7 +340,7 @@ public class SSTableRewriterTest extends SchemaLoader SSTableReader s = writeFile(cfs, 1000); cfs.addSSTable(s); - long startSize = cfs.metric.liveDiskSpaceUsed.count(); + long startSize = cfs.metric.liveDiskSpaceUsed.getCount(); DecoratedKey origFirst = s.first; DecoratedKey origLast = s.last; Set<SSTableReader> compacting = Sets.newHashSet(s); @@ -365,7 +365,7 @@ public class SSTableRewriterTest extends SchemaLoader } rewriter.abort(); Thread.sleep(1000); - assertEquals(startSize, cfs.metric.liveDiskSpaceUsed.count()); + assertEquals(startSize, cfs.metric.liveDiskSpaceUsed.getCount()); assertEquals(1, cfs.getSSTables().size()); assertFileCounts(s.descriptor.directory.list(), 0, 0); assertEquals(cfs.getSSTables().iterator().next().first, origFirst); http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java b/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java index 88104a6..a357d24 100644 --- a/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/CQLMetricsTest.java @@ -64,9 +64,9 @@ public class CQLMetricsTest extends SchemaLoader @Test public void testPreparedStatementsCount() { - assertEquals(0, (int) QueryProcessor.metrics.preparedStatementsCount.value()); + assertEquals(0, (int) QueryProcessor.metrics.preparedStatementsCount.getValue()); metricsStatement = session.prepare("INSERT INTO junit.metricstest (id, val) VALUES (?, ?)"); - assertEquals(1, (int) QueryProcessor.metrics.preparedStatementsCount.value()); + assertEquals(1, (int) QueryProcessor.metrics.preparedStatementsCount.getValue()); } @Test @@ -74,14 +74,14 @@ public class CQLMetricsTest extends SchemaLoader { clearMetrics(); - assertEquals(0, QueryProcessor.metrics.preparedStatementsExecuted.count()); - assertEquals(0, QueryProcessor.metrics.regularStatementsExecuted.count()); + assertEquals(0, QueryProcessor.metrics.preparedStatementsExecuted.getCount()); + assertEquals(0, QueryProcessor.metrics.regularStatementsExecuted.getCount()); for (int i = 0; i < 10; i++) session.execute(String.format("INSERT INTO junit.metricstest (id, val) VALUES (%d, '%s')", i, "val" + i)); - assertEquals(0, QueryProcessor.metrics.preparedStatementsExecuted.count()); - assertEquals(10, QueryProcessor.metrics.regularStatementsExecuted.count()); + assertEquals(0, QueryProcessor.metrics.preparedStatementsExecuted.getCount()); + assertEquals(10, QueryProcessor.metrics.regularStatementsExecuted.getCount()); } @Test @@ -89,14 +89,14 @@ public class CQLMetricsTest extends SchemaLoader { clearMetrics(); - assertEquals(0, QueryProcessor.metrics.preparedStatementsExecuted.count()); - assertEquals(0, QueryProcessor.metrics.regularStatementsExecuted.count()); + assertEquals(0, QueryProcessor.metrics.preparedStatementsExecuted.getCount()); + assertEquals(0, QueryProcessor.metrics.regularStatementsExecuted.getCount()); for (int i = 0; i < 10; i++) session.execute(metricsStatement.bind(i, "val" + i)); - assertEquals(10, QueryProcessor.metrics.preparedStatementsExecuted.count()); - assertEquals(0, QueryProcessor.metrics.regularStatementsExecuted.count()); + assertEquals(10, QueryProcessor.metrics.preparedStatementsExecuted.getCount()); + assertEquals(0, QueryProcessor.metrics.regularStatementsExecuted.getCount()); } @Test @@ -104,22 +104,22 @@ public class CQLMetricsTest extends SchemaLoader { clearMetrics(); - assertEquals(Double.NaN, QueryProcessor.metrics.preparedStatementsRatio.value()); + assertEquals(Double.NaN, QueryProcessor.metrics.preparedStatementsRatio.getValue()); for (int i = 0; i < 10; i++) session.execute(metricsStatement.bind(i, "val" + i)); - assertEquals(1.0, QueryProcessor.metrics.preparedStatementsRatio.value()); + assertEquals(1.0, QueryProcessor.metrics.preparedStatementsRatio.getValue()); for (int i = 0; i < 10; i++) session.execute(String.format("INSERT INTO junit.metricstest (id, val) VALUES (%d, '%s')", i, "val" + i)); - assertEquals(0.5, QueryProcessor.metrics.preparedStatementsRatio.value()); + assertEquals(0.5, QueryProcessor.metrics.preparedStatementsRatio.getValue()); } private void clearMetrics() { - QueryProcessor.metrics.preparedStatementsExecuted.clear(); - QueryProcessor.metrics.regularStatementsExecuted.clear(); - QueryProcessor.metrics.preparedStatementsEvicted.clear(); + QueryProcessor.metrics.preparedStatementsExecuted.dec(QueryProcessor.metrics.preparedStatementsExecuted.getCount()); + QueryProcessor.metrics.regularStatementsExecuted.dec(QueryProcessor.metrics.regularStatementsExecuted.getCount()); + QueryProcessor.metrics.preparedStatementsEvicted.dec(QueryProcessor.metrics.preparedStatementsEvicted.getCount()); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/8896a70b/test/unit/org/apache/cassandra/metrics/LatencyMetricsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/metrics/LatencyMetricsTest.java b/test/unit/org/apache/cassandra/metrics/LatencyMetricsTest.java index e5f0804..ae4b733 100644 --- a/test/unit/org/apache/cassandra/metrics/LatencyMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/LatencyMetricsTest.java @@ -43,7 +43,7 @@ public class LatencyMetricsTest for (int i = 0; i < 10000; i++) { - Double recent = l.getRecentLatency(); + Double recent = l.latency.getOneMinuteRate(); assertFalse(recent.equals(Double.POSITIVE_INFINITY)); } }