From c5274ed3890c9bf116a79043e7610f9d9a968bd6 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Wed, 22 Nov 2017 15:02:07 -0800 Subject: [PATCH 01/14] - Categories some tests to speed up smoke tests - Made travis run tests --- .travis.yml | 2 +- .../java/org/apache/drill/TestTpchDistributedStreaming.java | 3 +++ .../java/org/apache/drill/exec/TestQueriesOnLargeFile.java | 3 +++ .../org/apache/drill/exec/record/vector/TestValueVector.java | 4 ++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a94ee966c54..3cd95b54073 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,4 @@ language: java jdk: - openjdk7 install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -script: echo "Done" +script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java index 2a8ccc30949..c4b11d7d248 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java @@ -17,10 +17,13 @@ */ package org.apache.drill; +import org.apache.drill.categories.SlowTest; import org.apache.drill.test.BaseTestQuery; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(SlowTest.class) public class TestTpchDistributedStreaming extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTpchDistributedStreaming.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java index 44cdbc087b6..0fd441d67cb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java @@ -24,6 +24,7 @@ import java.io.PrintWriter; import java.util.List; +import org.apache.drill.categories.SlowTest; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.common.util.DrillFileUtils; import org.apache.drill.exec.record.RecordBatchLoader; @@ -34,7 +35,9 @@ import com.google.common.base.Charsets; import com.google.common.io.Files; +import org.junit.experimental.categories.Category; +@Category(SlowTest.class) public class TestQueriesOnLargeFile extends BaseTestQuery { private static File dataFile = null; private static int NUM_RECORDS = 15000; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java index 8119a85958d..0f8f766724b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestValueVector.java @@ -23,6 +23,7 @@ import java.nio.charset.Charset; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.categories.VectorTest; import org.apache.drill.common.AutoCloseables; import org.apache.drill.common.config.DrillConfig; @@ -96,6 +97,7 @@ public void terminate() throws Exception { } @Test(expected = OversizedAllocationException.class) + @Category(UnlikelyTest.class) public void testFixedVectorReallocation() { final MaterializedField field = MaterializedField.create(EMPTY_SCHEMA_PATH, UInt4Holder.TYPE); @SuppressWarnings("resource") @@ -122,6 +124,7 @@ public void testFixedVectorReallocation() { } @Test(expected = OversizedAllocationException.class) + @Category(UnlikelyTest.class) public void testBitVectorReallocation() { final MaterializedField field = MaterializedField.create(EMPTY_SCHEMA_PATH, UInt4Holder.TYPE); final BitVector vector = new BitVector(field, allocator); @@ -152,6 +155,7 @@ public void testBitVectorReallocation() { } @Test(expected = OversizedAllocationException.class) + @Category(UnlikelyTest.class) public void testVariableVectorReallocation() { final MaterializedField field = MaterializedField.create(EMPTY_SCHEMA_PATH, UInt4Holder.TYPE); @SuppressWarnings("resource") From f565e64f7c8f7cf95d6747a2d651979bf4d868bc Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Wed, 22 Nov 2017 15:06:47 -0800 Subject: [PATCH 02/14] - Cache maven artifacts --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3cd95b54073..47fed6f3900 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,5 +17,8 @@ before_install: git fetch --unshallow language: java jdk: - openjdk7 +cache: + directories: + - "$HOME/.m2" install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 From a65e1c1124408b53b376b6a7d4419b38b91a80b2 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Wed, 22 Nov 2017 16:43:44 -0800 Subject: [PATCH 03/14] - Fixed missing class exception --- exec/jdbc-all/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index 049fe4b06bf..0a197f2fd40 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -46,6 +46,19 @@ + + org.apache.drill + drill-common + ${project.version} + + + javassist + javassist + + + test + + org.apache.drill.exec drill-java-exec From f608992b66c2a9347582e5724d11f8bf0e434dda Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Mon, 27 Nov 2017 10:16:46 -0800 Subject: [PATCH 04/14] - Added drill common test classes --- exec/jdbc-all/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index 0a197f2fd40..88da01f4038 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -262,6 +262,7 @@ -XX:MaxPermSize=256M -XX:MaxDirectMemorySize=3072M -XX:+CMSClassUnloadingEnabled -ea + ${settings.localRepository}/org/apache/drill/drill-common/${project.version}/drill-common-${project.version}-tests.jar ${settings.localRepository}/junit/junit/4.11/junit-4.11.jar ${settings.localRepository}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar ${project.build.directory}/test-classes/ From 6b05a1d2d455e17f78f568f49035e4227ec46686 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Mon, 27 Nov 2017 16:20:20 -0800 Subject: [PATCH 05/14] - Fixed bug where excluded tests are run anyways - Reduced runtime of smoke tests by categorizing more long running, unlikely, and security tests. - Deleted commented out code - Fixed class not found exception in the jdbc-all tests --- .../hive/schema/TestColumnListCache.java | 2 +- exec/java-exec/pom.xml | 47 ------------------- .../apache/drill/TestOutOfMemoryOutcome.java | 3 ++ .../org/apache/drill/TestTpchDistributed.java | 4 +- .../drill/TestTpchDistributedConcurrent.java | 2 +- .../drill/TestTpchDistributedStreaming.java | 2 +- .../common/scanner/TestClassPathScanner.java | 23 ++------- .../drill/exec/TestQueriesOnLargeFile.java | 2 +- .../compile/TestLargeFileCompilation.java | 2 +- .../expr/fn/impl/TestStringFunctions.java | 3 +- .../physical/impl/TestBroadcastExchange.java | 3 +- .../drill/exec/physical/impl/TestDecimal.java | 2 +- .../impl/TestDistributedFragmentRun.java | 5 +- .../physical/impl/TestExtractFunctions.java | 4 +- .../physical/impl/TestStringFunctions.java | 3 ++ .../impl/xsort/TestSimpleExternalSort.java | 2 +- .../user/security/TestUserBitSSLServer.java | 4 +- .../TestUserBitSaslCompatibility.java | 5 +- .../exec/server/TestDrillbitResilience.java | 2 +- .../server/options/TestConfigLinkage.java | 3 +- .../drill/exec/store/TestTimedRunnable.java | 2 +- .../store/parquet/TestFixedlenDecimal.java | 3 ++ .../exec/store/sys/TestPStoreProviders.java | 2 +- exec/jdbc-all/pom.xml | 6 +-- pom.xml | 26 +++++++++- 25 files changed, 65 insertions(+), 97 deletions(-) diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java index d7baccb0725..ff4900a9a40 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java @@ -28,7 +28,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestColumnListCache { @Test diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index f534b34908a..f30c1bcd496 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -26,8 +26,6 @@ org.hamcrest hamcrest-core - 1.3 - test org.apache.kerby @@ -687,35 +685,6 @@ - - largeTests - - false - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - include-large-tests - test - - test - - - - **/TestLargeFileCompilation.java - - org.apache.drill.categories.SlowTest - - - - - - - @@ -899,22 +868,6 @@ org.apache.maven.plugins maven-surefire-plugin - - - - default-test - test - test - - - - **/TestLargeFileCompilation.java - - - - diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java b/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java index 347c4ec15ac..a37fbeb9e09 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java @@ -17,6 +17,7 @@ */ package org.apache.drill; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.proto.CoordinationProtos; @@ -25,11 +26,13 @@ import org.apache.drill.test.BaseTestQuery; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Run several tpch queries and inject an OutOfMemoryException in ScanBatch that will cause an OUT_OF_MEMORY outcome to * be propagated downstream. Make sure the proper "memory error" message is sent to the client. */ +@Category({UnlikelyTest.class}) public class TestOutOfMemoryOutcome extends BaseTestQuery { private static final String SINGLE_MODE = "ALTER SESSION SET `planner.disable_exchanges` = true"; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java index 88a23116eaa..e01857650c8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java @@ -23,10 +23,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestTpchDistributed extends BaseTestQuery { -// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTpchDistributed.class); - private static void testDistributed(final String fileName) throws Exception { final String query = getFile(fileName); test("alter session set `planner.slice_target` = 10; " + query); diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java index f096d558aef..9b9d917119a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java @@ -48,7 +48,7 @@ * unstable from running a lot of queries concurrently -- it's not about * any particular order of execution. We ignore the results. */ -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestTpchDistributedConcurrent extends BaseTestQuery { @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(360000); // Longer timeout than usual. diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java index c4b11d7d248..10068e0ed7d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestTpchDistributedStreaming extends BaseTestQuery { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTpchDistributedStreaming.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java b/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java index 824d6e8f72b..c7bcee9f3a4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java +++ b/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Set; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.scanner.persistence.AnnotationDescriptor; import org.apache.drill.common.scanner.persistence.FieldDescriptor; @@ -40,12 +41,13 @@ import org.apache.drill.common.scanner.persistence.ScanResult; import org.apache.drill.exec.expr.DrillFunc; import org.apache.drill.exec.expr.annotations.FunctionTemplate; -import org.apache.drill.exec.fn.impl.testing.GeneratorFunctions.IncreasingBigInt; import org.apache.drill.exec.fn.impl.testing.GeneratorFunctions.RandomBigIntGauss; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({SlowTest.class}) public class TestClassPathScanner { @SafeVarargs @@ -60,25 +62,6 @@ final private > void assertListEqualsUnordered(C @Test public void test() throws Exception { ScanResult result = ClassPathScanner.fromPrescan(DrillConfig.create()); - // if the build has run properly. BuildTimeScan.REGISTRY_FILE was created with a prescan -// assertListEqualsUnordered(result.getPrescannedPackages(), -// "org.apache.drill.common.logical", -// "org.apache.drill.exec.expr", -// "org.apache.drill.exec.physical.base", -// "org.apache.drill.exec.expr.fn.impl", -// "org.apache.drill.exec.physical.impl", -// "org.apache.drill.exec.rpc.user.security", -// "org.apache.drill.exec.store", -// "org.apache.drill.exec.store.mock", -// "org.apache.drill.exec.physical.config", -// "org.apache.drill.storage" -// ); -// // this is added in the unit test folder that was not scanned so far -// assertListEqualsUnordered(result.getScannedPackages(), -// "org.apache.drill.exec.testing", -// "org.apache.drill.exec.fn.impl.testing", -// "org.apache.drill.exec.rpc.user.security.testing" -// ); List functions = result.getAnnotatedClasses(); Set scanned = new HashSet<>(); AnnotatedClassDescriptor functionRandomBigIntGauss = null; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java index 0fd441d67cb..c15a8fff95b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java @@ -37,7 +37,7 @@ import com.google.common.io.Files; import org.junit.experimental.categories.Category; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestQueriesOnLargeFile extends BaseTestQuery { private static File dataFile = null; private static int NUM_RECORDS = 15000; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java index bec67443a6d..ba936d553bb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java @@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestLargeFileCompilation extends BaseTestQuery { @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(150000); // 150secs diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java index dfb74da5701..d0fbe2a286c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java @@ -21,6 +21,7 @@ import mockit.integration.junit4.JMockit; import org.apache.commons.io.FileUtils; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.categories.SqlFunctionTest; import org.apache.drill.exec.util.Text; @@ -36,7 +37,7 @@ import java.io.FileWriter; @RunWith(JMockit.class) -@Category(SqlFunctionTest.class) +@Category({SqlFunctionTest.class, UnlikelyTest.class}) public class TestStringFunctions extends BaseTestQuery { @Test 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 38a01d5804e..362f86eab3a 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 @@ -22,6 +22,7 @@ import java.util.List; import org.apache.drill.categories.OperatorTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.util.DrillFileUtils; import org.apache.drill.exec.client.DrillClient; import org.apache.drill.exec.pop.PopUnitTestBase; @@ -35,7 +36,7 @@ import com.google.common.io.Files; import org.junit.experimental.categories.Category; -@Category(OperatorTest.class) +@Category({OperatorTest.class, SlowTest.class}) public class TestBroadcastExchange extends PopUnitTestBase { @Test public void TestSingleBroadcastExchangeWithTwoScans() throws Exception { 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 8ba7e572c49..65659a70777 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 @@ -40,7 +40,7 @@ import com.google.common.io.Files; import org.junit.experimental.categories.Category; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestDecimal extends PopUnitTestBase{ DrillConfig c = DrillConfig.create(); 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 4ae4f40b19e..322ee9bfdee 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 @@ -35,7 +35,7 @@ import com.google.common.io.Files; import org.junit.experimental.categories.Category; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestDistributedFragmentRun extends PopUnitTestBase{ static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestDistributedFragmentRun.class); @@ -54,11 +54,8 @@ public void oneBitOneExchangeOneEntryRun() throws Exception{ } assertEquals(100, count); } - - } - @Test public void oneBitOneExchangeTwoEntryRun() throws Exception{ RemoteServiceSet serviceSet = RemoteServiceSet.getLocalServiceSet(); 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 87bc182817d..95295826c17 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 @@ -42,10 +42,8 @@ * by casting from VarChar, performing basic functions and converting * back to VarChar. */ -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestExtractFunctions extends PopUnitTestBase { - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestExtractFunctions.class); - @Test public void testFromDate() throws Exception { long expectedValues[][] = { {00, 00, 02, 01, 1970}, {00, 00, 28, 12, 2008}, {00, 00, 27, 02, 2000} }; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java index dfcbc71fccf..84d837bbb10 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.exec.ExecTest; import org.apache.drill.exec.expr.fn.FunctionImplementationRegistry; @@ -39,7 +40,9 @@ import com.google.common.io.Resources; import mockit.Injectable; +import org.junit.experimental.categories.Category; +@Category({UnlikelyTest.class}) public class TestStringFunctions extends ExecTest { private final DrillConfig c = DrillConfig.create(); 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 21de6c5e5b8..04a1df8a66d 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 @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestSimpleExternalSort extends DrillTest { @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(160_000); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java index a2cb675ce8d..470f95fa2d8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java @@ -18,19 +18,21 @@ package org.apache.drill.exec.rpc.user.security; import com.typesafe.config.ConfigValueFactory; +import org.apache.drill.categories.SecurityTest; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.config.DrillProperties; import org.apache.drill.exec.ExecConstants; -import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.File; import java.util.Properties; import static org.junit.Assert.assertEquals; +@Category({SecurityTest.class}) public class TestUserBitSSLServer extends BaseTestQuery { private static DrillConfig sslConfig; private static Properties initProps; // initial client properties diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java index 3f524b3682f..b957462ae7c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java @@ -19,6 +19,7 @@ import com.google.common.collect.Lists; import com.typesafe.config.ConfigValueFactory; +import org.apache.drill.categories.SecurityTest; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.config.DrillProperties; import org.apache.drill.exec.ExecConstants; @@ -27,6 +28,7 @@ import org.apache.drill.test.BaseTestQuery; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import javax.security.sasl.SaslException; import java.util.Properties; @@ -38,9 +40,8 @@ * Helps to test different scenarios based on security configuration on client and Drillbit side with respect to SASL * and specifically using PLAIN mechanism */ +@Category({SecurityTest.class}) public class TestUserBitSaslCompatibility extends BaseTestQuery { - //private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestUserClient.class); - @BeforeClass public static void setup() { final DrillConfig newConfig = new DrillConfig(DrillConfig.create(cloneDefaultTestConfigProperties()) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java index 92d91f7f4aa..956cfc48747 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java @@ -98,7 +98,7 @@ * Test how resilient drillbits are to throwing exceptions during various phases of query * execution by injecting exceptions at various points, and to cancellations in various phases. */ -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestDrillbitResilience extends DrillTest { private static final Logger logger = org.slf4j.LoggerFactory.getLogger(TestDrillbitResilience.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java index c263d1d27f5..3b4e14421d2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java @@ -19,6 +19,7 @@ package org.apache.drill.exec.server.options; import org.apache.drill.categories.OptionsTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.store.sys.SystemTable; import org.apache.drill.test.BaseDirTestWatcher; @@ -40,7 +41,7 @@ * i.e., if the value is not set in system/session. * */ -@Category(OptionsTest.class) +@Category({OptionsTest.class, SlowTest.class}) public class TestConfigLinkage { public static final String MOCK_PROPERTY = "mock.prop"; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java index 3e6f1182770..25f1a5840f3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java @@ -37,7 +37,7 @@ /** * Unit testing for {@link TimedRunnable}. */ -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestTimedRunnable extends DrillTest { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestTimedRunnable.class); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java index 7635551048a..af842eb6d02 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java @@ -17,11 +17,14 @@ */ package org.apache.drill.exec.store.parquet; +import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.exec.planner.physical.PlannerSettings; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({UnlikelyTest.class}) public class TestFixedlenDecimal extends BaseTestQuery { // enable decimal data type @BeforeClass diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java index 7325fd7f0a9..8896fb033f0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java @@ -45,7 +45,7 @@ import java.io.File; -@Category(SlowTest.class) +@Category({SlowTest.class}) public class TestPStoreProviders extends TestWithZookeeper { @Rule public BaseDirTestWatcher dirTestWatcher = new BaseDirTestWatcher(); diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index 88da01f4038..d8c2463d3d2 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -56,6 +56,7 @@ javassist + tests test @@ -262,9 +263,8 @@ -XX:MaxPermSize=256M -XX:MaxDirectMemorySize=3072M -XX:+CMSClassUnloadingEnabled -ea - ${settings.localRepository}/org/apache/drill/drill-common/${project.version}/drill-common-${project.version}-tests.jar - ${settings.localRepository}/junit/junit/4.11/junit-4.11.jar - ${settings.localRepository}/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar + ${settings.localRepository}/junit/junit/${junit.version}/junit-${junit.version}.jar + ${settings.localRepository}/org/hamcrest/hamcrest-core/${hamcrest.core.version}/hamcrest-core-${hamcrest.core.version}.jar ${project.build.directory}/test-classes/ diff --git a/pom.xml b/pom.xml index 641eb9a3ce4..b795ba91e9d 100644 --- a/pom.xml +++ b/pom.xml @@ -46,6 +46,9 @@ 1.0.0-RC2 3.0.0 + 2.4 + 4.11 + 1.3 @@ -717,6 +735,12 @@ javassist ${javassist.version} + + org.hamcrest + hamcrest-core + ${hamcrest.core.version} + test + org.freemarker freemarker From 53c70ca598f9821faba2773ff1a743c901a76eb6 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Mon, 27 Nov 2017 17:30:55 -0800 Subject: [PATCH 06/14] - Fixed classpath for tests --- exec/jdbc-all/pom.xml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index d8c2463d3d2..68130e1f4fc 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -46,20 +46,6 @@ - - org.apache.drill - drill-common - ${project.version} - - - javassist - javassist - - - tests - test - - org.apache.drill.exec drill-java-exec @@ -267,9 +253,6 @@ ${settings.localRepository}/org/hamcrest/hamcrest-core/${hamcrest.core.version}/hamcrest-core-${hamcrest.core.version}.jar ${project.build.directory}/test-classes/ - - *:* - ${project.build.directory} From f87882693b9f9cc571e7335542d831fbe3d79d00 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 12:02:05 -0800 Subject: [PATCH 07/14] - Categorized kafka tests - Increased memory size --- .../org/apache/drill/exec/store/kafka/KafkaQueriesTest.java | 4 ++++ .../apache/drill/exec/store/kafka/MessageIteratorTest.java | 4 ++++ .../org/apache/drill/exec/store/kafka/TestKafkaSuit.java | 6 ++++-- .../exec/store/kafka/decoders/MessageReaderFactoryTest.java | 3 +++ pom.xml | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java index fb4842461c4..1f5a1c0403d 100644 --- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java +++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/KafkaQueriesTest.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.Set; +import org.apache.drill.categories.KafkaStorageTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.exec.rpc.RpcException; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.TopicPartition; @@ -30,7 +32,9 @@ import org.junit.Test; import com.google.common.collect.Maps; +import org.junit.experimental.categories.Category; +@Category({KafkaStorageTest.class, SlowTest.class}) public class KafkaQueriesTest extends KafkaTestBase { @Test diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java index aad64e38dab..0b315629564 100644 --- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java +++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/MessageIteratorTest.java @@ -21,6 +21,8 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; +import org.apache.drill.categories.KafkaStorageTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.proto.UserBitShared.DrillPBError.ErrorType; import org.apache.drill.exec.store.kafka.KafkaSubScan.KafkaSubScanSpec; @@ -32,7 +34,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({KafkaStorageTest.class, SlowTest.class}) public class MessageIteratorTest extends KafkaTestBase { private KafkaConsumer kafkaConsumer; diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java index 178c809f5db..34677cbf468 100644 --- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java +++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/TestKafkaSuit.java @@ -22,6 +22,8 @@ import org.I0Itec.zkclient.ZkClient; import org.I0Itec.zkclient.ZkConnection; +import org.apache.drill.categories.KafkaStorageTest; +import org.apache.drill.categories.SlowTest; import org.apache.drill.exec.ZookeeperTestUtil; import org.apache.drill.exec.store.kafka.cluster.EmbeddedKafkaCluster; import org.apache.drill.exec.store.kafka.decoders.MessageReaderFactoryTest; @@ -30,19 +32,19 @@ import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Joiner; - import kafka.admin.AdminUtils; import kafka.admin.RackAwareMode; import kafka.utils.ZKStringSerializer$; import kafka.utils.ZkUtils; +@Category({KafkaStorageTest.class, SlowTest.class}) @RunWith(Suite.class) @SuiteClasses({ KafkaQueriesTest.class, MessageIteratorTest.class, MessageReaderFactoryTest.class }) public class TestKafkaSuit { diff --git a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/decoders/MessageReaderFactoryTest.java b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/decoders/MessageReaderFactoryTest.java index a3cfcf7cf52..796c63a0454 100644 --- a/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/decoders/MessageReaderFactoryTest.java +++ b/contrib/storage-kafka/src/test/java/org/apache/drill/exec/store/kafka/decoders/MessageReaderFactoryTest.java @@ -17,11 +17,14 @@ */ package org.apache.drill.exec.store.kafka.decoders; +import org.apache.drill.categories.KafkaStorageTest; import org.apache.drill.common.exceptions.UserException; import org.apache.drill.exec.proto.UserBitShared.DrillPBError.ErrorType; import org.junit.Assert; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({KafkaStorageTest.class}) public class MessageReaderFactoryTest { @Test diff --git a/pom.xml b/pom.xml index b795ba91e9d..f3a40f55e31 100644 --- a/pom.xml +++ b/pom.xml @@ -460,7 +460,7 @@ - -Xms512m -Xmx3g -Ddrill.exec.http.enabled=false + -Xms512m -Xmx4096g -Ddrill.exec.http.enabled=false -Ddrill.exec.sys.store.provider.local.write=false -Dorg.apache.drill.exec.server.Drillbit.system_options="org.apache.drill.exec.compile.ClassTransformer.scalar_replacement=on" -Ddrill.test.query.printing.silent=true From c594b1164834f5d24e324a227a72edee953e585b Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 12:02:52 -0800 Subject: [PATCH 08/14] - Added missing file --- .../drill/categories/KafkaStorageTest.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java diff --git a/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java b/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java new file mode 100644 index 00000000000..3229a54fc4a --- /dev/null +++ b/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java @@ -0,0 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.drill.categories; + +/** + * This is a category used to mark unit tests that test the Kafka storage plugin. + */ +public interface KafkaStorageTest { +} From 6e0cb95a492d4802a5c85818455274b8525459e5 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 12:11:58 -0800 Subject: [PATCH 09/14] - Fixed memory settings again --- .travis.yml | 3 ++- pom.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47fed6f3900..07f7a46b4d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,5 @@ cache: directories: - "$HOME/.m2" install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 +script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 +-DmemoryGb=3 diff --git a/pom.xml b/pom.xml index f3a40f55e31..3b10876dd50 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,7 @@ 0.6.6 0.9.8 + 4 @@ -460,7 +461,7 @@ - -Xms512m -Xmx4096g -Ddrill.exec.http.enabled=false + -Xms512m -Xmx${memoryGb}g -Ddrill.exec.http.enabled=false -Ddrill.exec.sys.store.provider.local.write=false -Dorg.apache.drill.exec.server.Drillbit.system_options="org.apache.drill.exec.compile.ClassTransformer.scalar_replacement=on" -Ddrill.test.query.printing.silent=true From 474cba2915a883ac559c8071a3016cd854e42e63 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 13:15:26 -0800 Subject: [PATCH 10/14] - Increased memory for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 07f7a46b4d2..da598624399 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,4 @@ cache: - "$HOME/.m2" install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 --DmemoryGb=3 +-DmemoryGb=3.5 From b59a274511c9d125ee242285c3dee7035577fd4f Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 14:18:41 -0800 Subject: [PATCH 11/14] - Ignore broken tests --- .../apache/drill/exec/compile/TestLargeFileCompilation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java index ba936d553bb..5726f3fa7bc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java @@ -21,11 +21,14 @@ import org.apache.drill.test.BaseTestQuery; import org.apache.drill.test.TestTools; import org.apache.drill.exec.ExecConstants; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; + + @Category({SlowTest.class}) public class TestLargeFileCompilation extends BaseTestQuery { @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(150000); // 150secs @@ -120,6 +123,7 @@ private static String createTableWithColsCount(int columnsCount) { return sb.append("full_name\nfrom cp.`employee.json` limit 1)").toString(); } + @Ignore // TODO DRILL-5997 @Test public void testTEXT_WRITER() throws Exception { testNoResult("alter session set `%s`='JDK'", ClassCompilerSelector.JAVA_COMPILER_OPTION); @@ -136,6 +140,7 @@ public void testPARQUET_WRITER() throws Exception { testNoResult(ITERATION_COUNT, LARGE_QUERY_WRITER, "wide_table_parquet"); } + @Ignore // TODO DRILL-5997 @Test public void testGROUP_BY() throws Exception { testNoResult("alter session set `%s`='JDK'", ClassCompilerSelector.JAVA_COMPILER_OPTION); @@ -154,6 +159,7 @@ public void testTOP_N_SORT() throws Exception { testNoResult(ITERATION_COUNT, LARGE_QUERY_ORDER_BY_WITH_LIMIT); } + @Ignore // TODO DRILL-5997 @Test public void testFILTER() throws Exception { testNoResult("alter session set `%s`='JDK'", ClassCompilerSelector.JAVA_COMPILER_OPTION); From fd7ae8f378e9a87cad1f46cfc269709fb1431426 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 14:37:07 -0800 Subject: [PATCH 12/14] - Fixed yml syntax error --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index da598624399..d30a4f69c4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,4 @@ cache: directories: - "$HOME/.m2" install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 --DmemoryGb=3.5 +script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 -DmemoryGb=3.5 From ee57dd7c08f3ca7169885bc1993003e05e385610 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 15:20:47 -0800 Subject: [PATCH 13/14] - More memory config fixes --- .travis.yml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d30a4f69c4b..68d6814100c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ cache: directories: - "$HOME/.m2" install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 -DmemoryGb=3.5 +script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 -DmemoryMb=3584 diff --git a/pom.xml b/pom.xml index 3b10876dd50..e3387e61214 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 0.6.6 0.9.8 - 4 + 4096 @@ -461,7 +461,7 @@ - -Xms512m -Xmx${memoryGb}g -Ddrill.exec.http.enabled=false + -Xms512m -Xmx${memoryMb}m -Ddrill.exec.http.enabled=false -Ddrill.exec.sys.store.provider.local.write=false -Dorg.apache.drill.exec.server.Drillbit.system_options="org.apache.drill.exec.compile.ClassTransformer.scalar_replacement=on" -Ddrill.test.query.printing.silent=true From 365f2b58b36748753a42fb6d85792e1f5d5a9552 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 28 Nov 2017 16:22:53 -0800 Subject: [PATCH 14/14] - Minor code cleanup --- .../apache/drill/exec/compile/TestLargeFileCompilation.java | 2 -- .../apache/drill/exec/expr/fn/impl/TestStringFunctions.java | 1 - .../drill/exec/physical/impl/TestDistributedFragmentRun.java | 3 +++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java index 5726f3fa7bc..9fcb6a3fb73 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestLargeFileCompilation.java @@ -27,8 +27,6 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; - - @Category({SlowTest.class}) public class TestLargeFileCompilation extends BaseTestQuery { @Rule public final TestRule TIMEOUT = TestTools.getTimeoutRule(150000); // 150secs diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java index d0fbe2a286c..56181e6df2e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestStringFunctions.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertTrue; import mockit.integration.junit4.JMockit; -import org.apache.commons.io.FileUtils; import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.categories.SqlFunctionTest; 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 322ee9bfdee..1bbe904cdd8 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 @@ -54,8 +54,11 @@ public void oneBitOneExchangeOneEntryRun() throws Exception{ } assertEquals(100, count); } + + } + @Test public void oneBitOneExchangeTwoEntryRun() throws Exception{ RemoteServiceSet serviceSet = RemoteServiceSet.getLocalServiceSet();