drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sudhe...@apache.org
Subject [1/5] drill git commit: DRILL-4951: Do Guava.patch earlier so we can run single Hbase's unit test through command line or IDE
Date Wed, 02 Nov 2016 18:47:07 GMT
Repository: drill
Updated Branches:
  refs/heads/master 83513daf0 -> 190d5d46d


DRILL-4951: Do Guava.patch earlier so we can run single Hbase's unit test through command
line or IDE

closes #636


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/e146aebe
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/e146aebe
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/e146aebe

Branch: refs/heads/master
Commit: e146aebe52038a17b43a1bb67852380d11f40cbe
Parents: 6782f0a
Author: chunhui-shi <cshi@maprtech.com>
Authored: Tue Oct 18 13:28:00 2016 -0700
Committer: Sudheesh Katkam <skatkam@maprtech.com>
Committed: Wed Nov 2 10:56:01 2016 -0700

----------------------------------------------------------------------
 .../java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java     | 5 ++---
 .../src/test/java/org/apache/drill/hbase/BaseHBaseTest.java     | 5 -----
 .../java-exec/src/test/java/org/apache/drill/exec/ExecTest.java | 5 +++++
 3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/e146aebe/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
index b503b00..2760ffe 100644
--- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
+++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java
@@ -22,7 +22,6 @@ import java.util.List;
 import org.apache.drill.BaseTestQuery;
 import org.apache.drill.exec.exception.SchemaChangeException;
 import org.apache.drill.exec.rpc.user.QueryDataBatch;
-import org.apache.drill.exec.util.GuavaPatcher;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -33,8 +32,8 @@ public class BaseJsonTest extends BaseTestQuery {
 
   @BeforeClass
   public static void setupDefaultTestCluster() throws Exception {
-    // Invoke the Guava patcher before any code
-    GuavaPatcher.patch();
+    // GuavaPatcher.patch is invoked in ExecTest ExecTest-->BaseTestQuery
+    // GuavaPatcher.patch();
 
     // Since we override the class initializer of parent class,
     // invoke it explicitly. This will setup a Drill cluster.

http://git-wip-us.apache.org/repos/asf/drill/blob/e146aebe/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
----------------------------------------------------------------------
diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
index 5ce823c..e12c77c 100644
--- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
+++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java
@@ -27,7 +27,6 @@ import org.apache.drill.exec.rpc.user.QueryDataBatch;
 import org.apache.drill.exec.store.StoragePluginRegistry;
 import org.apache.drill.exec.store.hbase.HBaseStoragePlugin;
 import org.apache.drill.exec.store.hbase.HBaseStoragePluginConfig;
-import org.apache.drill.exec.util.GuavaPatcher;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.junit.AfterClass;
@@ -39,10 +38,6 @@ import com.google.common.io.Files;
 
 public class BaseHBaseTest extends BaseTestQuery {
 
-  static {
-    GuavaPatcher.patch();
-  }
-
   private static final String HBASE_STORAGE_PLUGIN_NAME = "hbase";
 
   protected static Configuration conf = HBaseConfiguration.create();

http://git-wip-us.apache.org/repos/asf/drill/blob/e146aebe/exec/java-exec/src/test/java/org/apache/drill/exec/ExecTest.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/ExecTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/ExecTest.java
index 05f0a8d..c13dc48 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/ExecTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/ExecTest.java
@@ -31,6 +31,7 @@ import org.apache.drill.exec.planner.PhysicalPlanReaderTestFactory;
 import org.apache.drill.exec.server.DrillbitContext;
 import org.apache.drill.exec.server.options.SystemOptionManager;
 import org.apache.drill.exec.store.sys.store.provider.LocalPersistentStoreProvider;
+import org.apache.drill.exec.util.GuavaPatcher;
 import org.apache.drill.test.DrillTest;
 import org.junit.After;
 import org.junit.BeforeClass;
@@ -41,6 +42,10 @@ import java.io.File;
 public class ExecTest extends DrillTest {
 
   protected static SystemOptionManager optionManager;
+  static {
+    GuavaPatcher.patch();
+  }
+
   private static final DrillConfig c = DrillConfig.create();
 
   @After


Mime
View raw message