http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java index 3bfa347..2fadb6e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.physical.config; +import org.apache.drill.categories.PlannerTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.config.LogicalPlanPersistence; import org.apache.drill.common.scanner.ClassPathScanner; @@ -25,7 +26,6 @@ import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.physical.PhysicalPlan; import org.apache.drill.exec.planner.PhysicalPlanReader; -import org.apache.drill.exec.planner.PhysicalPlanReaderTestFactory; import org.apache.drill.exec.proto.CoordinationProtos; import org.junit.Test; @@ -33,7 +33,9 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.ObjectWriter; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(PlannerTest.class) public class TestParsePhysicalPlan extends ExecTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestParsePhysicalPlan.class);
http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java index 93a9570..3ef5651 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; @@ -32,7 +33,9 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestBroadcastExchange extends PopUnitTestBase { @Test public void TestSingleBroadcastExchangeWithTwoScans() throws Exception { http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java index ed1c06e..55dc130 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestConvertFunctions.java @@ -30,6 +30,7 @@ import java.util.List; import org.apache.drill.BaseTestQuery; import org.apache.drill.QueryTestUtil; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.compile.ClassTransformer.ScalarReplacementOption; import org.apache.drill.exec.compile.CodeCompiler; @@ -55,7 +56,9 @@ import com.google.common.io.Resources; import io.netty.buffer.DrillBuf; import mockit.Injectable; +import org.junit.experimental.categories.Category; +@Category(UnlikelyTest.class) public class TestConvertFunctions extends BaseTestQuery { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestConvertFunctions.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java index 1424a08..a24e511 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java @@ -33,11 +33,14 @@ import org.apache.drill.exec.rpc.user.QueryDataBatch; import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.vector.ValueVector; +import org.apache.drill.categories.SlowTest; import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(SlowTest.class) public class TestDecimal extends PopUnitTestBase{ DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java index 099b7bd..0349352 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; @@ -32,8 +33,9 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; - +@Category(SlowTest.class) public class TestDistributedFragmentRun extends PopUnitTestBase{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestDistributedFragmentRun.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java index 5740512..937faf8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; @@ -35,11 +36,13 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; /* This class tests the existing date types. Simply using date types * by casting from VarChar, performing basic functions and converting * back to VarChar. */ +@Category(SlowTest.class) public class TestExtractFunctions extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestExtractFunctions.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java index 1d090ec..c9954de 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; @@ -31,7 +32,9 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestHashToRandomExchange extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestHashToRandomExchange.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 9701c7d..f09e569 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 @@ -22,6 +22,7 @@ import java.util.List; import mockit.Injectable; import mockit.NonStrictExpectations; +import org.apache.drill.categories.PlannerTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.logical.LogicalPlan; import org.apache.drill.common.util.FileUtils; @@ -65,8 +66,10 @@ import com.codahale.metrics.MetricRegistry; import com.google.common.base.Charsets; import com.google.common.io.Files; import com.google.common.io.Resources; +import org.junit.experimental.categories.Category; @Ignore +@Category(PlannerTest.class) public class TestOptiqPlans extends ExecTest { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestOptiqPlans.class); private final DrillConfig config = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java index 9c24f79..dc653c2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; @@ -31,7 +32,9 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestUnionExchange extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestUnionExchange.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 85d62c3..43c0af0 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 @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.SchemaPath; @@ -37,7 +38,9 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestSimpleTopN extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleTopN.class); DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java index d5bb2d3..066d966 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java @@ -18,14 +18,16 @@ package org.apache.drill.exec.physical.impl.TopN; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.TestBuilder; -import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; +@Category(OperatorTest.class) public class TestTopNSchemaChanges extends BaseTestQuery { @Test http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 c6e394a..8dd2da0 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 @@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl.agg; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.util.FileUtils; @@ -44,7 +45,9 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestAgg extends ExecTest { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestAgg.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 a2739f4..b7c9e92 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 @@ -19,10 +19,12 @@ package org.apache.drill.exec.physical.impl.agg; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; - +@Category(OperatorTest.class) public class TestHashAggr extends BaseTestQuery{ @Test http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java index 7dbc9a3..2003857 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java @@ -19,6 +19,8 @@ package org.apache.drill.exec.physical.impl.agg; import ch.qos.logback.classic.Level; +import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.exceptions.UserRemoteException; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.physical.impl.aggregate.HashAggTemplate; @@ -30,7 +32,9 @@ import org.apache.drill.test.FixtureBuilder; import org.apache.drill.test.LogFixture; import org.apache.drill.test.ProfileParser; import org.apache.drill.test.QueryBuilder; +import org.apache.drill.categories.SlowTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.List; @@ -41,6 +45,7 @@ import static org.junit.Assert.assertTrue; /** * Test spilling for the Hash Aggr operator (using the mock reader) */ +@Category({SlowTest.class, OperatorTest.class}) public class TestHashAggrSpill { private void runAndDump(ClientFixture client, String sql, long expectedRows, long spillCycle, long fromSpilledPartitions, long toSpilledPartitions) throws Exception { http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java index f367a69..5b869e1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java @@ -18,8 +18,11 @@ package org.apache.drill.exec.physical.impl.broadcastsender; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestBroadcast extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestBroadcast.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java index aff2a60..353c201 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java @@ -18,8 +18,12 @@ package org.apache.drill.exec.physical.impl.filter; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; +import org.apache.drill.categories.UnlikelyTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestLargeInClause extends BaseTestQuery { private static String getInIntList(int size){ @@ -60,6 +64,7 @@ public class TestLargeInClause extends BaseTestQuery { } @Test // DRILL-3062 + @Category(UnlikelyTest.class) public void testStringLiterals() throws Exception { String query = "select count(*) as cnt from (select n_name from cp.`tpch/nation.parquet` " + " where n_name in ('ALGERIA', 'ARGENTINA', 'BRAZIL', 'CANADA', 'EGYPT', 'ETHIOPIA', 'FRANCE', " @@ -76,6 +81,7 @@ public class TestLargeInClause extends BaseTestQuery { } @Test // DRILL-3019 + @Category(UnlikelyTest.class) public void testExprsInInList() throws Exception{ String query = "select r_regionkey \n" + "from cp.`tpch/region.parquet` \n" + http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 163667a..499ac5b 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 @@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl.filter; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; @@ -41,7 +42,9 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestSimpleFilter extends ExecTest { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleFilter.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java index 522a5d0..fc954be 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java @@ -28,7 +28,9 @@ import java.io.FileWriter; import java.util.List; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.TestBuilder; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.fn.interp.TestConstantFolding; import org.apache.drill.exec.store.easy.json.JSONRecordReader; @@ -36,10 +38,12 @@ import org.apache.drill.exec.util.JsonStringHashMap; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import com.google.common.collect.Lists; +@Category(OperatorTest.class) public class TestFlatten extends BaseTestQuery { /** @@ -61,6 +65,7 @@ public class TestFlatten extends BaseTestQuery { } @Test + @Category(UnlikelyTest.class) public void testFlatten_Drill2162_complex() throws Exception { String path = folder.getRoot().toPath().toString(); @@ -200,12 +205,14 @@ public class TestFlatten extends BaseTestQuery { }; @Test + @Category(UnlikelyTest.class) public void drill1671() throws Exception{ int rowCount = testSql("select * from (select count(*) as cnt from (select id, flatten(evnts1), flatten(evnts2), flatten(evnts3), flatten(evnts4), flatten(evnts5), flatten(evnts6), flatten(evnts7), flatten(evnts8), flatten(evnts9), flatten(evnts10), flatten(evnts11) from cp.`/flatten/many-arrays-50.json`)x )y where cnt = 2048"); assertEquals(rowCount, 1); } @Test + @Category(UnlikelyTest.class) public void drill3370() throws Exception { testBuilder() .sqlQuery("select a from (select flatten(arr) as a from cp.`/flatten/drill-3370.json`) where a > 100") @@ -223,6 +230,7 @@ public class TestFlatten extends BaseTestQuery { } @Test // repeated list within a repeated map + @Category(UnlikelyTest.class) public void drill1673() throws Exception { String path = folder.getRoot().toPath().toString(); @@ -253,12 +261,14 @@ public class TestFlatten extends BaseTestQuery { } @Test + @Category(UnlikelyTest.class) public void drill1653() throws Exception{ int rowCount = testSql("select * from (select sum(t.flat.`value`) as sm from (select id, flatten(kvgen(m)) as flat from cp.`/flatten/missing-map.json`)t) where sm = 10 "); assertEquals(1, rowCount); } @Test + @Category(UnlikelyTest.class) public void drill1652() throws Exception { if(RUN_ADVANCED_TESTS){ test("select uid, flatten(transactions) from dfs.`/tmp/bigfile.json`"); @@ -377,6 +387,7 @@ public class TestFlatten extends BaseTestQuery { } @Test + @Category(UnlikelyTest.class) public void testDrill1665() throws Exception { if(RUN_ADVANCED_TESTS){ test("select id, flatten(evnts) as rpt from dfs.`/tmp/drill1665.json`"); @@ -401,6 +412,7 @@ public class TestFlatten extends BaseTestQuery { @Test //DRILL-2254 + @Category(UnlikelyTest.class) public void testSingleFlattenFromNestedRepeatedList() throws Exception { final String query = "select t.uid, flatten(t.odd) odd from cp.`project/complex/a.json` t"; @@ -413,6 +425,7 @@ public class TestFlatten extends BaseTestQuery { } @Test //DRILL-2254 supplementary + @Category(UnlikelyTest.class) public void testMultiFlattenFromNestedRepeatedList() throws Exception { final String query = "select t.uid, flatten(flatten(t.odd)) odd from cp.`project/complex/a.json` t"; @@ -425,6 +438,7 @@ public class TestFlatten extends BaseTestQuery { } @Test //DRILL-2254 supplementary + @Category(UnlikelyTest.class) public void testSingleMultiFlattenFromNestedRepeatedList() throws Exception { final String query = "select t.uid, flatten(t.odd) once, flatten(flatten(t.odd)) twice from cp.`project/complex/a.json` t"; @@ -438,6 +452,7 @@ public class TestFlatten extends BaseTestQuery { @Test + @Category(UnlikelyTest.class) public void testDrill_2013() throws Exception { testBuilder() .sqlQuery("select flatten(complex), rownum from cp.`/store/json/test_flatten_mappify2.json` where rownum > 5") @@ -446,6 +461,7 @@ public class TestFlatten extends BaseTestQuery { } @Test + @Category(UnlikelyTest.class) public void testDRILL_2106() throws Exception { testBuilder() .sqlQuery("select rl, flatten(rl) frl from (select `integer`, flatten(rl) as rl from cp.`jsoninput/input2.json`)") @@ -462,6 +478,7 @@ public class TestFlatten extends BaseTestQuery { } @Test // see DRILL-2146 + @Category(UnlikelyTest.class) public void testFalttenWithStar() throws Exception { String root = FileUtils.getResourceAsFile("/store/text/sample.json").toURI().toString(); String q1 = String.format("select *, flatten(j.topping) tt, flatten(j.batters.batter) bb, j.id " + @@ -476,6 +493,7 @@ public class TestFlatten extends BaseTestQuery { } @Test // see DRILL-2012 + @Category(UnlikelyTest.class) public void testMultipleFalttenWithWhereClause() throws Exception { String root = FileUtils.getResourceAsFile("/store/text/sample.json").toURI().toString(); String q1 = String.format("select flatten(j.topping) tt " + @@ -490,6 +508,7 @@ public class TestFlatten extends BaseTestQuery { } @Test //DRILL-2099 + @Category(UnlikelyTest.class) public void testFlattenAfterSort() throws Exception { String query = "select flatten(s1.rms.rptd) rptds from " + "(select d.uid uid, flatten(d.map.rm) rms from cp.`jsoninput/flatten_post_sort.json` d order by d.uid) s1"; @@ -502,6 +521,7 @@ public class TestFlatten extends BaseTestQuery { } @Test //DRILL-2268 + @Category(UnlikelyTest.class) public void testFlattenAfterJoin1() throws Exception { String query = "select flatten(sub1.events) flat_events from "+ "(select t1.events events from cp.`complex/json/flatten_join.json` t1 "+ @@ -515,6 +535,7 @@ public class TestFlatten extends BaseTestQuery { } @Test //DRILL-2268 + @Category(UnlikelyTest.class) public void testFlattenAfterJoin2() throws Exception { String query = "select flatten(t1.events) flat_events from cp.`complex/json/flatten_join.json` t1 " + "inner join cp.`complex/json/flatten_join.json` t2 on t1.id=t2.id"; @@ -527,6 +548,7 @@ public class TestFlatten extends BaseTestQuery { } @Test //DRILL-2268 + @Category(UnlikelyTest.class) public void testFlattenAfterJoin3() throws Exception { String query = "select flatten(sub1.lst_lst) flat_lst_lst from "+ "(select t1.lst_lst lst_lst from cp.`complex/json/flatten_join.json` t1 "+ http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java index f32eaaa..75537af 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java @@ -18,8 +18,12 @@ package org.apache.drill.exec.physical.impl.flatten; import org.apache.drill.PlanTestBase; +import org.apache.drill.categories.PlannerTest; +import org.apache.drill.categories.UnlikelyTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({UnlikelyTest.class, PlannerTest.class}) public class TestFlattenPlanning extends PlanTestBase { @Test http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 7813675..a9fb80d 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 @@ -23,6 +23,8 @@ import static org.junit.Assert.assertTrue; import java.util.Iterator; import java.util.List; +import org.apache.drill.categories.OperatorTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.common.util.TestTools; @@ -47,6 +49,7 @@ import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.vector.ValueVector; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; import com.google.common.base.Charsets; @@ -54,7 +57,7 @@ import com.google.common.io.Files; import mockit.Injectable; - +@Category({SlowTest.class, OperatorTest.class}) public class TestHashJoin extends PopUnitTestBase { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMergeJoin.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java index 16df3ac..205daa2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java @@ -20,14 +20,18 @@ package org.apache.drill.exec.physical.impl.join; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; +import org.apache.drill.categories.UnlikelyTest; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; +@Category(OperatorTest.class) public class TestHashJoinAdvanced extends BaseTestQuery { // Have to disable merge join, if this testcase is to test "HASH-JOIN". @@ -42,6 +46,7 @@ public class TestHashJoinAdvanced extends BaseTestQuery { } @Test //DRILL-2197 Left Self Join with complex type in projection + @Category(UnlikelyTest.class) public void testLeftSelfHashJoinWithMap() throws Exception { final String query = " select a.id, b.oooi.oa.oab.oabc oabc, b.ooof.oa.oab oab from cp.`join/complex_1.json` a left outer join cp.`join/complex_1.json` b on a.id=b.id order by a.id"; @@ -54,6 +59,7 @@ public class TestHashJoinAdvanced extends BaseTestQuery { } @Test //DRILL-2197 Left Join with complex type in projection + @Category(UnlikelyTest.class) public void testLeftHashJoinWithMap() throws Exception { final String query = " select a.id, b.oooi.oa.oab.oabc oabc, b.ooof.oa.oab oab from cp.`join/complex_1.json` a left outer join cp.`join/complex_2.json` b on a.id=b.id order by a.id"; @@ -80,6 +86,7 @@ public class TestHashJoinAdvanced extends BaseTestQuery { } @Test // DRILL-2771, similar problem as DRILL-2197 except problem reproduces with right outer join instead of left + @Category(UnlikelyTest.class) public void testRightJoinWithMap() throws Exception { final String query = " select a.id, b.oooi.oa.oab.oabc oabc, b.ooof.oa.oab oab from " + "cp.`join/complex_1.json` b right outer join cp.`join/complex_1.json` a on a.id = b.id order by a.id"; @@ -132,6 +139,7 @@ public class TestHashJoinAdvanced extends BaseTestQuery { } @Test //DRILL-2197 Left Join with complex type in projection + @Category(UnlikelyTest.class) public void testJoinWithMapAndDotField() throws Exception { File directory = new File(BaseTestQuery.getTempDir("json/input")); try { http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 8ba442d..25e8ba5 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 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.List; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; @@ -43,6 +44,7 @@ import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.RemoteServiceSet; import org.apache.drill.exec.store.StoragePluginRegistryImpl; import org.apache.drill.exec.vector.ValueVector; +import org.apache.drill.categories.SlowTest; import org.junit.Ignore; import org.junit.Test; @@ -51,8 +53,9 @@ import com.google.common.collect.Lists; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; - +@Category({SlowTest.class, OperatorTest.class}) public class TestMergeJoin extends PopUnitTestBase { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMergeJoin.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinAdvanced.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinAdvanced.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinAdvanced.java index e3842be..d01b030 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinAdvanced.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinAdvanced.java @@ -18,6 +18,7 @@ package org.apache.drill.exec.physical.impl.join; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.planner.physical.PlannerSettings; @@ -27,6 +28,7 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; import java.io.BufferedWriter; @@ -35,6 +37,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.Random; +@Category(OperatorTest.class) public class TestMergeJoinAdvanced extends BaseTestQuery { @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(120000); // Longer timeout than usual. http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 34c15c9..48ad5f1 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 @@ -21,6 +21,8 @@ import static org.junit.Assert.assertEquals; import java.util.List; +import org.apache.drill.categories.OperatorTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.client.DrillClient; @@ -30,11 +32,13 @@ import org.apache.drill.exec.server.Drillbit; import org.apache.drill.exec.server.RemoteServiceSet; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; import com.google.common.base.Charsets; import com.google.common.io.Files; +@Category({SlowTest.class, OperatorTest.class}) public class TestMergeJoinMulCondition extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMergeJoinMulCondition.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinWithSchemaChanges.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinWithSchemaChanges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinWithSchemaChanges.java index 29aabe7..86a136c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinWithSchemaChanges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinWithSchemaChanges.java @@ -18,16 +18,17 @@ package org.apache.drill.exec.physical.impl.join; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.TestBuilder; -import org.apache.drill.common.exceptions.DrillRuntimeException; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; -import java.io.IOException; +@Category(OperatorTest.class) public class TestMergeJoinWithSchemaChanges extends BaseTestQuery { @Test http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java index 10a9372..87c9501 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java @@ -18,14 +18,17 @@ package org.apache.drill.exec.physical.impl.join; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.PlanTestBase; import org.apache.drill.common.exceptions.UserRemoteException; import org.apache.drill.common.util.TestTools; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; +@Category(OperatorTest.class) public class TestNestedLoopJoin extends PlanTestBase { private static String nlpattern = "NestedLoopJoin"; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java index 44035c5..f8b0d47 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java @@ -21,6 +21,7 @@ import com.google.common.collect.Lists; import org.apache.commons.lang3.tuple.Pair; import org.apache.drill.BaseTestQuery; import org.apache.drill.PlanTestBase; +import org.apache.drill.categories.PlannerTest; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.types.Types; @@ -31,10 +32,12 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.sql.Date; import java.util.List; +@Category(PlannerTest.class) public class TestEarlyLimit0Optimization extends BaseTestQuery { private static final String viewName = "limitZeroEmployeeView"; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java index b5846bd..8b75f3a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java @@ -18,15 +18,17 @@ package org.apache.drill.exec.physical.impl.limit; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.PlanTestBase; import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.ExecConstants; -import org.apache.drill.exec.planner.physical.PlannerSettings; import org.apache.drill.test.OperatorFixture; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; +@Category(OperatorTest.class) public class TestLimitWithExchanges extends BaseTestQuery { final String WORKING_PATH = TestTools.getWorkingPath(); final String TEST_RES_PATH = WORKING_PATH + "/src/test/resources"; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 962b9ce..042d38e 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 @@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl.limit; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; @@ -42,7 +43,9 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestSimpleLimit extends ExecTest { private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 6fb7f72..cb2995c 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 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.util.List; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; @@ -38,7 +39,9 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestMergingReceiver extends PopUnitTestBase { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestMergingReceiver.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 40de4b1..4b00821 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 @@ -23,6 +23,7 @@ import java.util.List; import org.apache.commons.math.stat.descriptive.moment.Mean; import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.SchemaPath; @@ -46,11 +47,13 @@ import org.junit.Test; import com.google.common.base.Charsets; import com.google.common.collect.Lists; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; /** * Tests the OrderedPartitionExchange Operator */ @Ignore("Disabled until alternative to distributed cache provided.") +@Category(OperatorTest.class) public class TestOrderedPartitionExchange extends PopUnitTestBase { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestOrderedPartitionExchange.class); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java index 9578332..91d41e6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/partitionsender/TestPartitionSender.java @@ -28,6 +28,7 @@ import java.io.PrintWriter; import java.util.List; import java.util.Random; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.PlanTestBase; import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; @@ -69,6 +70,7 @@ import org.apache.drill.exec.work.QueryWorkUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import org.mockito.Mockito; @@ -79,6 +81,7 @@ import com.google.common.collect.Lists; * ability to copy and flush data * */ +@Category(OperatorTest.class) public class TestPartitionSender extends PlanTestBase { private static final SimpleParallelizer PARALLELIZER = new SimpleParallelizer( http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 f4a718a..f62d133 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 @@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl.project; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.SchemaPath; @@ -44,7 +45,9 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestSimpleProjection extends ExecTest { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleProjection.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 8ba5609..77b03e3 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 @@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl.sort; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.expression.ExpressionPosition; import org.apache.drill.common.expression.SchemaPath; @@ -45,8 +46,10 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; @Ignore +@Category(OperatorTest.class) public class TestSimpleSort extends ExecTest { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleSort.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java index 6209b81..19f4f61 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java @@ -18,15 +18,18 @@ package org.apache.drill.exec.physical.impl.sort; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.util.JsonStringArrayList; import org.apache.drill.exec.util.JsonStringHashMap; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Placeholder for all sort related test. Can be used as we move * more tests to use the new test framework */ +@Category(OperatorTest.class) public class TestSort extends BaseTestQuery { private static final JsonStringHashMap<String, Object> x = new JsonStringHashMap<>(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 6351d06..b00e143 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 @@ -19,6 +19,7 @@ package org.apache.drill.exec.physical.impl.trace; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; @@ -40,6 +41,7 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; /* * This test uses a physical plan with the mock scan that generates 100k records. @@ -49,6 +51,7 @@ import mockit.Injectable; * multiple record batches and when there is a selection vector present in the * incoming container of the trace operator. */ +@Category(OperatorTest.class) public class TestTraceMultiRecordBatch extends ExecTest { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTraceOutputDump.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 a65393d..3e08ed1 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 @@ -19,6 +19,7 @@ package org.apache.drill.exec.physical.impl.trace; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecConstants; @@ -48,6 +49,7 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; /* * This test uses a simple physical plan with a mock-scan that @@ -63,6 +65,7 @@ import mockit.Injectable; * the record that is dumped (Integer.MIN_VALUE) so we compare it with this * known value. */ +@Category(OperatorTest.class) public class TestTraceOutputDump extends ExecTest { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTraceOutputDump.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 a11889d..9002936 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 @@ -20,6 +20,7 @@ package org.apache.drill.exec.physical.impl.union; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.ExecTest; @@ -40,9 +41,10 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; import mockit.Injectable; +import org.junit.experimental.categories.Category; // See also TestUnionDistinct for a test that does not need JMockit - +@Category(OperatorTest.class) public class TestSimpleUnion extends ExecTest { //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleUnion.class); private final DrillConfig c = DrillConfig.create(); http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java index 73f9b6d..ab1ca31 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java @@ -21,6 +21,7 @@ import java.util.Properties; import org.apache.drill.BaseTestQuery; import org.apache.drill.DrillTestWrapper; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.exceptions.UserRemoteException; import org.apache.drill.common.util.TestTools; @@ -31,6 +32,7 @@ import static org.junit.Assert.fail; import org.apache.drill.exec.proto.UserBitShared.DrillPBError.ErrorType; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; public class TestWindowFrame extends BaseTestQuery { @@ -194,32 +196,38 @@ public class TestWindowFrame extends BaseTestQuery { } @Test // DRILL-1862 + @Category(UnlikelyTest.class) public void testEmptyPartitionBy() throws Exception { test("SELECT employee_id, position_id, salary, SUM(salary) OVER(ORDER BY position_id) FROM cp.`employee.json` LIMIT 10"); } @Test // DRILL-3172 + @Category(UnlikelyTest.class) public void testEmptyOverClause() throws Exception { test("SELECT employee_id, position_id, salary, SUM(salary) OVER() FROM cp.`employee.json` LIMIT 10"); } @Test // DRILL-3218 + @Category(UnlikelyTest.class) public void testMaxVarChar() throws Exception { test(getFile("window/q3218.sql"), TEST_RES_PATH); } @Test // DRILL-3220 + @Category(UnlikelyTest.class) public void testCountConst() throws Exception { test(getFile("window/q3220.sql"), TEST_RES_PATH); } @Test // DRILL-3604 + @Category(UnlikelyTest.class) public void testFix3604() throws Exception { // make sure the query doesn't fail test(getFile("window/3604.sql"), TEST_RES_PATH); } @Test // DRILL-3605 + @Category(UnlikelyTest.class) public void testFix3605() throws Exception { testBuilder() .sqlQuery(getFile("window/3605.sql"), TEST_RES_PATH) @@ -231,6 +239,7 @@ public class TestWindowFrame extends BaseTestQuery { } @Test // DRILL-3606 + @Category(UnlikelyTest.class) public void testFix3606() throws Exception { testBuilder() .sqlQuery(getFile("window/3606.sql"), TEST_RES_PATH) @@ -446,6 +455,7 @@ public class TestWindowFrame extends BaseTestQuery { // somewhere in the window functions. @Test + @Category(UnlikelyTest.class) public void test4657() throws Exception { testBuilder() .sqlQuery("select row_number() over(order by position_id) rn, rank() over(order by position_id) rnk from dfs_test.`%s/window/b3.p2`", TEST_RES_PATH) http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java index df13799..4f139fc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java @@ -19,14 +19,17 @@ package org.apache.drill.exec.physical.impl.writer; import static java.lang.String.format; +import org.apache.drill.categories.ParquetTest; import org.apache.drill.PlanTestBase; import org.apache.drill.TestBuilder; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.store.parquet.Metadata; import org.apache.hadoop.fs.Path; import org.joda.time.DateTime; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Tests for compatibility reading old parquet files after date corruption @@ -59,6 +62,7 @@ import org.junit.Test; * Use of this option is assumed to be extremely unlikely, but it is included * for completeness. */ +@Category({ParquetTest.class, UnlikelyTest.class}) public class TestCorruptParquetDateCorrection extends PlanTestBase { // 4 files are in the directory: http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/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 f85cada..41be0ba 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 @@ -35,7 +35,9 @@ import java.util.Map; import com.google.common.base.Joiner; import org.apache.drill.BaseTestQuery; -import org.apache.drill.common.config.DrillConfig; +import org.apache.drill.categories.ParquetTest; +import org.apache.drill.categories.SlowTest; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.util.DrillVersionInfo; import org.apache.drill.common.util.TestTools; @@ -56,11 +58,13 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(Parameterized.class) +@Category({SlowTest.class, ParquetTest.class}) public class TestParquetWriter extends BaseTestQuery { // private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestParquetWriter.class); @@ -596,6 +600,7 @@ public class TestParquetWriter extends BaseTestQuery { } @Test // DRILL-2341 + @Category(UnlikelyTest.class) public void tableSchemaWhenSelectFieldsInDef_SelectFieldsInView() throws Exception { final String newTblName = "testTableOutputSchema"; @@ -975,6 +980,7 @@ public class TestParquetWriter extends BaseTestQuery { } @Test // DRILL-5097 + @Category(UnlikelyTest.class) public void testInt96TimeStampValueWidth() throws Exception { try { testBuilder() http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriterEmptyFiles.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriterEmptyFiles.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriterEmptyFiles.java index b4173d3..c9d4300 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriterEmptyFiles.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriterEmptyFiles.java @@ -18,6 +18,8 @@ package org.apache.drill.exec.physical.impl.writer; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.ParquetTest; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.exec.ExecConstants; import org.apache.drill.test.OperatorFixture; import org.apache.hadoop.fs.FileSystem; @@ -25,7 +27,9 @@ import org.apache.hadoop.fs.Path; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({ParquetTest.class, UnlikelyTest.class}) public class TestParquetWriterEmptyFiles extends BaseTestQuery { private static FileSystem fs; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java index 6ead748..66b1f0e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java @@ -18,9 +18,10 @@ package org.apache.drill.exec.physical.impl.xsort; import org.apache.drill.BaseTestQuery; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.TestBuilder; +import org.apache.drill.categories.SlowTest; import org.apache.drill.exec.ExecConstants; -import org.apache.drill.test.SecondaryTest; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -29,7 +30,7 @@ import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; -@Category(SecondaryTest.class) +@Category({SlowTest.class, OperatorTest.class}) public class TestExternalSort extends BaseTestQuery { @Test http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSimpleExternalSort.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSimpleExternalSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSimpleExternalSort.java index 7e63600..d2d7b0c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSimpleExternalSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSimpleExternalSort.java @@ -35,17 +35,17 @@ import org.apache.drill.test.ClientFixture; import org.apache.drill.test.ClusterFixture; import org.apache.drill.test.DrillTest; import org.apache.drill.test.FixtureBuilder; -import org.apache.drill.test.SecondaryTest; +import org.apache.drill.categories.SlowTest; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; -@Category(SecondaryTest.class) +@Category(SlowTest.class) public class TestSimpleExternalSort extends DrillTest { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSimpleExternalSort.class); - @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(80_000); + @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(160_000); @Test public void mergeSortWithSv2Managed() throws Exception { http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortSpillWithException.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortSpillWithException.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortSpillWithException.java index bbb48af..d816cb1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortSpillWithException.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestSortSpillWithException.java @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.io.IOException; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.exceptions.UserRemoteException; import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.ExecConstants; @@ -34,6 +35,7 @@ import org.apache.drill.test.ClusterTest; import org.apache.drill.test.FixtureBuilder; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Testing External Sort's spilling to disk. @@ -43,6 +45,7 @@ import org.junit.Test; * <br> * {@link ExecConstants#EXTERNAL_SORT_SPILL_GROUP_SIZE} = 1 */ +@Category(OperatorTest.class) public class TestSortSpillWithException extends ClusterTest { private static final String TEST_RES_PATH = TestTools.getWorkingPath() + "/src/test/resources"; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestCopier.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestCopier.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestCopier.java index 6464b5a..f1c622f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestCopier.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestCopier.java @@ -22,6 +22,7 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.logical.data.Order.Ordering; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.impl.xsort.managed.PriorityQueueCopierWrapper.BatchMerger; @@ -38,6 +39,7 @@ import org.apache.drill.test.rowSet.SchemaBuilder; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Light-weight sanity test of the copier class. The implementation has @@ -48,6 +50,7 @@ import org.junit.Test; * then additional tests should be added to re-validate the code. */ +@Category(OperatorTest.class) public class TestCopier extends DrillTest { public static OperatorFixture fixture; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortExec.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortExec.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortExec.java index f5858a3..e0f1fb2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortExec.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortExec.java @@ -25,6 +25,7 @@ import static org.junit.Assert.fail; import org.apache.calcite.rel.RelFieldCollation.Direction; import org.apache.calcite.rel.RelFieldCollation.NullDirection; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.logical.data.Order.Ordering; @@ -37,7 +38,9 @@ import org.apache.drill.test.DrillTest; import org.junit.Test; import com.google.common.collect.Lists; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestExternalSortExec extends DrillTest { @Test http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortInternals.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortInternals.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortInternals.java index 1523dfe..9c31cde 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortInternals.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestExternalSortInternals.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.physical.impl.xsort.managed.SortMemoryManager.MergeAction; @@ -29,7 +30,9 @@ import org.apache.drill.test.ConfigBuilder; import org.apache.drill.test.DrillTest; import org.apache.drill.test.OperatorFixture; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(OperatorTest.class) public class TestExternalSortInternals extends DrillTest { private static final int ONE_MEG = 1024 * 1024; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSortImpl.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSortImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSortImpl.java index e8db1e8..a8d6e82 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSortImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSortImpl.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.logical.data.Order.Ordering; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -54,12 +55,14 @@ import org.junit.Test; import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; +import org.junit.experimental.categories.Category; /** * Tests the external sort implementation: the "guts" of the sort stripped of the * Volcano-protocol layer. Assumes the individual components are already tested. */ +@Category(OperatorTest.class) public class TestSortImpl extends DrillTest { /** http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSorter.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSorter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSorter.java index 9da8968..7d0019d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSorter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/managed/TestSorter.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Comparator; import java.util.Random; +import org.apache.drill.categories.OperatorTest; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.logical.data.Order.Ordering; import org.apache.drill.common.types.TypeProtos.MinorType; @@ -49,11 +50,13 @@ import org.junit.Ignore; import org.junit.Test; import com.google.common.collect.Lists; +import org.junit.experimental.categories.Category; /** * Tests the generated per-batch sort code via its wrapper layer. */ +@Category(OperatorTest.class) public class TestSorter extends DrillTest { public static OperatorFixture fixture; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java index 1a52a06..43b1c9d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java @@ -19,6 +19,7 @@ package org.apache.drill.exec.physical.unit; import com.google.common.collect.Lists; +import org.apache.drill.categories.PlannerTest; import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.util.FileUtils; import org.apache.drill.exec.physical.config.Filter; @@ -31,6 +32,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.Collections; import java.util.List; @@ -41,6 +43,7 @@ import java.util.List; * built from PopBuilder/ScanBuilder, 2)an expected schema and base line values, * or 3) indicating no batch is expected. */ +@Category(PlannerTest.class) public class TestMiniPlan extends MiniPlanUnitTestBase { protected static DrillFileSystem fs; http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java index 81a05a6..28f54d7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.planner; +import org.apache.drill.categories.PlannerTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.config.LogicalPlanPersistence; import org.apache.drill.common.scanner.ClassPathScanner; @@ -24,7 +25,9 @@ import org.apache.drill.common.scanner.persistence.ScanResult; import org.apache.drill.exec.proto.CoordinationProtos; import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.store.StoragePluginRegistry; +import org.junit.experimental.categories.Category; +@Category(PlannerTest.class) public class PhysicalPlanReaderTestFactory { public static LogicalPlanPersistence defaultLogicalPlanPersistence(DrillConfig c) { http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java index 6b30de9..2407ee4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java @@ -23,6 +23,8 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; import org.apache.drill.PlanTestBase; +import org.apache.drill.categories.PlannerTest; +import org.apache.drill.categories.SqlTest; import org.apache.drill.common.exceptions.UserRemoteException; import org.apache.drill.common.util.TestTools; import org.apache.drill.exec.fn.interp.TestConstantFolding; @@ -37,6 +39,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import com.google.common.collect.ImmutableList; @@ -45,6 +48,7 @@ import com.google.common.collect.Lists; import static org.hamcrest.CoreMatchers.containsString; import static org.junit.Assert.assertThat; +@Category({SqlTest.class, PlannerTest.class}) public class TestDirectoryExplorerUDFs extends PlanTestBase { private static class ConstantFoldingTestConfig { http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java index a58404b..9d94e9a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java @@ -21,10 +21,12 @@ import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableList; import mockit.Mocked; import mockit.NonStrictExpectations; +import org.apache.drill.categories.PlannerTest; import org.apache.drill.exec.physical.EndpointAffinity; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.Collections; import java.util.List; @@ -36,6 +38,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +@Category(PlannerTest.class) public class TestHardAffinityFragmentParallelizer { // Create a set of test endpoints http://git-wip-us.apache.org/repos/asf/drill/blob/030189f9/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java index 6620585..e449602 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/DrillOptiqTest.java @@ -27,13 +27,17 @@ import org.apache.calcite.rex.RexNode; import org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.calcite.sql.type.SqlTypeFactoryImpl; import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.drill.categories.PlannerTest; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.planner.types.DrillRelDataTypeSystem; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; + import java.util.LinkedList; import java.util.List; +@Category(PlannerTest.class) public class DrillOptiqTest { /* Method checks if we raise the appropriate error while dealing with RexNode that cannot be converted to
