[
https://issues.apache.org/jira/browse/HIVE-10863?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Xuefu Zhang updated HIVE-10863:
-------------------------------
Comment: was deleted
(was: Unfortunately, the patch is too big to be attached here. I had to commit
the merge and fix anything later on. There are conflicts, as shown below:
{code}
Conflicts:
pom.xml
ql/src/java/org/apache/hadoop/hive/ql/exec/MapJoinOperator.java
ql/src/java/org/apache/hadoop/hive/ql/exec/spark/RemoteHiveSparkClient.java
ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkPlanGenerator.java
ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkUtilities.java
ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java
ql/src/test/results/clientpositive/runtime_skewjoin_mapjoin_spark.q.out
ql/src/test/results/clientpositive/spark/cbo_gby.q.out
ql/src/test/results/clientpositive/spark/cbo_simple_select.q.out
ql/src/test/results/clientpositive/spark/cbo_udf_udaf.q.out
ql/src/test/results/clientpositive/spark/runtime_skewjoin_mapjoin_spark.q.out
ql/src/test/results/clientpositive/spark/union12.q.out
ql/src/test/results/clientpositive/spark/union17.q.out
ql/src/test/results/clientpositive/spark/union20.q.out
ql/src/test/results/clientpositive/spark/union21.q.out
ql/src/test/results/clientpositive/spark/union22.q.out
ql/src/test/results/clientpositive/spark/union24.q.out
ql/src/test/results/clientpositive/spark/union26.q.out
ql/src/test/results/clientpositive/spark/union27.q.out
ql/src/test/results/clientpositive/spark/union31.q.out
ql/src/test/results/clientpositive/spark/union32.q.out
ql/src/test/results/clientpositive/spark/union34.q.out
ql/src/test/results/clientpositive/spark/union_lateralview.q.out
ql/src/test/results/clientpositive/spark/union_remove_12.q.out
ql/src/test/results/clientpositive/spark/union_remove_13.q.out
ql/src/test/results/clientpositive/spark/union_remove_14.q.out
ql/src/test/results/clientpositive/spark/union_remove_22.q.out
ql/src/test/results/clientpositive/spark/union_remove_23.q.out
ql/src/test/results/clientpositive/spark/union_remove_6_subq.q.out
ql/src/test/results/clientpositive/spark/union_top_level.q.out
service/src/java/org/apache/hive/service/cli/thrift/ThriftBinaryCLIService.java
spark-client/src/main/java/org/apache/hive/spark/client/JobContextImpl.java
spark-client/src/main/java/org/apache/hive/spark/client/SparkClientUtilities.java
{code}
I resolved most of them, except some changes from Spark branch is lost. The
diff is shown in the attached mj.patch file. [~jxiang], could you take a look
and see how to apply the diff?
We will need to watch the test result and fix them as needed.
)
> Merge trunk to Spark branch 7/29/2015 [Spark Branch]
> ----------------------------------------------------
>
> Key: HIVE-10863
> URL: https://issues.apache.org/jira/browse/HIVE-10863
> Project: Hive
> Issue Type: Sub-task
> Components: Spark
> Reporter: Xuefu Zhang
> Assignee: Xuefu Zhang
>
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
