hive git commit: HIVE-18436: Upgrade to Spark 2.3.0 (Sahil Takiar, reviewed by Rui Li)

2018-03-09 Thread stakiar 
Repository: hive
Updated Branches:
  refs/heads/master b362de387 -> 41afa4e21


HIVE-18436: Upgrade to Spark 2.3.0 (Sahil Takiar, reviewed by Rui Li)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/41afa4e2
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/41afa4e2
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/41afa4e2

Branch: refs/heads/master
Commit: 41afa4e2185b45b0bb6816baaea330d9ed40d127
Parents: b362de3
Author: Sahil Takiar 
Authored: Fri Mar 9 18:54:42 2018 -0800
Committer: Sahil Takiar 
Committed: Fri Mar 9 18:54:42 2018 -0800

--
 itests/pom.xml | 4 ++--
 pom.xml| 4 ++--
 .../apache/hadoop/hive/ql/exec/spark/LocalHiveSparkClient.java | 2 +-
 .../org/apache/hive/spark/client/rpc/TestKryoMessageCodec.java | 3 ++-
 .../test/java/org/apache/hive/spark/client/rpc/TestRpc.java| 6 --
 5 files changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/41afa4e2/itests/pom.xml
--
diff --git a/itests/pom.xml b/itests/pom.xml
index a782cd2..40bb054 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -99,10 +99,10 @@
   cd -
 fi
 tar -zxf $DOWNLOAD_DIR/$tarName -C $BASE_DIR
-mv 
$BASE_DIR/spark-${spark.version}-bin-hadoop2-without-hive $BASE_DIR/$finalName
+mv 
$BASE_DIR/spark-${spark.version}-bin-hadoop3-beta1-without-hive 
$BASE_DIR/$finalName
   }
   mkdir -p $DOWNLOAD_DIR
-  download 
"http://d3jw87u4immizc.cloudfront.net/spark-tarball/spark-${spark.version}-bin-hadoop2-without-hive.tgz;
 "spark"
+  download 
"http://d3jw87u4immizc.cloudfront.net/spark-tarball/spark-${spark.version}-bin-hadoop3-beta1-without-hive.tgz;
 "spark"
   cp -f $HIVE_ROOT/data/conf/spark/log4j2.properties 
$BASE_DIR/spark/conf/
 
   

http://git-wip-us.apache.org/repos/asf/hive/blob/41afa4e2/pom.xml
--
diff --git a/pom.xml b/pom.xml
index a242fbf..5be30f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
 1.4.3
 1.10.19
 2.0.0-M5
-4.0.52.Final
+4.1.17.Final
 3.10.5.Final
 1.9.0
 0.16.0
@@ -198,7 +198,7 @@
 0.9.1
 0.92.0-incubating
 2.2.0
-2.2.0
+2.3.0
 2.11
 2.11.8
 1.1

http://git-wip-us.apache.org/repos/asf/hive/blob/41afa4e2/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/LocalHiveSparkClient.java
--
diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/LocalHiveSparkClient.java 
b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/LocalHiveSparkClient.java
index f43b449..dff3b0f 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/LocalHiveSparkClient.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/LocalHiveSparkClient.java
@@ -104,7 +104,7 @@ public class LocalHiveSparkClient implements 
HiveSparkClient {
   sc.addJar(regJar);
 }
 jobMetricsListener = new JobMetricsListener();
-sc.sc().listenerBus().addListener(jobMetricsListener);
+sc.sc().addSparkListener(jobMetricsListener);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hive/blob/41afa4e2/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestKryoMessageCodec.java
--
diff --git 
a/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestKryoMessageCodec.java
 
b/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestKryoMessageCodec.java
index 24858d7..fb73647 100644
--- 
a/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestKryoMessageCodec.java
+++ 
b/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestKryoMessageCodec.java
@@ -72,7 +72,8 @@ public class TestKryoMessageCodec {
 c.writeAndFlush(MESSAGE);
 assertEquals(1, c.outboundMessages().size());
 
assertFalse(MESSAGE.getClass().equals(c.outboundMessages().peek().getClass()));
-c.writeInbound(c.readOutbound());
+Object readOutboundResult = c.readOutbound();
+c.writeInbound(readOutboundResult);
 assertEquals(1, c.inboundMessages().size());
 assertEquals(MESSAGE, c.readInbound());
 c.close();

http://git-wip-us.apache.org/repos/asf/hive/blob/41afa4e2/spark-client/src/test/java/org/apache/hive/spark/client/rpc/TestRpc.java

hive git commit: Revert "HIVE-18668: Really shade guava in ql (Zoltan Haindrich reviewed by Ashutosh Chauhan)"

2018-03-09 Thread sershe 
Repository: hive
Updated Branches:
  refs/heads/master 34eb9ed10 -> b362de387


Revert "HIVE-18668: Really shade guava in ql (Zoltan Haindrich reviewed by 
Ashutosh Chauhan)"

This reverts commit 91889089c77c231aeead606ae89f580a80b7ada8.


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/b362de38
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/b362de38
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/b362de38

Branch: refs/heads/master
Commit: b362de3871764731d8371657b07140e37a3c5105
Parents: 34eb9ed
Author: sergey 
Authored: Fri Mar 9 12:52:46 2018 -0800
Committer: sergey 
Committed: Fri Mar 9 12:53:05 2018 -0800

--
 ql/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/b362de38/ql/pom.xml
--
diff --git a/ql/pom.xml b/ql/pom.xml
index 5f917c1..1f35bc6 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -915,7 +915,7 @@
   io.airlift:aircompressor
   org.codehaus.jackson:jackson-core-asl
   org.codehaus.jackson:jackson-mapper-asl
-  com.google.common:guava-common
+  com.google.guava:guava
   net.sf.opencsv:opencsv
   org.apache.hive:hive-spark-client
   org.apache.hive:hive-storage-api

hive git commit: HIVE-18918 - Bad error message in CompactorMR.lanuchCompactionJob() (Eugene Koifman, reviewed by Jason Dere)

2018-03-09 Thread ekoifman 
Repository: hive
Updated Branches:
  refs/heads/master 73ccc4423 -> 34eb9ed10


HIVE-18918 - Bad error message in CompactorMR.lanuchCompactionJob() (Eugene 
Koifman, reviewed by Jason Dere)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/34eb9ed1
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/34eb9ed1
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/34eb9ed1

Branch: refs/heads/master
Commit: 34eb9ed104af2b712301a6d6fa8a14fe3f9afd34
Parents: 73ccc44
Author: Eugene Koifman 
Authored: Fri Mar 9 08:44:06 2018 -0800
Committer: Eugene Koifman 
Committed: Fri Mar 9 08:44:06 2018 -0800

--
 .../java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/34eb9ed1/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
--
diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java 
b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
index 4870a90..b1c2288 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/CompactorMR.java
@@ -342,7 +342,7 @@ public class CompactorMR {
   txnHandler.setHadoopJobId(rj.getID().toString(), id);
   rj.waitForCompletion();
   if (!rj.isSuccessful()) {
-throw new IOException(compactionType == CompactionType.MAJOR ? "Major" 
: "Minor" +
+throw new IOException((compactionType == CompactionType.MAJOR ? 
"Major" : "Minor") +
" compactor job failed for " + jobName + "! Hadoop JobId: " + 
rj.getID());
   }
 } finally {