From c9b61422b53801a953acb1490329a0d71e33c5de Mon Sep 17 00:00:00 2001 From: Na Yang Date: Mon, 18 Aug 2014 14:29:38 -0700 Subject: [PATCH] HIVE-7530: Go thru the common code to find references to HIVE_EXECUCTION_ENGINE to make sure conditions works with Spark --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java | 4 ++++ .../org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java | 2 ++ 2 files changed, 6 insertions(+) diff --git ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java index cebde2b..d9c546a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java @@ -1287,6 +1287,10 @@ public static void createMRWorkForMergingFiles (FileSinkOperator fsInput, work = new TezWork(conf.getVar(HiveConf.ConfVars.HIVEQUERYID)); cplan.setName("Merge"); ((TezWork)work).add(cplan); + } else if (conf.getVar(ConfVars.HIVE_EXECUTION_ENGINE).equals("spark")) { + work = new SparkWork(conf.getVar(HiveConf.ConfVars.HIVEQUERYID)); + cplan.setName("Merge"); + ((SparkWork)work).add(cplan); } else { work = new MapredWork(); ((MapredWork)work).setMapWork(cplan); diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java index 298a465..4582678 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/ConditionalResolverMergeFiles.java @@ -149,6 +149,8 @@ public void setLbCtx(ListBucketingCtx lbCtx) { work = ((MapredWork) mrTask.getWork()).getMapWork(); } else if (mrTask.getWork() instanceof TezWork){ work = (MapWork) ((TezWork) mrTask.getWork()).getAllWork().get(0); + } else if (mrTask.getWork() instanceof SparkWork){ + work = (MapWork) ((SparkWork) mrTask.getWork()).getAllWork().get(0); } else { work = (MapWork) mrTask.getWork(); } -- 1.8.5.2 (Apple Git-48)