Author: brock
Date: Sun Jul 27 00:42:49 2014
New Revision: 1613742
URL: http://svn.apache.org/r1613742
Log:
HIVE-7523 - Fix spark build after merge merging trunk [Spark Branch]
Modified:
hive/branches/spark/conf/hive-default.xml.template
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkClient.java
Modified: hive/branches/spark/conf/hive-default.xml.template
URL:
http://svn.apache.org/viewvc/hive/branches/spark/conf/hive-default.xml.template?rev=1613742&r1=1613741&r2=1613742&view=diff
==============================================================================
--- hive/branches/spark/conf/hive-default.xml.template (original)
+++ hive/branches/spark/conf/hive-default.xml.template Sun Jul 27 00:42:49 2014
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-
-<!--
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?><!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
@@ -16,8 +14,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--->
-<configuration>
+--><configuration>
<!-- WARNING!!! This file is auto generated for documentation purposes ONLY!
-->
<!-- WARNING!!! Any changes you make to this file will be ignored by Hive.
-->
<!-- WARNING!!! You must make your changes in hive-site.xml instead.
-->
@@ -2867,7 +2864,7 @@
<property>
<key>hive.execution.engine</key>
<value>mr</value>
- <description>Chooses execution engine. Options are: mr (Map reduce,
default) or tez (hadoop 2 only)</description>
+ <description>Chooses execution engine. Options are: mr (Map reduce,
default), tez (hadoop 2 only), spark</description>
</property>
<property>
<key>hive.jar.directory</key>
Modified:
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkClient.java
URL:
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkClient.java?rev=1613742&r1=1613741&r2=1613742&view=diff
==============================================================================
---
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkClient.java
(original)
+++
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/SparkClient.java
Sun Jul 27 00:42:49 2014
@@ -162,7 +162,7 @@ public class SparkClient implements Seri
List<Path> inputPaths;
try {
- inputPaths = Utilities.getInputPaths(jobConf, mapWork, emptyScratchDir,
ctx);
+ inputPaths = Utilities.getInputPaths(jobConf, mapWork, emptyScratchDir,
ctx, false);
} catch (Exception e2) {
e2.printStackTrace();
return -1;
