Repository: bigtop Updated Branches: refs/heads/master 6d75d7760 -> b9255e18b
BIGTOP-2054: Update Pig Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/f75130d1 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/f75130d1 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/f75130d1 Branch: refs/heads/master Commit: f75130d1f1bf1def4e241d7c172ae7969ebdd1c0 Parents: 6d75d77 Author: Olaf Flebbe <o...@oflebbe.de> Authored: Sun Sep 20 17:21:32 2015 +0200 Committer: Olaf Flebbe <o...@oflebbe.de> Committed: Mon Sep 21 20:15:41 2015 +0200 ---------------------------------------------------------------------- .../src/common/pig/patch1-PIG-4676.diff | 93 ++++++++++++++++++++ bigtop-packages/src/rpm/pig/SPECS/pig.spec | 3 +- bigtop.bom | 2 +- 3 files changed, 96 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/f75130d1/bigtop-packages/src/common/pig/patch1-PIG-4676.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/pig/patch1-PIG-4676.diff b/bigtop-packages/src/common/pig/patch1-PIG-4676.diff new file mode 100644 index 0000000..2844116 --- /dev/null +++ b/bigtop-packages/src/common/pig/patch1-PIG-4676.diff @@ -0,0 +1,93 @@ +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. http://git-wip-us.apache.org/repos/asf/bigtop/blob/f75130d1/bigtop-packages/src/rpm/pig/SPECS/pig.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/pig/SPECS/pig.spec b/bigtop-packages/src/rpm/pig/SPECS/pig.spec index a96e39d..e643c67 100644 --- a/bigtop-packages/src/rpm/pig/SPECS/pig.spec +++ b/bigtop-packages/src/rpm/pig/SPECS/pig.spec @@ -23,6 +23,7 @@ %define hive_home /usr/lib/hive %define zookeeper_home /usr/lib/zookeeper %define hbase_home /usr/lib/hbase +#BIGTOP_PATCH_FILES # CentOS 5 does not have any dist macro # So I will suppose anything that is not Mageia or a SUSE will be a RHEL/CentOS/Fedora @@ -110,7 +111,7 @@ language called Pig Latin, which has the following key properties: %prep %setup -n %{name}-%{pig_base_version}-src - +#BIGTOP_PATCH_COMMAND %build env PIG_BASE_VERSION=%{pig_base_version} bash %{SOURCE1} http://git-wip-us.apache.org/repos/asf/bigtop/blob/f75130d1/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index e891b6f..7bcc186 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -152,7 +152,7 @@ bigtop { name = 'pig' pkg = 'pig' relNotes = 'Apache Pig' - version { base = '0.14.0'; pkg = base; release = 1 } + version { base = '0.15.0'; pkg = base; release = 1 } tarball { destination = "${name}-${version.base}-src.tar.gz" source = destination } url { download_path = "/$name/$name-${version.base}/"
