Updated Branches: refs/heads/master dd39a5b79 -> 3e2000341
DRILL-300: Move to "com.codahale.metrics" from "com.yammer.metrics" Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/3e200034 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/3e200034 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/3e200034 Branch: refs/heads/master Commit: 3e2000341614be1345d963ccc3bffecb2922205d Parents: dd39a5b Author: Aditya Kishore <[email protected]> Authored: Mon Nov 18 09:46:00 2013 -0800 Committer: Jacques Nadeau <[email protected]> Committed: Mon Nov 18 09:46:00 2013 -0800 ---------------------------------------------------------------------- exec/java-exec/pom.xml | 4 ++-- .../drill/exec/cache/VectorAccessibleSerializable.java | 4 ++-- .../org/apache/drill/exec/metrics/DrillMetrics.java | 8 ++++---- .../drill/exec/metrics/SingleThreadNestedCounter.java | 2 +- .../java/org/apache/drill/exec/ops/FragmentContext.java | 4 ++-- .../org/apache/drill/exec/server/BootStrapContext.java | 4 ++-- .../org/apache/drill/exec/server/DrillbitContext.java | 2 +- .../org/apache/drill/exec/store/AffinityCalculator.java | 4 ++-- .../drill/exec/store/parquet/ParquetGroupScan.java | 6 +++--- .../java/org/apache/drill/exec/work/FragmentRunner.java | 2 +- .../java/org/apache/drill/exec/client/DumpCatTest.java | 4 ++-- .../apache/drill/exec/fn/impl/TestRepeatedFunction.java | 4 ++-- .../exec/physical/impl/TestComparisonFunctions.java | 4 ++-- .../apache/drill/exec/physical/impl/TestOptiqPlans.java | 6 +++--- .../drill/exec/physical/impl/TestSimpleFunctions.java | 12 ++++++------ .../apache/drill/exec/physical/impl/agg/TestAgg.java | 4 ++-- .../exec/physical/impl/filter/TestSimpleFilter.java | 6 +++--- .../drill/exec/physical/impl/join/TestMergeJoin.java | 10 +++++----- .../drill/exec/physical/impl/limit/TestSimpleLimit.java | 8 ++++---- .../physical/impl/project/TestSimpleProjection.java | 4 ++-- .../drill/exec/physical/impl/sort/TestSimpleSort.java | 6 +++--- .../exec/physical/impl/svremover/TestSVRemover.java | 4 ++-- .../physical/impl/trace/TestTraceMultiRecordBatch.java | 4 ++-- .../exec/physical/impl/trace/TestTraceOutputDump.java | 4 ++-- .../drill/exec/physical/impl/union/TestSimpleUnion.java | 4 ++-- 25 files changed, 62 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/pom.xml ---------------------------------------------------------------------- diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index c5b169d..2ffdae9 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -107,9 +107,9 @@ </exclusions> </dependency> <dependency> - <groupId>com.yammer.metrics</groupId> + <groupId>com.codahale.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>3.0.0-BETA1</version> + <version>3.0.1</version> </dependency> <dependency> <groupId>javax.inject</groupId> http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java index 7b4bc23..656d07f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/VectorAccessibleSerializable.java @@ -19,8 +19,8 @@ package org.apache.drill.exec.cache; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.yammer.metrics.MetricRegistry; -import com.yammer.metrics.Timer; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Timer; import io.netty.buffer.ByteBuf; import org.apache.drill.common.util.DataInputInputStream; import org.apache.drill.common.util.DataOutputOutputStream; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java index 878c088..eef1181 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java @@ -17,9 +17,9 @@ */ package org.apache.drill.exec.metrics; -import com.yammer.metrics.JmxReporter; -import com.yammer.metrics.MetricRegistry; -import com.yammer.metrics.Slf4jReporter; +import com.codahale.metrics.JmxReporter; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Slf4jReporter; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.client.DrillClient; @@ -33,7 +33,7 @@ public class DrillMetrics { private DrillMetrics() {} private static class RegistryHolder { - public static final MetricRegistry REGISTRY = new MetricRegistry("Drill Metrics"); + public static final MetricRegistry REGISTRY = new MetricRegistry(); private static JmxReporter jmxReporter = getJmxReporter(); private static Slf4jReporter logReporter = getLogReporter(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/SingleThreadNestedCounter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/SingleThreadNestedCounter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/SingleThreadNestedCounter.java index f153867..01385cf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/SingleThreadNestedCounter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/metrics/SingleThreadNestedCounter.java @@ -19,7 +19,7 @@ package org.apache.drill.exec.metrics; import org.apache.drill.exec.server.DrillbitContext; -import com.yammer.metrics.Counter; +import com.codahale.metrics.Counter; /** * Wraps a parent counter so that local in-thread metrics can be collected while collecting for a global counter. Note http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java index a7f6d2e..674dafc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentContext.java @@ -36,8 +36,8 @@ import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.work.FragmentRunner; import org.apache.drill.exec.work.batch.IncomingBuffers; -import com.yammer.metrics.MetricRegistry; -import com.yammer.metrics.Timer; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Timer; /** * Contextual objects required for execution of a particular fragment. http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java index 12f42c2..225bd0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java @@ -26,7 +26,7 @@ import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.rpc.NamedThreadFactory; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class BootStrapContext implements Closeable{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(BootStrapContext.class); @@ -40,7 +40,7 @@ public class BootStrapContext implements Closeable{ super(); this.config = config; this.loop = new NioEventLoopGroup(config.getInt(ExecConstants.BIT_SERVER_RPC_THREADS), new NamedThreadFactory("BitServer-")); - this.metrics = new MetricRegistry(config.getString(ExecConstants.METRICS_CONTEXT_NAME)); + this.metrics = new MetricRegistry(); this.allocator = BufferAllocator.getAllocator(config); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java index 22ef072..080fd70 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitContext.java @@ -36,7 +36,7 @@ import org.apache.drill.exec.rpc.bit.BitCom; import org.apache.drill.exec.store.StorageEngine; import com.google.common.base.Preconditions; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; import org.apache.drill.exec.store.StorageEngineRegistry; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/store/AffinityCalculator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AffinityCalculator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AffinityCalculator.java index 2383463..7061c58 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AffinityCalculator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AffinityCalculator.java @@ -21,8 +21,8 @@ package org.apache.drill.exec.store; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableRangeMap; import com.google.common.collect.Range; -import com.yammer.metrics.*; -import com.yammer.metrics.Timer; +import com.codahale.metrics.*; +import com.codahale.metrics.Timer; import org.apache.drill.exec.metrics.DrillMetrics; import org.apache.drill.exec.store.parquet.ParquetGroupScan; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java index 10fcdff..1756d96 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java @@ -29,9 +29,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import com.yammer.metrics.Histogram; -import com.yammer.metrics.MetricRegistry; -import com.yammer.metrics.Timer; +import com.codahale.metrics.Histogram; +import com.codahale.metrics.MetricRegistry; +import com.codahale.metrics.Timer; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.FieldReference; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/main/java/org/apache/drill/exec/work/FragmentRunner.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/FragmentRunner.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/FragmentRunner.java index 5ab0a82..d003972 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/FragmentRunner.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/FragmentRunner.java @@ -25,7 +25,7 @@ import org.apache.drill.exec.proto.ExecProtos.FragmentStatus; import org.apache.drill.exec.proto.ExecProtos.FragmentStatus.FragmentState; import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection; -import com.yammer.metrics.Timer; +import com.codahale.metrics.Timer; /** * Responsible for running a single fragment on a single Drillbit. Listens/responds to status request and cancellation http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java index 7a9784b..a78ffc3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java @@ -52,7 +52,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; /** * The unit test case will read a physical plan in json format. The physical plan contains a "trace" operator, @@ -68,7 +68,7 @@ public class DumpCatTest { { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); bitContext.getConfig(); result = c; }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java index ac05319..3ec9492 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java @@ -44,7 +44,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestRepeatedFunction { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestRepeatedFunction.class); @@ -57,7 +57,7 @@ public class TestRepeatedFunction { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java index c47fa89..54bf0fd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java @@ -19,7 +19,7 @@ package org.apache.drill.exec.physical.impl; import com.google.common.base.Charsets; import com.google.common.io.Resources; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; import mockit.Injectable; import mockit.NonStrictExpectations; @@ -54,7 +54,7 @@ public class TestComparisonFunctions { @Injectable UserServer.UserClientConnection connection, String expression, int expectedResults) throws Throwable { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java index 7e7ac63..05d57be 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOptiqPlans.java @@ -61,7 +61,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; import com.google.common.io.Resources; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; @Ignore public class TestOptiqPlans { @@ -85,7 +85,7 @@ public class TestOptiqPlans { private SimpleRootExec doLogicalTest(final BootStrapContext context, UserClientConnection connection, String file, ClusterCoordinator coord, BitCom com, DistributedCache cache) throws Exception{ new NonStrictExpectations(){{ - context.getMetrics(); result = new MetricRegistry("test"); + context.getMetrics(); result = new MetricRegistry(); context.getAllocator(); result = BufferAllocator.getAllocator(c); context.getConfig(); result = c; }}; @@ -268,7 +268,7 @@ public class TestOptiqPlans { private SimpleRootExec doPhysicalTest(final DrillbitContext bitContext, UserClientConnection connection, String file) throws Exception{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); bitContext.getConfig(); result = c; }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java index cbb3e54..1776d8d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java @@ -45,7 +45,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestSimpleFunctions { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleFunctions.class); @@ -57,7 +57,7 @@ public class TestSimpleFunctions { @Injectable UserServer.UserClientConnection connection) throws Throwable { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -84,7 +84,7 @@ public class TestSimpleFunctions { @Injectable UserServer.UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -111,7 +111,7 @@ public class TestSimpleFunctions { @Injectable UserServer.UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -150,7 +150,7 @@ public class TestSimpleFunctions { @Injectable UserServer.UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -189,7 +189,7 @@ public class TestSimpleFunctions { @Injectable UserServer.UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java index 7ce69e2..b18ef71 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java @@ -44,7 +44,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestAgg { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestAgg.class); @@ -52,7 +52,7 @@ public class TestAgg { private SimpleRootExec doTest(final DrillbitContext bitContext, UserClientConnection connection, String file) throws Exception{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java index e81774a..14d68f3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java @@ -41,7 +41,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestSimpleFilter { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleFilter.class); @@ -54,7 +54,7 @@ public class TestSimpleFilter { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -78,7 +78,7 @@ public class TestSimpleFilter { @Test public void testSV4Filter(@Injectable final DrillbitContext bitContext, @Injectable UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java index ceebe55..09b7ebe 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoin.java @@ -48,7 +48,7 @@ import org.junit.Test; import com.beust.jcommander.internal.Lists; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestMergeJoin { @@ -61,7 +61,7 @@ public class TestMergeJoin { @Injectable UserServer.UserClientConnection connection) throws Throwable { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -109,7 +109,7 @@ public class TestMergeJoin { @Injectable UserServer.UserClientConnection connection) throws Throwable { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); bitContext.getConfig(); result = c; }}; @@ -161,7 +161,7 @@ public class TestMergeJoin { @Injectable UserServer.UserClientConnection connection) throws Throwable { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); bitContext.getConfig(); result = c; }}; @@ -213,7 +213,7 @@ public class TestMergeJoin { @Injectable UserServer.UserClientConnection connection) throws Throwable { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); bitContext.getConfig(); result = c; }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java index ef7638e..89d909d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java @@ -19,7 +19,7 @@ package org.apache.drill.exec.physical.impl.limit; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; import junit.framework.Assert; import mockit.Injectable; import mockit.NonStrictExpectations; @@ -48,7 +48,7 @@ public class TestSimpleLimit { @Test public void testLimit(@Injectable final DrillbitContext bitContext, @Injectable UserServer.UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -58,7 +58,7 @@ public class TestSimpleLimit { @Test public void testLimitNoEnd(@Injectable final DrillbitContext bitContext, @Injectable UserServer.UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -68,7 +68,7 @@ public class TestSimpleLimit { @Test public void testLimitAcrossBatches(@Injectable final DrillbitContext bitContext, @Injectable UserServer.UserClientConnection connection) throws Throwable{ new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java index 884887d..ca38d9c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java @@ -45,7 +45,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestSimpleProjection { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleProjection.class); @@ -57,7 +57,7 @@ public class TestSimpleProjection { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java index fd813b4..426aa3a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java @@ -44,7 +44,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestSimpleSort { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleSort.class); @@ -56,7 +56,7 @@ public class TestSimpleSort { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; @@ -103,7 +103,7 @@ public class TestSimpleSort { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java index 634182a..2da96d7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java @@ -43,7 +43,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; public class TestSVRemover { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSVRemover.class); @@ -56,7 +56,7 @@ public class TestSVRemover { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java index ea14b08..dd7d006 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java @@ -42,7 +42,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; /* * This test uses a physical plan with the mock scan that generates 100k records. @@ -62,7 +62,7 @@ public class TestTraceMultiRecordBatch { { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); bitContext.getConfig(); result = c; }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java index 4c04abc..f4e6180 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java @@ -50,7 +50,7 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; /* * This test uses a simple physical plan with a mock-scan that @@ -76,7 +76,7 @@ public class TestTraceOutputDump { { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); bitContext.getConfig(); result = c; }}; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3e200034/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java index 92c745f..f74c66f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/union/TestSimpleUnion.java @@ -19,7 +19,7 @@ package org.apache.drill.exec.physical.impl.union; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.yammer.metrics.MetricRegistry; +import com.codahale.metrics.MetricRegistry; import mockit.Injectable; import mockit.NonStrictExpectations; import org.apache.drill.common.config.DrillConfig; @@ -52,7 +52,7 @@ public class TestSimpleUnion { new NonStrictExpectations(){{ - bitContext.getMetrics(); result = new MetricRegistry("test"); + bitContext.getMetrics(); result = new MetricRegistry(); bitContext.getAllocator(); result = BufferAllocator.getAllocator(c); }};
