From 47905bd73b278bb2136b906dc525280663702ab7 Mon Sep 17 00:00:00 2001
From: chunhui-shi <cshi@maprtech.com>
Date: Tue, 18 Oct 2016 13:28:00 -0700
Subject: [PATCH] DRILL-4951: Do Guava.patch earlier so we can run single
 Hbase's unit test through command line or IDE

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

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 b503b00cee8..2760ffef789 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 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.
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 5ce823c0bbc..e12c77cc94c 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.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 @@
 
 public class BaseHBaseTest extends BaseTestQuery {
 
-  static {
-    GuavaPatcher.patch();
-  }
-
   private static final String HBASE_STORAGE_PLUGIN_NAME = "hbase";
 
   protected static Configuration conf = HBaseConfiguration.create();
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 2f26914b31d..94084325619 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
@@ -29,6 +29,7 @@
 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;
@@ -37,6 +38,10 @@
 public class ExecTest extends DrillTest {
 
   protected static SystemOptionManager optionManager;
+  static {
+    GuavaPatcher.patch();
+  }
+
   private static final DrillConfig c = DrillConfig.create();
 
   @After