aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Chevychalov <cab@arenadata.io>2017-09-14 15:01:06 +0300
committerYoungwoo Kim <ywkim@apache.org>2017-12-23 16:39:18 +0900
commit62e9c3ad9c7dffda839c90bbb71bc8e7f0ee6557 (patch)
treed48887ffddf6004776d9c56f1a6668f0a60a5a9d
parentfb26cdadd11d6b0164ac25bca7a5fb8f4d1f97cf (diff)
BIGTOP-2895 Bump Pig to 0.17.0 with Hadoop-2.8
Bump Pig to 0.17.0. Remove useless patches PIG-4676 and PIG-4728 it is already in 0.17 release. Add patch PIG-5304 to build pig with Hadoop 2.8 Signed-off-by: Youngwoo Kim <ywkim@apache.org>
-rw-r--r--bigtop-packages/src/common/pig/patch0-PIG-5304-Fix-build-issue-with-Hadoop-2.8.diff30
-rw-r--r--bigtop-packages/src/common/pig/patch1-PIG-4676.diff93
-rw-r--r--bigtop-packages/src/common/pig/patch2-PIG-4728.diff36
-rw-r--r--bigtop.bom2
4 files changed, 31 insertions, 130 deletions
diff --git a/bigtop-packages/src/common/pig/patch0-PIG-5304-Fix-build-issue-with-Hadoop-2.8.diff b/bigtop-packages/src/common/pig/patch0-PIG-5304-Fix-build-issue-with-Hadoop-2.8.diff
new file mode 100644
index 00000000..044e1128
--- /dev/null
+++ b/bigtop-packages/src/common/pig/patch0-PIG-5304-Fix-build-issue-with-Hadoop-2.8.diff
@@ -0,0 +1,30 @@
+From 65b931966108f374210b83368b8356a79058226d Mon Sep 17 00:00:00 2001
+From: Anton Chevychalov <cab@arenadata.io>
+Date: Thu, 14 Sep 2017 11:58:21 +0300
+Subject: [PATCH] PIG-5304 Fix build issue with Hadoop 2.8
+
+There is a regression in build after HDFS-8740.
+We have to add hadoop-hdfs-client artifact as dependency now.
+---
+ ivy.xml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/ivy.xml b/ivy.xml
+index db722a5..2978888 100644
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -129,6 +129,11 @@
+ <artifact name="hadoop-hdfs" ext="jar" />
+ <artifact name="hadoop-hdfs" type="tests" ext="jar" m:classifier="tests" />
+ </dependency>
++ <dependency org="org.apache.hadoop" name="hadoop-hdfs-client"
++ rev="${hadoop-hdfs.version}" conf="hadoop2->master">
++ <artifact name="hadoop-hdfs-client" ext="jar" />
++ <artifact name="hadoop-hdfs-client" type="tests" ext="jar" m:classifier="tests" />
++ </dependency>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-core" rev="${hadoop-mapreduce.version}"
+ conf="hadoop2->master"/>
+ <dependency org="org.apache.hadoop" name="hadoop-mapreduce-client-jobclient" rev="${hadoop-mapreduce.version}"
+--
+2.7.4
+
diff --git a/bigtop-packages/src/common/pig/patch1-PIG-4676.diff b/bigtop-packages/src/common/pig/patch1-PIG-4676.diff
deleted file mode 100644
index 2844116f..00000000
--- a/bigtop-packages/src/common/pig/patch1-PIG-4676.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -ur pig-0.15.0-src_/ivy/libraries.properties pig-0.15.0-src/ivy/libraries.properties
---- pig-0.15.0-src_/ivy/libraries.properties 2015-06-01 20:32:30.000000000 +0200
-+++ pig-0.15.0-src/ivy/libraries.properties 2015-09-18 11:32:06.063454643 +0200
-@@ -47,7 +47,7 @@
- hbase94.version=0.94.1
- hbase95.version=0.98.12-${hbase.hadoop.version}
- hsqldb.version=1.8.0.10
--hive.version=0.14.0
-+hive.version=1.2.1
- httpcomponents.version=4.1
- jackson.version=1.8.8
- jackson-pig-3039-test.version=1.9.9
-@@ -98,3 +98,4 @@
- leveldbjni.version=1.8
- curator.version=2.6.0
- htrace.version=3.1.0-incubating
-+commons-lang3.version=3.1
-diff -ur pig-0.15.0-src_/ivy.xml pig-0.15.0-src/ivy.xml
---- pig-0.15.0-src_/ivy.xml 2015-06-01 20:32:30.000000000 +0200
-+++ pig-0.15.0-src/ivy.xml 2015-09-18 11:32:06.067454643 +0200
-@@ -417,8 +417,6 @@
- conf="compile->master" />
- <dependency org="org.apache.hive.shims" name="hive-shims-common" rev="${hive.version}" changing="true"
- conf="compile->master" />
-- <dependency org="org.apache.hive.shims" name="hive-shims-common-secure" rev="${hive.version}" changing="true"
-- conf="compile->master" />
- <dependency org="org.apache.hive.shims" name="hive-shims-0.23" rev="${hive.version}" changing="true"
- conf="hadoop23->master" />
- <dependency org="org.apache.hive.shims" name="hive-shims-0.20S" rev="${hive.version}" changing="true"
-@@ -427,6 +425,8 @@
- conf="test->master" />
- <dependency org="com.esotericsoftware.kryo" name="kryo" rev="${kryo.version}"
- conf="compile->master" />
-+ <dependency org="org.apache.commons" name="commons-lang3" rev="${commons-lang3.version}"
-+ conf="compile->master" />
-
- <dependency org="org.vafer" name="jdeb" rev="${jdeb.version}"
- conf="compile->master">
-diff -ur pig-0.15.0-src_/src/org/apache/pig/builtin/HiveUDFBase.java pig-0.15.0-src/src/org/apache/pig/builtin/HiveUDFBase.java
---- pig-0.15.0-src_/src/org/apache/pig/builtin/HiveUDFBase.java 2015-06-01 20:32:27.000000000 +0200
-+++ pig-0.15.0-src/src/org/apache/pig/builtin/HiveUDFBase.java 2015-09-18 11:32:06.067454643 +0200
-@@ -28,6 +28,7 @@
- import org.apache.hadoop.hive.ql.exec.MapredContext;
- import org.apache.hadoop.hive.ql.exec.UDAF;
- import org.apache.hadoop.hive.ql.exec.UDF;
-+import org.apache.hadoop.hive.ql.parse.SemanticException;
- import org.apache.hadoop.hive.ql.udf.generic.Collector;
- import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFResolver;
- import org.apache.hadoop.hive.ql.udf.generic.GenericUDF;
-@@ -103,7 +104,12 @@
- String className = funcName;
- Class udfClass;
- if (FunctionRegistry.getFunctionNames().contains(funcName)) {
-- FunctionInfo func = FunctionRegistry.getFunctionInfo(funcName);
-+ FunctionInfo func;
-+ try {
-+ func = FunctionRegistry.getFunctionInfo(funcName);
-+ } catch (SemanticException e) {
-+ throw new IOException(e);
-+ }
- udfClass = func.getFunctionClass();
- } else {
- udfClass = PigContext.resolveClassName(className);
-diff -ur pig-0.15.0-src_/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java pig-0.15.0-src/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java
---- pig-0.15.0-src_/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java 2015-06-01 20:32:30.000000000 +0200
-+++ pig-0.15.0-src/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java 2015-09-18 11:32:06.067454643 +0200
-@@ -50,10 +50,9 @@
- hadoopVersion = "23";
- }
- String[] expectedJars = new String[] {"hive-common", "hive-exec", "hive-serde",
-- "hive-shims-0." + hadoopVersion, "hive-shims-common-0", "hive-shims-common-secure",
-- "kryo"};
-+ "hive-shims-0." + hadoopVersion, "hive-shims-common", "kryo"};
-
-- checkPlan(pp, expectedJars, 7, pigServer.getPigContext());
-+ checkPlan(pp, expectedJars, 6, pigServer.getPigContext());
- }
-
- @Test
-@@ -67,10 +66,9 @@
- hadoopVersion = "23";
- }
- String[] expectedJars = new String[] {"hive-common", "hive-exec", "hive-serde",
-- "hive-shims-0." + hadoopVersion, "hive-shims-common-0", "hive-shims-common-secure",
-- "kryo"};
-+ "hive-shims-0." + hadoopVersion, "hive-shims-common", "kryo"};
-
-- checkPlan(pp, expectedJars, 7, pigServer.getPigContext());
-+ checkPlan(pp, expectedJars, 6, pigServer.getPigContext());
- }
-
- @Test
-Nur in pig-0.15.0-src/test/org/apache/pig/test: TestLoaderStorerShipCacheFiles.java.orig.
diff --git a/bigtop-packages/src/common/pig/patch2-PIG-4728.diff b/bigtop-packages/src/common/pig/patch2-PIG-4728.diff
deleted file mode 100644
index ed27aabf..00000000
--- a/bigtop-packages/src/common/pig/patch2-PIG-4728.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/ivy.xml b/ivy.xml
-index 96e9636..a9ccdf6 100644
---- a/ivy.xml
-+++ b/ivy.xml
-@@ -249,7 +249,8 @@
- <dependency org="org.antlr" name="antlr-runtime" rev="${antlr.version}" conf="compile->default"/>
- <dependency org="org.antlr" name="ST4" rev="${stringtemplate.version}" conf="compile->default"/>
- <dependency org="org.apache.zookeeper" name="zookeeper" rev="${zookeeper.version}" conf="compile->master"/>
-- <dependency org="io.netty" name="netty" rev="${netty.version}" conf="test->master"/>
-+ <dependency org="io.netty" name="netty-all" rev="${netty.version}" conf="test->master"/>
-+ <dependency org="io.netty" name="netty" rev="3.6.6.Final" conf="test->master"/>
- <dependency org="dk.brics.automaton" name="automaton" rev="1.11-8" conf="compile->default"/>
-
- <dependency org="org.jruby" name="jruby-complete" rev="${jruby.version}" conf="compile->master"/>
-@@ -354,6 +355,8 @@
- <exclude org="asm" module="asm"/>
- </dependency>
-
-+ <dependency org="org.apache.hbase" name="hbase-procedure" rev="${hbase95.version}" conf="hbase95->master"/>
-+
- <dependency org="org.htrace" name="htrace-core" rev="3.0.4" conf="hadoop23->master"/>
- <dependency org="org.apache.htrace" name="htrace-core" rev="${htrace.version}" conf="hadoop23->master"/>
- <dependency org="org.fusesource.leveldbjni" name="leveldbjni-all" rev="${leveldbjni.version}"
-diff --git a/ivy/libraries.properties b/ivy/libraries.properties
-index 12e564b..65762d6 100644
---- a/ivy/libraries.properties
-+++ b/ivy/libraries.properties
-@@ -71,7 +71,7 @@ rhino.version=1.7R2
- antlr.version=3.4
- stringtemplate.version=4.0.4
- log4j.version=1.2.16
--netty.version=3.6.6.Final
-+netty.version=4.0.23.Final
- rats-lib.version=0.5.1
- slf4j-api.version=1.6.1
- slf4j-log4j12.version=1.6.1
diff --git a/bigtop.bom b/bigtop.bom
index 1a9fabef..9c72a11b 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -177,7 +177,7 @@ bigtop {
name = 'pig'
pkg = 'pig'
relNotes = 'Apache Pig'
- version { base = '0.15.0'; pkg = base; release = 1 }
+ version { base = '0.17.0'; pkg = base; release = 1 }
tarball { destination = "${name}-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/$name-${version.base}/"