Disable store persistence for unit tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/c04e1a81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/c04e1a81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/c04e1a81 Branch: refs/heads/master Commit: c04e1a817d5f2ef8c5474cb153c0c8d3a8bfc2f0 Parents: 41f6616 Author: Aditya Kishore <[email protected]> Authored: Fri Jun 6 19:40:00 2014 -0700 Committer: Jacques Nadeau <[email protected]> Committed: Sun Jun 8 19:13:05 2014 -0700 ---------------------------------------------------------------------- .../apache/drill/common/config/DrillConfig.java | 22 +++++++++++++------- .../drill/hbase/TestHBaseTableProvider.java | 4 +++- .../java/org/apache/drill/BaseTestQuery.java | 10 ++++++++- 3 files changed, 27 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c04e1a81/common/src/main/java/org/apache/drill/common/config/DrillConfig.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java index 8a67d60..1c83040 100644 --- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java +++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java @@ -22,6 +22,7 @@ import java.lang.management.RuntimeMXBean; import java.net.URL; import java.util.Collection; import java.util.List; +import java.util.Properties; import java.util.Queue; import java.util.concurrent.CopyOnWriteArrayList; @@ -53,7 +54,6 @@ public final class DrillConfig extends NestedConfig{ @SuppressWarnings("unchecked") private volatile List<Queue<Object>> sinkQueues = new CopyOnWriteArrayList<Queue<Object>>(new Queue[1]); - @SuppressWarnings("restriction") @VisibleForTesting public DrillConfig(Config config, boolean enableServer) { @@ -83,8 +83,6 @@ public final class DrillConfig extends NestedConfig{ }; - - public List<String> getStartupArguments(){ return startupArguments; } @@ -125,9 +123,16 @@ public final class DrillConfig extends NestedConfig{ return create(overrideFileName, true); } + @VisibleForTesting + public static DrillConfig create(Properties testConfigurations) { + return create(null, testConfigurations, true); + } public static DrillConfig create(String overrideFileName, boolean enableServerConfigs) { + return create(overrideFileName, null, enableServerConfigs); + } + private static DrillConfig create(String overrideFileName, Properties overriderProps, boolean enableServerConfigs) { overrideFileName = overrideFileName == null ? CommonConstants.CONFIG_OVERRIDE : overrideFileName; // first we load defaults. @@ -138,8 +143,12 @@ public final class DrillConfig extends NestedConfig{ fallback = ConfigFactory.parseURL(url).withFallback(fallback); } - Config c = ConfigFactory.load(overrideFileName).withFallback(fallback).resolve(); - return new DrillConfig(c, enableServerConfigs); + Config effectiveConfig = ConfigFactory.load(overrideFileName).withFallback(fallback); + if (overriderProps != null) { + effectiveConfig = ConfigFactory.parseProperties(overriderProps).withFallback(effectiveConfig); + } + + return new DrillConfig(effectiveConfig.resolve(), enableServerConfigs); } public <T> Class<T> getClassAt(String location, Class<T> clazz) throws DrillConfigurationException{ @@ -170,8 +179,6 @@ public final class DrillConfig extends NestedConfig{ } } - - public void setSinkQueues(int number, Queue<Object> queue){ sinkQueues.set(number, queue); } @@ -199,4 +206,5 @@ public final class DrillConfig extends NestedConfig{ public static long getMaxDirectMemory(){ return MAX_DIRECT_MEMORY; } + } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c04e1a81/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java ---------------------------------------------------------------------- diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java index e26f647..8fb7b39 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseTableProvider.java @@ -96,6 +96,8 @@ public class TestHBaseTableProvider extends BaseHBaseTest { @AfterClass public static void tearDownTestHBaseTableProvider() { - provider.close(); + if (provider != null) { + provider.close(); + } } } http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c04e1a81/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java b/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java index 5458adc..562d7e8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java +++ b/exec/java-exec/src/test/java/org/apache/drill/BaseTestQuery.java @@ -20,6 +20,7 @@ package org.apache.drill; import java.io.IOException; import java.net.URL; import java.util.List; +import java.util.Properties; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; @@ -55,6 +56,13 @@ public class BaseTestQuery extends ExecTest{ private static final String ENABLE_FULL_CACHE = "drill.exec.test.use-full-cache"; + @SuppressWarnings("serial") + private static final Properties TEST_CONFIGURATIONS = new Properties() { + { + put("drill.exec.sys.store.provider.local.write", "false"); + } + }; + public final TestRule resetWatcher = new TestWatcher() { @Override protected void failed(Throwable e, Description description) { @@ -80,7 +88,7 @@ public class BaseTestQuery extends ExecTest{ @BeforeClass public static void openClient() throws Exception{ - config = DrillConfig.create(); + config = DrillConfig.create(TEST_CONFIGURATIONS); allocator = new TopLevelAllocator(config); if(config.hasPath(ENABLE_FULL_CACHE) && config.getBoolean(ENABLE_FULL_CACHE)){ serviceSet = RemoteServiceSet.getServiceSetWithFullCache(config, allocator);
