fix hive test case

Author: QiangCai

integration/hive/pom.xml

@@ -36,6 +36,26 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <artifactId>hadoop-yarn-registry</artifactId>
+            <groupId>org.apache.hadoop</groupId>
+            <version>${hadoop.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+            <version>${hadoop.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
@@ -61,6 +81,10 @@
                     <artifactId>kryo</artifactId>
                     <groupId>com.esotericsoftware.kryo</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>hadoop-yarn-registry</artifactId>
+                    <groupId>org.apache.hadoop</groupId>
+                </exclusion>
             </exclusions>
             <scope>compile</scope>
         </dependency>
@@ -109,6 +133,12 @@
             <artifactId>tez-dag</artifactId>
             <version>0.9.1</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hadoop-yarn-client</artifactId>
+                    <groupId>org.apache.hadoop</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>

integration/hive/src/main/java/org/apache/carbondata/hive/test/server/HiveEmbeddedServer2.java

@@ -32,7 +32,6 @@
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
 import org.apache.hadoop.hive.ql.metadata.Hive;
-import org.apache.hadoop.hive.ql.session.SessionState;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
 import org.apache.hive.service.Service;
 import org.apache.hive.service.cli.CLIService;
@@ -47,15 +46,15 @@
  * a child JVM (which Hive calls local) or external.
  */
 public class HiveEmbeddedServer2 {
-  private String SCRATCH_DIR = "";
+  private String STORE_DIR = "";
   private static final Logger log = LogServiceFactory.getLogService(Hive.class.getName());
   private HiveServer2 hiveServer;
   private HiveConf config;
   private int port;
 
   public void start(String storePath) throws Exception {
     log.info("Starting Hive Local/Embedded Server...");
-    SCRATCH_DIR = storePath;
+    STORE_DIR = storePath;
     if (hiveServer == null) {
       System.setProperty("datanucleus.schema.autoCreateAll", "true");
       System.setProperty("hive.metastore.schema.verification", "false");
@@ -114,20 +113,17 @@ private CLIService getServiceClientInternal() {
 
   private HiveConf configure() throws Exception {
     log.info("Setting The Hive Conf Variables");
-    String scratchDir = SCRATCH_DIR;
-
     Configuration cfg = new Configuration();
     HiveConf conf = new HiveConf(cfg, HiveConf.class);
     conf.addToRestrictList("columns.comments");
     conf.set("hive.scratch.dir.permission", "777");
     conf.setVar(ConfVars.SCRATCHDIRPERMISSION, "777");
-
-    conf.set("hive.metastore.warehouse.dir", scratchDir + "/warehouse");
-    conf.set("hive.metastore.metadb.dir", scratchDir + "/metastore_db");
-    conf.set("hive.exec.scratchdir", scratchDir);
+    conf.set("hive.metastore.warehouse.dir", STORE_DIR + "/warehouse");
+    conf.set("hive.metastore.metadb.dir", STORE_DIR + "/metastore_db");
+    conf.set("hive.exec.scratchdir", STORE_DIR + "/scratch");
     conf.set("fs.permissions.umask-mode", "000");
     conf.set("javax.jdo.option.ConnectionURL",
-        "jdbc:derby:;databaseName=" + scratchDir + "/metastore_db" + ";create=true");
+        "jdbc:derby:;databaseName=" + STORE_DIR + "/metastore_db" + ";create=true");
     conf.set("hive.metastore.local", "true");
     conf.set("hive.aux.jars.path", "");
     conf.set("hive.added.jars.path", "");
@@ -146,9 +142,6 @@ private HiveConf configure() throws Exception {
     props.remove("mapreduce.framework.name");
     props.setProperty("fs.default.name", "file:///");
 
-    // intercept SessionState to clean the threadlocal
-    Field tss = SessionState.class.getDeclaredField("tss");
-    tss.setAccessible(true);
     return conf;
   }
 

integration/hive/src/test/java/org/apache/carbondata/hive/HiveCarbonTest.java

@@ -83,7 +83,7 @@ public void verifyLocalDictionaryValues() throws Exception {
     statement.execute("CREATE TABLE hive_carbon_table(shortField SMALLINT , intField INT, bigintField BIGINT , doubleField DOUBLE, stringField STRING, timestampField TIMESTAMP, decimalField DECIMAL(18,2), dateField DATE, charField CHAR(5), floatField FLOAT) stored by 'org.apache.carbondata.hive.CarbonStorageHandler' TBLPROPERTIES ('local_dictionary_enable'='true','local_dictionary_include'='stringField')");
     statement.execute("insert into hive_carbon_table select * from hive_table");
     File rootPath = new File(HiveTestUtils.class.getResource("/").getPath() + "../../../..");
-    String storePath = rootPath.getAbsolutePath() + "/integration/hive/target/warehouse/warehouse/hive_carbon_table/";
+    String storePath = rootPath.getAbsolutePath() + "/integration/hive/target/warehouse/hive_carbon_table/";
     ArrayList<DimensionRawColumnChunk> dimRawChunk = CarbonTestUtil.getDimRawChunk(storePath, 0);
     String[] dictionaryData = new String[]{"hive", "impala", "flink", "spark"};
     assert(CarbonTestUtil.validateDictionary(dimRawChunk.get(0), dictionaryData));

integration/hive/src/test/java/org/apache/carbondata/hive/HiveTestUtils.java

@@ -45,8 +45,8 @@ public HiveTestUtils() {
   static {
     try {
       File rootPath = new File(HiveTestUtils.class.getResource("/").getPath() + "../../../..");
-      String targetLoc = rootPath.getAbsolutePath() + "/integration/hive/target/warehouse";
-      String metadatadbLoc = rootPath.getAbsolutePath() + "/integration/hive/target/metastore_db";
+      String targetLoc = rootPath.getCanonicalPath() + "/integration/hive/target";
+      String metadatadbLoc = targetLoc + "/metastore_db";
       File file = new File(metadatadbLoc);
       if (file.exists()) {
         file.delete();