Remove Hive on Spark

mr3project · Aug 12, 2021 · 048f07f · 048f07f
1 parent fdea9fe
commit 048f07f
Show file tree

Hide file tree

Showing 260 changed files with 36 additions and 27,133 deletions.
diff --git a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/JsonParserFactory.java b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/JsonParserFactory.java
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.hive.common.jsonexplain;
 
-import org.apache.hadoop.hive.common.jsonexplain.spark.SparkJsonParser;
 import org.apache.hadoop.hive.common.jsonexplain.tez.TezJsonParser;
 import org.apache.hadoop.hive.conf.HiveConf;
 

diff --git a/common/src/java/org/apache/hadoop/hive/common/jsonexplain/spark/SparkJsonParser.java b/common/src/java/org/apache/hadoop/hive/common/jsonexplain/spark/SparkJsonParser.java
diff --git a/common/src/java/org/apache/hadoop/hive/common/metrics/common/MetricsConstant.java b/common/src/java/org/apache/hadoop/hive/common/metrics/common/MetricsConstant.java
@@ -52,8 +52,6 @@ public class MetricsConstant {
 
   // The number of map reduce tasks executed by the HiveServer2 since the last restart
   public static final String HIVE_MR_TASKS = "hive_mapred_tasks";
-  // The number of spark tasks executed by the HiveServer2 since the last restart
-  public static final String HIVE_SPARK_TASKS = "hive_spark_tasks";
   // The number of tez tasks executed by the HiveServer2 since the last restart
   public static final String HIVE_TEZ_TASKS = "hive_tez_tasks";
   public static final String HS2_OPEN_SESSIONS = "hs2_open_sessions";

diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
diff --git a/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java b/common/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java
@@ -80,19 +80,6 @@ public class PerfLogger {
   public static final String MR3_CREATE_VERTEX = "MR3CreateVertex";
   public static final String MR3_RUN_VERTEX = "MR3RunVertex";
 
-  public static final String SPARK_SUBMIT_TO_RUNNING = "SparkSubmitToRunning";
-  public static final String SPARK_BUILD_PLAN = "SparkBuildPlan";
-  public static final String SPARK_BUILD_RDD_GRAPH = "SparkBuildRDDGraph";
-  public static final String SPARK_SUBMIT_JOB = "SparkSubmitJob";
-  public static final String SPARK_RUN_JOB = "SparkRunJob";
-  public static final String SPARK_CREATE_TRAN = "SparkCreateTran.";
-  public static final String SPARK_RUN_STAGE = "SparkRunStage.";
-  public static final String SPARK_INIT_OPERATORS = "SparkInitializeOperators";
-  public static final String SPARK_GENERATE_TASK_TREE = "SparkGenerateTaskTree";
-  public static final String SPARK_OPTIMIZE_OPERATOR_TREE = "SparkOptimizeOperatorTree";
-  public static final String SPARK_OPTIMIZE_TASK_TREE = "SparkOptimizeTaskTree";
-  public static final String SPARK_FLUSH_HASHTABLE = "SparkFlushHashTable.";
-
   protected final Map<String, Long> startTimes = new HashMap<String, Long>();
   protected final Map<String, Long> endTimes = new HashMap<String, Long>();
 

diff --git a/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java b/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
@@ -168,19 +168,6 @@ public void testHiddenConfig() throws Exception {
     }
   }
 
-  @Test
-  public void testSparkConfigUpdate(){
-    HiveConf conf = new HiveConf();
-    Assert.assertFalse(conf.getSparkConfigUpdated());
-
-    conf.verifyAndSet("spark.master", "yarn");
-    Assert.assertTrue(conf.getSparkConfigUpdated());
-    conf.verifyAndSet("hive.execution.engine", "spark");
-    Assert.assertTrue("Expected spark config updated.", conf.getSparkConfigUpdated());
-
-    conf.setSparkConfigUpdated(false);
-    Assert.assertFalse(conf.getSparkConfigUpdated());
-  }
   @Test
   public void testEncodingDecoding() throws UnsupportedEncodingException {
     HiveConf conf = new HiveConf();

diff --git a/data/conf/perf-reg/spark/hive-site.xml b/data/conf/perf-reg/spark/hive-site.xml