DRILL-6278: Removed temp codegen directory in testing framework. close apache/drill#1178
Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/7f645565 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/7f645565 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/7f645565 Branch: refs/heads/master Commit: 7f645565cd68b1780e643bc20a43951610704008 Parents: 67710bb Author: Timothy Farkas <[email protected]> Authored: Tue Mar 20 23:00:22 2018 -0700 Committer: Aman Sinha <[email protected]> Committed: Thu Mar 29 23:22:25 2018 -0700 ---------------------------------------------------------------------- .../drill/exec/physical/impl/TopN/TopNBatchTest.java | 6 +----- .../java/org/apache/drill/test/BaseDirTestWatcher.java | 10 ---------- .../test/java/org/apache/drill/test/BaseTestQuery.java | 1 - .../test/java/org/apache/drill/test/ClusterFixture.java | 1 - 4 files changed, 1 insertion(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/7f645565/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java index 4860869..14f2ee8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java @@ -63,8 +63,6 @@ public class TopNBatchTest extends PopUnitTestBase { @Test public void priorityQueueOrderingTest() throws Exception { Properties properties = new Properties(); - properties.setProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getDir().getAbsolutePath()); - DrillConfig drillConfig = DrillConfig.create(properties); FieldReference expr = FieldReference.getWithQuotedRef("colA"); @@ -158,9 +156,7 @@ public class TopNBatchTest extends PopUnitTestBase { */ @Test public void sortOneKeyAscending() throws Throwable { - ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher) - .configProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getDir().getAbsolutePath()) - .configProperty(CodeCompiler.ENABLE_SAVE_CODE_FOR_DEBUG_TOPN, true); + ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher); try (ClusterFixture cluster = builder.build(); ClientFixture client = cluster.clientFixture()) { TestBuilder testBuilder = new TestBuilder(new ClusterFixture.FixtureTestServices(client)); http://git-wip-us.apache.org/repos/asf/drill/blob/7f645565/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java index d36423b..b595869 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java @@ -53,7 +53,6 @@ public class BaseDirTestWatcher extends DirTestWatcher { TEST_TMP // Corresponds to the directory that should be mapped to dfs.tmp } - private File codegenDir; private File tmpDir; private File storeDir; private File dfsTestTmpParentDir; @@ -79,7 +78,6 @@ public class BaseDirTestWatcher extends DirTestWatcher { protected void starting(Description description) { super.starting(description); - codegenDir = makeSubDir(Paths.get("codegen")); rootDir = makeSubDir(Paths.get("root")); tmpDir = makeSubDir(Paths.get("tmp")); storeDir = makeSubDir(Paths.get("store")); @@ -135,14 +133,6 @@ public class BaseDirTestWatcher extends DirTestWatcher { } /** - * Gets the temp directory that should be used to save generated code files. - * @return The temp directory that should be used to save generated code files. - */ - public File getCodegenDir() { - return codegenDir; - } - - /** * This methods creates a new directory which can be mapped to <b>dfs.tmp</b>. */ public void newDfsTestTmpDir() { http://git-wip-us.apache.org/repos/asf/drill/blob/7f645565/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java index c3ecaf1..10cd94c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java @@ -160,7 +160,6 @@ public class BaseTestQuery extends ExecTest { props.put(propName, TEST_CONFIGURATIONS.getProperty(propName)); } - props.setProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getCodegenDir().getAbsolutePath()); props.setProperty(ExecConstants.DRILL_TMP_DIR, dirTestWatcher.getTmpDir().getAbsolutePath()); props.setProperty(ExecConstants.SYS_STORE_PROVIDER_LOCAL_PATH, dirTestWatcher.getStoreDir().getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/drill/blob/7f645565/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java index 6dbdacd..d212014 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java @@ -516,7 +516,6 @@ public class ClusterFixture extends BaseFixture implements AutoCloseable { .sessionOption(ExecConstants.MAX_WIDTH_PER_NODE_KEY, MAX_WIDTH_PER_NODE); Properties props = new Properties(); props.putAll(ClusterFixture.TEST_CONFIGURATIONS); - props.setProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getCodegenDir().getAbsolutePath()); props.setProperty(ExecConstants.DRILL_TMP_DIR, dirTestWatcher.getTmpDir().getAbsolutePath()); props.setProperty(ExecConstants.SYS_STORE_PROVIDER_LOCAL_PATH, dirTestWatcher.getStoreDir().getAbsolutePath());
