http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestSimpleTopN.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestSimpleTopN.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestSimpleTopN.java index eb290e9..430c505 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestSimpleTopN.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestSimpleTopN.java @@ -17,44 +17,26 @@ */ package org.apache.drill.exec.physical.impl.TopN; -import com.codahale.metrics.MetricRegistry; -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import mockit.Injectable; -import mockit.NonStrictExpectations; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.List; + import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; -import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.TopLevelAllocator; -import org.apache.drill.exec.ops.FragmentContext; -import org.apache.drill.exec.physical.PhysicalPlan; -import org.apache.drill.exec.physical.base.FragmentRoot; -import org.apache.drill.exec.physical.impl.ImplCreator; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; -import org.apache.drill.exec.physical.impl.SimpleRootExec; -import org.apache.drill.exec.planner.PhysicalPlanReader; import org.apache.drill.exec.pop.PopUnitTestBase; -import org.apache.drill.exec.proto.BitControl.PlanFragment; -import org.apache.drill.exec.proto.CoordinationProtos; -import org.apache.drill.exec.proto.UserProtos; import org.apache.drill.exec.record.RecordBatchLoader; import org.apache.drill.exec.rpc.user.QueryResultBatch; -import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection; import org.apache.drill.exec.server.Drillbit; -import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.vector.BigIntVector; -import org.apache.drill.exec.vector.IntVector; -import org.junit.AfterClass; import org.junit.Test; -import java.util.List; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestSimpleTopN extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleTopN.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java index 9047208..3786bfd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java @@ -29,28 +29,28 @@ public class TestHashAggr extends BaseTestQuery{ public void testQ6() throws Exception{ testPhysicalFromFile("agg/hashagg/q6.json"); } - + @Test public void testQ7_1() throws Exception{ testPhysicalFromFile("agg/hashagg/q7_1.json"); } - + @Test public void testQ7_2() throws Exception{ testPhysicalFromFile("agg/hashagg/q7_2.json"); } - + @Test public void testQ7_3() throws Exception{ testPhysicalFromFile("agg/hashagg/q7_3.json"); - } - + } + @Ignore // ignore temporarily since this shows memory leak in ParquetRecordReader (DRILL-443) @Test public void testQ8_1() throws Exception{ testPhysicalFromFile("agg/hashagg/q8_1.json"); } - + @Ignore // ignore temporarily since this shows memory leak in ParquetRecordReader (DRILL-443) @Test public void test8() throws Exception{ http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java index ed50685..1f0d89e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java @@ -29,8 +29,6 @@ import mockit.NonStrictExpectations; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.common.util.TestTools; -import org.apache.drill.exec.cache.DistributedCache; -import org.apache.drill.exec.cache.local.LocalCache; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.compile.CodeCompiler; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; @@ -52,8 +50,6 @@ import org.apache.drill.exec.rpc.user.UserServer; import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.RemoteServiceSet; -import org.apache.drill.exec.server.options.OptionManager; -import org.apache.drill.exec.server.options.SessionOptionManager; import org.apache.drill.exec.server.options.SystemOptionManager; import org.apache.drill.exec.store.sys.local.LocalPStoreProvider; import org.apache.drill.exec.vector.ValueVector; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 7b264c4..86584bb 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 @@ -31,20 +31,17 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.compile.CodeCompiler; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.TopLevelAllocator; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.PhysicalPlan; import org.apache.drill.exec.physical.base.FragmentRoot; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.ImplCreator; +import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.SimpleRootExec; import org.apache.drill.exec.planner.PhysicalPlanReader; import org.apache.drill.exec.pop.PopUnitTestBase; -import org.apache.drill.exec.proto.CoordinationProtos; -import org.apache.drill.exec.proto.ExecProtos; -import org.apache.drill.exec.proto.UserProtos; import org.apache.drill.exec.proto.BitControl.PlanFragment; +import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.rpc.user.UserServer; import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection; @@ -53,14 +50,13 @@ import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.store.StoragePluginRegistry; import org.apache.drill.exec.vector.ValueVector; -import org.junit.AfterClass; import org.junit.Ignore; import org.junit.Test; -import com.google.common.collect.Lists; +import com.codahale.metrics.MetricRegistry; import com.google.common.base.Charsets; +import com.google.common.collect.Lists; import com.google.common.io.Files; -import com.codahale.metrics.MetricRegistry; public class TestMergeJoin extends PopUnitTestBase { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java index bf402d1..a3a7ace 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java @@ -25,11 +25,9 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; -import org.apache.drill.exec.proto.UserProtos; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.RemoteServiceSet; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 87ee259..3ba6cb1 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 @@ -17,11 +17,8 @@ */ package org.apache.drill.exec.physical.impl.limit; -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import com.codahale.metrics.MetricRegistry; - -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import mockit.Injectable; import mockit.NonStrictExpectations; @@ -30,28 +27,25 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.compile.CodeCompiler; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.TopLevelAllocator; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.PhysicalPlan; import org.apache.drill.exec.physical.base.FragmentRoot; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.ImplCreator; +import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.SimpleRootExec; import org.apache.drill.exec.planner.PhysicalPlanReader; -import org.apache.drill.exec.proto.CoordinationProtos; -import org.apache.drill.exec.proto.ExecProtos; import org.apache.drill.exec.proto.BitControl.PlanFragment; -import org.apache.drill.exec.record.VectorWrapper; +import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.rpc.user.UserServer; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.vector.BigIntVector; -import org.apache.drill.exec.vector.ValueVector; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.codahale.metrics.MetricRegistry; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestSimpleLimit extends ExecTest { DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java index 3fb04aa..e8553ca 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java @@ -18,27 +18,25 @@ package org.apache.drill.exec.physical.impl.mergereceiver; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.List; -import com.google.common.collect.Lists; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; -import org.apache.drill.exec.proto.UserProtos; import org.apache.drill.exec.record.RecordBatchLoader; import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.RemoteServiceSet; -import org.junit.Ignore; import org.junit.Test; import com.google.common.base.Charsets; +import com.google.common.collect.Lists; import com.google.common.io.Files; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class TestMergingReceiver extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMergingReceiver.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java index c29d99e..8419860 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java @@ -29,7 +29,6 @@ import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; -import org.apache.drill.exec.proto.UserProtos; import org.apache.drill.exec.record.RecordBatchLoader; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.server.BootStrapContext; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 514e913..28d2897 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 @@ -29,30 +29,25 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.compile.CodeCompiler; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.TopLevelAllocator; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.PhysicalPlan; import org.apache.drill.exec.physical.base.FragmentRoot; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.ImplCreator; +import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.SimpleRootExec; import org.apache.drill.exec.planner.PhysicalPlanReader; -import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.proto.BitControl.PlanFragment; -import org.apache.drill.exec.proto.ExecProtos.FragmentHandle; +import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.util.VectorUtil; -import org.apache.drill.exec.vector.BigIntVector; import org.apache.drill.exec.vector.NullableBigIntVector; -import org.junit.After; -import org.junit.AfterClass; import org.junit.Test; +import com.codahale.metrics.MetricRegistry; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.codahale.metrics.MetricRegistry; public class TestSimpleProjection extends ExecTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleProjection.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 4f8ba7e..d27ad79 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 @@ -28,28 +28,25 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.compile.CodeCompiler; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.TopLevelAllocator; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.PhysicalPlan; import org.apache.drill.exec.physical.base.FragmentRoot; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.ImplCreator; +import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.SimpleRootExec; import org.apache.drill.exec.planner.PhysicalPlanReader; -import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.proto.BitControl.PlanFragment; -import org.apache.drill.exec.proto.ExecProtos.FragmentHandle; +import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.vector.BigIntVector; import org.apache.drill.exec.vector.IntVector; -import org.junit.AfterClass; import org.junit.Test; +import com.codahale.metrics.MetricRegistry; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.codahale.metrics.MetricRegistry; public class TestSimpleSort extends ExecTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleSort.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 bb7ec69..05161ca 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 @@ -27,28 +27,24 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.compile.CodeCompiler; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.TopLevelAllocator; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.PhysicalPlan; import org.apache.drill.exec.physical.base.FragmentRoot; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.ImplCreator; +import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.SimpleRootExec; import org.apache.drill.exec.planner.PhysicalPlanReader; -import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.proto.BitControl.PlanFragment; -import org.apache.drill.exec.proto.ExecProtos.FragmentHandle; +import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.rpc.user.UserServer.UserClientConnection; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.vector.ValueVector; -import org.junit.After; -import org.junit.AfterClass; import org.junit.Test; +import com.codahale.metrics.MetricRegistry; import com.google.common.base.Charsets; import com.google.common.io.Files; -import com.codahale.metrics.MetricRegistry; public class TestSVRemover extends ExecTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSVRemover.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/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 3420169..07de27f 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 @@ -17,10 +17,8 @@ */ package org.apache.drill.exec.physical.impl.union; -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import com.codahale.metrics.MetricRegistry; - +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import mockit.Injectable; import mockit.NonStrictExpectations; @@ -29,25 +27,23 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.compile.CodeCompiler; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.TopLevelAllocator; import org.apache.drill.exec.ops.FragmentContext; import org.apache.drill.exec.physical.PhysicalPlan; import org.apache.drill.exec.physical.base.FragmentRoot; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.ImplCreator; +import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; import org.apache.drill.exec.physical.impl.SimpleRootExec; import org.apache.drill.exec.planner.PhysicalPlanReader; -import org.apache.drill.exec.proto.CoordinationProtos; -import org.apache.drill.exec.proto.ExecProtos; import org.apache.drill.exec.proto.BitControl.PlanFragment; +import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.rpc.user.UserServer; import org.apache.drill.exec.server.DrillbitContext; -import org.junit.After; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import com.codahale.metrics.MetricRegistry; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestSimpleUnion extends ExecTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleUnion.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java index 2102674..af4afa4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java @@ -17,6 +17,8 @@ */ package org.apache.drill.exec.physical.impl.writer; +import static org.junit.Assert.assertEquals; + import java.io.UnsupportedEncodingException; import java.lang.reflect.Array; import java.util.ArrayList; @@ -46,8 +48,6 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import static org.junit.Assert.assertEquals; - public class TestParquetWriter extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestParquetWriter.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java index 1dc8192..c8790a8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestWriter.java @@ -34,7 +34,6 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import com.google.common.base.Charsets; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java index 9a1eb94..ce47578 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java @@ -21,7 +21,6 @@ import java.io.IOException; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; -import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.exception.FragmentSetupException; import org.apache.drill.exec.physical.PhysicalPlan; @@ -31,10 +30,6 @@ import org.apache.drill.exec.planner.fragment.Fragment; import org.apache.drill.exec.planner.fragment.Fragment.ExchangeFragmentPair; import org.apache.drill.exec.planner.fragment.MakeFragmentsVisitor; import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.rules.TestName; -import org.junit.rules.TestRule; -import org.junit.rules.Timeout; import com.google.common.base.Charsets; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java index d72e47f..ec8bd94 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java @@ -63,9 +63,9 @@ public class TestFragmenter extends PopUnitTestBase { - - - + + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java index 46a2785..6d6baf4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java @@ -42,7 +42,7 @@ public class CachedSingleFileSystem extends FileSystem{ private ByteBuf file; private String path; - + public CachedSingleFileSystem(String path) throws IOException{ this.path = path; File f = new File(path); @@ -59,11 +59,12 @@ public class CachedSingleFileSystem extends FileSystem{ } } + @Override public void close() throws IOException{ file.release(); super.close(); } - + @Override public FSDataOutputStream append(Path arg0, int arg1, Progressable arg2) throws IOException { throw new UnsupportedOperationException(); @@ -125,14 +126,14 @@ public class CachedSingleFileSystem extends FileSystem{ public void setWorkingDirectory(Path arg0) { throw new UnsupportedOperationException(); } - - + + private class CachedFSDataInputStream extends ByteBufInputStream implements Seekable, PositionedReadable{ private ByteBuf buf; public CachedFSDataInputStream(ByteBuf buffer) { super(buffer); this.buf = buffer; - + } @Override http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java index 58a36a8..0999218 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java @@ -17,35 +17,16 @@ */ package org.apache.drill.exec.store; -import com.google.common.collect.ImmutableRangeMap; -import com.google.common.collect.Range; - -import junit.framework.Assert; -import mockit.Injectable; -import mockit.NonStrictExpectations; +import java.util.LinkedList; import org.apache.drill.exec.ExecTest; -import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.proto.CoordinationProtos; -import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.store.parquet.ParquetGroupScan; -import org.apache.drill.exec.store.parquet.ParquetRowGroupScan; -import org.apache.drill.exec.store.parquet.ParquetFormatPlugin; -import org.apache.drill.exec.store.schedule.BlockMapBuilder; import org.apache.hadoop.fs.BlockLocation; -import org.apache.hadoop.fs.FileStatus; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; -import org.junit.Before; import org.junit.Test; -import static junit.framework.Assert.assertNull; -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; +import com.google.common.collect.ImmutableRangeMap; +import com.google.common.collect.Range; public class TestAffinityCalculator extends ExecTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestAffinityCalculator.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java index b5e8564..b40edd1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestOutputMutator.java @@ -27,7 +27,6 @@ import org.apache.drill.exec.exception.SchemaChangeException; import org.apache.drill.exec.expr.TypeHelper; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.physical.impl.OutputMutator; -import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.VectorWrapper; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/JsonRecordReader2Test.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/JsonRecordReader2Test.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/JsonRecordReader2Test.java index 34bcb5e..c83a3ab 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/JsonRecordReader2Test.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/JsonRecordReader2Test.java @@ -18,7 +18,6 @@ package org.apache.drill.exec.store.json; import org.apache.drill.BaseTestQuery; -import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java index c49c328..b2c8596 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java @@ -38,7 +38,6 @@ import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.util.FileUtils; -import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.exception.SchemaChangeException; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; import org.apache.drill.exec.memory.BufferAllocator; @@ -58,7 +57,6 @@ import org.apache.drill.exec.store.TestOutputMutator; import org.apache.drill.exec.store.parquet.columnreaders.ParquetRecordReader; import org.apache.drill.exec.vector.BigIntVector; import org.apache.drill.exec.vector.NullableBigIntVector; -import org.apache.drill.exec.vector.NullableIntVector; import org.apache.drill.exec.vector.ValueVector; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -66,10 +64,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; import org.junit.BeforeClass; import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestRule; import parquet.bytes.BytesInput; import parquet.column.page.Page; import parquet.column.page.PageReadStore; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java index dd198f5..52d5086 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetResultListener.java @@ -33,7 +33,6 @@ import org.apache.drill.exec.rpc.RpcException; import org.apache.drill.exec.rpc.user.ConnectionThrottle; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.rpc.user.UserResultsListener; -import org.apache.drill.exec.vector.BaseDataValueVector; import org.apache.drill.exec.vector.ValueVector; import com.google.common.base.Strings; @@ -151,7 +150,7 @@ public class ParquetResultListener implements UserResultsListener { if(result.getHeader().getIsLastChunk()){ checkLastChunk(batchLoader, result); } - + batchLoader.clear(); result.release(); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java index fb1ea60..0dfb1d8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java @@ -127,6 +127,7 @@ public class TestFileGenerator { position.reset(); } + @Override public Object getValue() { Object ret = values[position.val]; position.increment(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java index 797c63c..8491312 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetPhysicalPlan.java @@ -26,7 +26,6 @@ import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.proto.UserBitShared.QueryId; -import org.apache.drill.exec.proto.UserProtos; import org.apache.drill.exec.record.RecordBatchLoader; import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.rpc.RpcException; @@ -36,7 +35,6 @@ import org.apache.drill.exec.rpc.user.UserResultsListener; import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.vector.ValueVector; -import org.junit.AfterClass; import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java index e16f781..e5a2c94 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java @@ -17,6 +17,12 @@ */ package org.apache.drill.exec.store.text; +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.apache.drill.BaseTestQuery; import org.apache.drill.exec.exception.SchemaChangeException; import org.apache.drill.exec.record.RecordBatchLoader; @@ -25,12 +31,6 @@ import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.vector.ValueVector; import org.junit.Test; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static org.junit.Assert.assertEquals; - public class TestTextColumn extends BaseTestQuery{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTextColumn.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java index 3091914..fa43d55 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java @@ -17,45 +17,22 @@ */ package org.apache.drill.exec.store.text; -import com.codahale.metrics.MetricRegistry; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import mockit.Injectable; -import mockit.NonStrictExpectations; -import org.apache.drill.common.config.DrillConfig; +import static org.junit.Assert.assertEquals; + +import java.util.List; + import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; -import org.apache.drill.exec.exception.SchemaChangeException; -import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; -import org.apache.drill.exec.memory.TopLevelAllocator; -import org.apache.drill.exec.ops.FragmentContext; -import org.apache.drill.exec.physical.impl.OperatorCreatorRegistry; -import org.apache.drill.exec.physical.impl.OutputMutator; import org.apache.drill.exec.pop.PopUnitTestBase; -import org.apache.drill.exec.proto.BitControl; -import org.apache.drill.exec.proto.UserProtos; -import org.apache.drill.exec.record.BatchSchema; -import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.RecordBatchLoader; -import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.rpc.user.QueryResultBatch; -import org.apache.drill.exec.rpc.user.UserServer; import org.apache.drill.exec.server.Drillbit; -import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.RemoteServiceSet; -import org.apache.drill.exec.store.RecordReader; import org.apache.drill.exec.util.VectorUtil; -import org.apache.drill.exec.vector.ValueVector; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.mapred.FileSplit; -import org.junit.AfterClass; -import org.junit.Ignore; import org.junit.Test; -import java.util.List; - -import static org.junit.Assert.assertEquals; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TextRecordReaderTest extends PopUnitTestBase { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestAdaptiveAllocation.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestAdaptiveAllocation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestAdaptiveAllocation.java index f554e3f..ebc4df7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestAdaptiveAllocation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestAdaptiveAllocation.java @@ -17,21 +17,17 @@ */ package org.apache.drill.exec.vector; +import static org.junit.Assert.assertTrue; + +import java.util.Random; + import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.common.types.Types; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.memory.TopLevelAllocator; import org.apache.drill.exec.record.MaterializedField; -import org.apache.drill.exec.record.TransferPair; -import org.apache.drill.exec.vector.NullableVarCharVector.Accessor; -import org.junit.Assert; import org.junit.Test; -import java.util.Random; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class TestAdaptiveAllocation { @Test http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java index 7c7ce2d..eedbf6f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java @@ -17,6 +17,9 @@ */ package org.apache.drill.exec.vector.complex.writer; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.util.List; import org.apache.drill.BaseTestQuery; @@ -27,9 +30,6 @@ import org.apache.drill.exec.record.RecordBatchLoader; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public class TestComplexToJson extends BaseTestQuery { @Test @@ -38,7 +38,7 @@ public class TestComplexToJson extends BaseTestQuery { List<QueryResultBatch> results; RecordBatchLoader loader = new RecordBatchLoader(getAllocator()); - + client = new DrillClient(config, serviceSet.getCoordinator()); client.setSupportComplexTypes(false); client.connect(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java index 9011ff3..cb7bef2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java @@ -31,7 +31,7 @@ public class TestComplexTypeWriter extends BaseTestQuery{ } @Test - //map contains int, float, repeated list , repeated map, nested repeated map, etc. + //map contains int, float, repeated list , repeated map, nested repeated map, etc. public void testA1() throws Exception{ test(" select convert_from('{x:100, y:215.6, z: [1, 2, 3], s : [[5, 6, 7], [8, 9]], " + " t : [{a : 100, b: 200}, {a:300, b: 400}], " + @@ -40,55 +40,55 @@ public class TestComplexTypeWriter extends BaseTestQuery{ } @Test - //two convert functions. + //two convert functions. public void testA2() throws Exception{ test(" select convert_from('{x:100, y:215.6}' ,'JSON') as mycol1, convert_from('{x:100, y:215.6}' ,'JSON') as mycol2 from cp.`tpch/nation.parquet`;"); } @Test - //two convert functions. One convert's input comes from a string concat function. + //two convert functions. One convert's input comes from a string concat function. public void testA3() throws Exception{ test(" select convert_from(concat('{x:100,', 'y:215.6}') ,'JSON') as mycol1, convert_from('{x:100, y:215.6}' ,'JSON') as mycol2 from cp.`tpch/nation.parquet`;"); } - @Test + @Test //two convert functions. One's input is an empty map. public void testA4() throws Exception{ test(" select convert_from('{}' ,'JSON') as mycol1, convert_from('{x:100, y:215.6}' ,'JSON') as mycol2 from cp.`tpch/nation.parquet`;"); } - @Test + @Test //two convert functions. One's input is an empty list ( ok to have null in the result?) public void testA5() throws Exception{ test(" select convert_from('[]' ,'JSON') as mycol1, convert_from('{x:100, y:215.6}' ,'JSON') as mycol2 from cp.`tpch/nation.parquet`;"); } - @Test - //input is a list of BigInt. Output will be a repeated list vector. + @Test + //input is a list of BigInt. Output will be a repeated list vector. public void testA6() throws Exception{ test(" select convert_from('[1, 2, 3]' ,'JSON') as mycol1 from cp.`tpch/nation.parquet`;"); } - @Test - //input is a list of float. Output will be a repeated list vector. + @Test + //input is a list of float. Output will be a repeated list vector. public void testA7() throws Exception{ test(" select convert_from('[1.2, 2.3, 3.5]' ,'JSON') as mycol1 from cp.`tpch/nation.parquet`;"); } - @Test - //input is a list of list of big int. Output will be a repeated list vector. + @Test + //input is a list of list of big int. Output will be a repeated list vector. public void testA8() throws Exception{ test(" select convert_from('[ [1, 2], [3, 4], [5]]' ,'JSON') as mycol1 from cp.`tpch/nation.parquet`;"); } - @Test - //input is a list of map. Output will be a repeated list vector. + @Test + //input is a list of map. Output will be a repeated list vector. public void testA9() throws Exception{ test(" select convert_from('[{a : 100, b: 200}, {a:300, b: 400}]' ,'JSON') as mycol1 from cp.`tpch/nation.parquet`;"); } - + @Test - //two convert functions, one regular nest functions, used with Filter op. + //two convert functions, one regular nest functions, used with Filter op. public void testA10() throws Exception{ test(" select convert_from('{x:100, y:215.6}' ,'JSON') as mycol1, " + " convert_from('{x:200, y:678.9}' ,'JSON') as mycol2, " + @@ -97,16 +97,16 @@ public class TestComplexTypeWriter extends BaseTestQuery{ } @Test - //convert from string constructed from columns in parquet file. + //convert from string constructed from columns in parquet file. public void testA11() throws Exception{ - test(" select convert_from(concat(concat('{ NationName: \"', N_NAME) , '\"}'), 'JSON')" + + test(" select convert_from(concat(concat('{ NationName: \"', N_NAME) , '\"}'), 'JSON')" + " from cp.`tpch/nation.parquet` where n_nationkey > 5;"); } @Test - //Test multiple batches creation ( require multiple alloc for complex writer during Project ). + //Test multiple batches creation ( require multiple alloc for complex writer during Project ). public void testA100() throws Exception{ - test(" select convert_from(concat(concat('{ Price : ', L_EXTENDEDPRICE) , '}') , 'JSON') " + + test(" select convert_from(concat(concat('{ Price : ', L_EXTENDEDPRICE) , '}') , 'JSON') " + " from cp.`tpch/lineitem.parquet` limit 10; "); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java index 10b1775..c92495f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonReader.java @@ -19,16 +19,13 @@ package org.apache.drill.exec.vector.complex.writer; import static org.jgroups.util.Util.assertTrue; import static org.junit.Assert.assertEquals; -import io.netty.buffer.DrillBuf; import static org.junit.Assert.assertNull; +import io.netty.buffer.DrillBuf; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.List; -import com.google.common.io.Files; import org.apache.drill.BaseTestQuery; -import org.apache.drill.common.expression.PathSegment; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.exception.SchemaChangeException; @@ -40,12 +37,9 @@ import org.apache.drill.exec.record.RecordBatchLoader; import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.vector.IntVector; -import org.apache.drill.exec.vector.NullableBigIntVector; import org.apache.drill.exec.vector.NullableIntVector; import org.apache.drill.exec.vector.RepeatedBigIntVector; -import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.MapVector; -import org.apache.drill.exec.vector.complex.fn.JsonReader; import org.apache.drill.exec.vector.complex.fn.JsonReaderWithState; import org.apache.drill.exec.vector.complex.fn.JsonWriter; import org.apache.drill.exec.vector.complex.fn.ReaderJSONRecordSplitter; @@ -53,13 +47,13 @@ import org.apache.drill.exec.vector.complex.impl.ComplexWriterImpl; import org.apache.drill.exec.vector.complex.reader.FieldReader; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; import com.google.common.base.Charsets; import com.google.common.collect.Lists; +import com.google.common.io.Files; public class TestJsonReader extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJsonReader.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java index 9c2e3b7..a85a841 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java @@ -28,7 +28,6 @@ import org.apache.drill.exec.vector.complex.MapVector; import org.apache.drill.exec.vector.complex.fn.JsonWriter; import org.apache.drill.exec.vector.complex.impl.ComplexWriterImpl; import org.apache.drill.exec.vector.complex.reader.FieldReader; -import org.apache.drill.exec.vector.complex.writer.BaseWriter.ComplexWriter; import org.apache.drill.exec.vector.complex.writer.BaseWriter.ListWriter; import org.apache.drill.exec.vector.complex.writer.BaseWriter.MapWriter; import org.junit.AfterClass; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java index 28d8e39..b01b3e0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java @@ -17,24 +17,21 @@ */ package org.apache.drill.exec.work.batch; -import com.google.common.base.Charsets; -import com.google.common.io.Files; -import com.google.common.io.Resources; +import static org.junit.Assert.assertEquals; + +import java.util.List; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.client.DrillClient; -import org.apache.drill.exec.proto.UserProtos; import org.apache.drill.exec.rpc.user.QueryResultBatch; import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.RemoteServiceSet; import org.junit.Test; -import java.net.URL; -import java.util.List; - -import static org.junit.Assert.assertEquals; +import com.google.common.base.Charsets; +import com.google.common.io.Files; public class TestSpoolingBuffer extends ExecTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSpoolingBuffer.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/AvaticaDrillSqlAccessor.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/AvaticaDrillSqlAccessor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/AvaticaDrillSqlAccessor.java index d06c420..cf5829a 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/AvaticaDrillSqlAccessor.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/AvaticaDrillSqlAccessor.java @@ -45,7 +45,7 @@ public class AvaticaDrillSqlAccessor implements Accessor{ private SqlAccessor a; private DrillCursor cursor; - + public AvaticaDrillSqlAccessor(SqlAccessor drillSqlAccessor, DrillCursor cursor) { super(); this.a = drillSqlAccessor; @@ -55,7 +55,7 @@ public class AvaticaDrillSqlAccessor implements Accessor{ private int row(){ return cursor.currentRecord; } - + @Override public boolean wasNull() { return a.isNull(row()); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/BasicList.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/BasicList.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/BasicList.java index 74fa72b..290d680 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/BasicList.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/BasicList.java @@ -89,11 +89,11 @@ abstract class BasicList<T> implements List<T>{ throw new UnsupportedOperationException(); } - + public void clear(){ throw new UnsupportedOperationException(); } - + @Override public T set(int index, T element) { throw new UnsupportedOperationException(); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillColumnMetaDataList.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillColumnMetaDataList.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillColumnMetaDataList.java index 51722ea..61afbfb 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillColumnMetaDataList.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillColumnMetaDataList.java @@ -18,19 +18,17 @@ package org.apache.drill.jdbc; import java.sql.ResultSetMetaData; -import java.util.ArrayList; -import java.util.List; -import org.apache.drill.common.types.Types; +import net.hydromatic.avatica.ColumnMetaData; +import net.hydromatic.avatica.ColumnMetaData.AvaticaType; +import net.hydromatic.avatica.ColumnMetaData.Rep; + import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; +import org.apache.drill.common.types.Types; import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.MaterializedField; -import net.hydromatic.avatica.ColumnMetaData; -import net.hydromatic.avatica.ColumnMetaData.AvaticaType; -import net.hydromatic.avatica.ColumnMetaData.Rep; - public class DrillColumnMetaDataList extends BasicList<ColumnMetaData>{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillColumnMetaDataList.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java index 5434f3d..a52644d 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java @@ -36,6 +36,6 @@ public interface DrillConnection extends Connection{ * within Optiq should use this view rather than calling * {@link java.util.Properties#getProperty(String)}. */ DrillConnectionConfig config(); - + public DrillClient getClient(); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java index 0c0989d..584bbb4 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java @@ -20,26 +20,25 @@ package org.apache.drill.jdbc; import java.util.Properties; import java.util.TimeZone; -import net.hydromatic.avatica.ConnectionConfig; import net.hydromatic.avatica.ConnectionConfigImpl; public class DrillConnectionConfig extends ConnectionConfigImpl { private final Properties props; - + public DrillConnectionConfig(Properties p){ super(p); this.props = p; } - + public boolean isLocal(){ return "local".equals(props.getProperty("zk")); } public String getZookeeperConnectionString(){ return props.getProperty("zk"); } - + public TimeZone getTimeZone(){ - return TimeZone.getDefault(); + return TimeZone.getDefault(); } - + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java index 224d59f..f4ca79b 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java @@ -95,6 +95,7 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac } + @Override public DrillConnectionConfig config(){ return config; } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java index 380ee99..9d4630f 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillCursor.java @@ -24,7 +24,6 @@ import java.util.List; import net.hydromatic.avatica.ArrayImpl.Factory; import net.hydromatic.avatica.ColumnMetaData; import net.hydromatic.avatica.Cursor; -import net.hydromatic.avatica.Cursor.Accessor; import org.apache.drill.exec.exception.SchemaChangeException; import org.apache.drill.exec.record.BatchSchema; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillJdbc41Factory.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillJdbc41Factory.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillJdbc41Factory.java index e6e533e..7fb0a34 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillJdbc41Factory.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillJdbc41Factory.java @@ -52,6 +52,7 @@ public class DrillJdbc41Factory extends DrillFactory { super(major, minor); } + @Override public DrillJdbc41Connection newDrillConnection(Driver driver, DrillFactory factory, String url, Properties info) throws SQLException{ return new DrillJdbc41Connection((Driver) driver, factory, url, info); } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPrepareResult.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPrepareResult.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPrepareResult.java index 836f346..a388c4e 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPrepareResult.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPrepareResult.java @@ -29,7 +29,7 @@ public class DrillPrepareResult implements AvaticaPrepareResult{ final String sql; final DrillColumnMetaDataList columns = new DrillColumnMetaDataList(); - + public DrillPrepareResult(String sql) { super(); this.sql = sql; http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java index 6d4ee95..cfcee8c 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java @@ -24,7 +24,7 @@ import net.hydromatic.avatica.AvaticaPreparedStatement; /** * Implementation of {@link java.sql.PreparedStatement} for Drill. - * + * * <p> * This class has sub-classes which implement JDBC 3.0 and JDBC 4.0 APIs; it is instantiated using * {@link net.hydromatic.avatica.AvaticaFactory#newPreparedStatement}. http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatementRegistry.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatementRegistry.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatementRegistry.java index 480caca..cc797fa 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatementRegistry.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatementRegistry.java @@ -19,10 +19,10 @@ package org.apache.drill.jdbc; class DrillStatementRegistry { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillStatementRegistry.class); - - + + public void addStatement(DrillRemoteStatement statement){} public void removeStatement(DrillRemoteStatement statement){} - + public void close(){} } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java index 696ef26..974e786 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java @@ -17,8 +17,6 @@ */ package org.apache.drill.jdbc; -import org.apache.drill.common.config.DrillConfig; - import net.hydromatic.avatica.DriverVersion; import net.hydromatic.avatica.Handler; import net.hydromatic.avatica.HandlerImpl; @@ -59,6 +57,7 @@ public class Driver extends UnregisteredDriver { } } + @Override protected DriverVersion createDriverVersion() { return DriverVersion.load( Driver.class, http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/main/java/org/apache/drill/jdbc/GlobalServiceSetReference.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/GlobalServiceSetReference.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/GlobalServiceSetReference.java index 9326283..7c9329c 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/GlobalServiceSetReference.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/GlobalServiceSetReference.java @@ -21,9 +21,9 @@ import org.apache.drill.exec.server.RemoteServiceSet; public class GlobalServiceSetReference { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(GlobalServiceSetReference.class); - + public static final ThreadLocal<RemoteServiceSet> SETS = new ThreadLocal<RemoteServiceSet>(); - - - + + + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java index 198d272..8f2ddd9 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java @@ -29,21 +29,17 @@ import java.util.Properties; import java.util.SortedSet; import java.util.TreeSet; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; import net.hydromatic.linq4j.Ord; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.logical.LogicalPlan; import org.apache.drill.common.logical.data.LogicalOperator; import org.apache.drill.common.util.Hook; -import org.codehaus.jackson.node.ObjectNode; import org.junit.Assert; import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; /** * Fluent interface for writing JDBC and query-planning tests. http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java index 6ab7619..2dba402 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java @@ -17,17 +17,6 @@ */ package org.apache.drill.jdbc.test; -import com.google.common.base.Stopwatch; -import org.apache.commons.io.FileUtils; -import org.apache.drill.common.util.TestTools; -import org.apache.drill.exec.store.hive.HiveTestDataGenerator; -import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.rules.TestRule; - -import java.io.File; import java.nio.file.Paths; import java.sql.Connection; import java.sql.DriverManager; @@ -36,6 +25,14 @@ import java.sql.ResultSetMetaData; import java.sql.Statement; import java.util.concurrent.TimeUnit; +import org.apache.drill.common.util.TestTools; +import org.apache.drill.jdbc.Driver; +import org.apache.drill.jdbc.JdbcTest; +import org.junit.Rule; +import org.junit.rules.TestRule; + +import com.google.common.base.Stopwatch; + public class JdbcTestQueryBase extends JdbcTest { // Set a timeout unless we're debugging. @Rule http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java index 812ee40..f6295bc 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java @@ -18,28 +18,11 @@ package org.apache.drill.jdbc.test; import java.nio.file.Paths; -import java.sql.Connection; import java.sql.Date; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.Statement; -import java.util.concurrent.TimeUnit; - -import org.apache.drill.common.util.TestTools; -import org.apache.drill.exec.store.hive.HiveTestDataGenerator; + import org.apache.drill.jdbc.Driver; -import org.apache.drill.jdbc.JdbcTest; import org.joda.time.chrono.ISOChronology; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.TestRule; - -import com.google.common.base.Function; -import com.google.common.base.Stopwatch; public class TestAggregateFunctionsQuery { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestFunctionsQuery.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestFunctionsQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestFunctionsQuery.java index cad5b4d..881834b 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestFunctionsQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestFunctionsQuery.java @@ -559,7 +559,7 @@ public class TestFunctionsQuery { "DATE1=2011-02-01; " + "DATE2=2011-01-01\n"); } - + @Test @Ignore public void testToTimeStamp() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestHiveScalarUDFs.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestHiveScalarUDFs.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestHiveScalarUDFs.java index ce26c55..705152e 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestHiveScalarUDFs.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestHiveScalarUDFs.java @@ -20,11 +20,9 @@ package org.apache.drill.jdbc.test; import org.apache.drill.exec.store.hive.HiveTestDataGenerator; -import org.apache.hadoop.hive.ql.exec.UDF; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDF; import org.junit.BeforeClass; -import org.junit.Test; import org.junit.Ignore; +import org.junit.Test; public class TestHiveScalarUDFs { http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java index d10eeb2..58b3615 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java @@ -26,19 +26,17 @@ import java.sql.Statement; import java.util.List; import java.util.concurrent.TimeUnit; -import com.google.common.collect.Lists; import org.apache.drill.common.util.TestTools; -import org.apache.drill.exec.store.hive.HiveTestDataGenerator; import org.apache.drill.jdbc.Driver; import org.apache.drill.jdbc.JdbcTest; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; -import org.junit.Ignore; import org.junit.rules.TestRule; import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; public class TestJdbcDistQuery extends JdbcTest{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcDistQuery.class); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java index b681719..6ef87c2 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcQuery.java @@ -17,8 +17,8 @@ */ package org.apache.drill.jdbc.test; -import java.lang.Exception; -import java.lang.RuntimeException; +import static org.junit.Assert.assertEquals; + import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; @@ -29,8 +29,6 @@ import org.junit.Test; import com.google.common.base.Function; -import static org.junit.Assert.assertEquals; - public class TestJdbcQuery extends JdbcTestQueryBase{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestJdbcQuery.class); @@ -328,7 +326,7 @@ public class TestJdbcQuery extends JdbcTestQueryBase{ "L_UTF8=5\n" ); } - + @Test public void testTimeIntervalAddOverflow() throws Exception { JdbcAssert.withNoDefaultSchema() http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java index b1fc193..4dad7b3 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java @@ -17,18 +17,17 @@ */ package org.apache.drill.jdbc.test; -import com.google.common.base.Function; -import org.apache.commons.io.FileUtils; -import org.apache.drill.exec.store.hive.HiveTestDataGenerator; -import org.junit.BeforeClass; -import org.junit.Test; +import static org.junit.Assert.assertTrue; -import java.io.File; import java.sql.Connection; import java.sql.ResultSet; import java.sql.Statement; -import static org.junit.Assert.assertTrue; +import org.apache.drill.exec.store.hive.HiveTestDataGenerator; +import org.junit.BeforeClass; +import org.junit.Test; + +import com.google.common.base.Function; /** * Contains tests for http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/39990292/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestViews.java ---------------------------------------------------------------------- diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestViews.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestViews.java index 17772b6..28fa4a7 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestViews.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestViews.java @@ -17,7 +17,12 @@ */ package org.apache.drill.jdbc.test; -import com.google.common.base.Function; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; import org.apache.commons.io.FileUtils; import org.apache.drill.exec.store.hive.HiveTestDataGenerator; @@ -26,12 +31,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import java.io.File; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; - -import static org.junit.Assert.assertTrue; +import com.google.common.base.Function; /** Contains tests for creating/droping and using views in Drill. */ public class TestViews extends JdbcTestQueryBase {
