You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2015/09/16 06:22:28 UTC
svn commit: r1703330 - in /pig/trunk: CHANGES.txt ivy.xml
ivy/libraries.properties src/org/apache/pig/builtin/HiveUDFBase.java
test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java
Author: daijy
Date: Wed Sep 16 04:22:27 2015
New Revision: 1703330
URL: http://svn.apache.org/r1703330
Log:
PIG-4676: Upgrade Hive to 1.2.1
Modified:
pig/trunk/CHANGES.txt
pig/trunk/ivy.xml
pig/trunk/ivy/libraries.properties
pig/trunk/src/org/apache/pig/builtin/HiveUDFBase.java
pig/trunk/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1703330&r1=1703329&r2=1703330&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Sep 16 04:22:27 2015
@@ -24,6 +24,8 @@ INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-4676: Upgrade Hive to 1.2.1 (daijy)
+
PIG-4574: Eliminate identity vertex for order by and skewed join right after LOAD (rohini)
PIG-4365: TOP udf should implement Accumulator interface (eyal via rohini)
Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1703330&r1=1703329&r2=1703330&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Wed Sep 16 04:22:27 2015
@@ -425,8 +425,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"
@@ -435,6 +433,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">
Modified: pig/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1703330&r1=1703329&r2=1703330&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Wed Sep 16 04:22:27 2015
@@ -48,7 +48,7 @@ hadoop-mapreduce.version=2.6.0
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
@@ -99,3 +99,4 @@ snappy.version=0.2
leveldbjni.version=1.8
curator.version=2.6.0
htrace.version=3.1.0-incubating
+commons-lang3.version=3.1
Modified: pig/trunk/src/org/apache/pig/builtin/HiveUDFBase.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/builtin/HiveUDFBase.java?rev=1703330&r1=1703329&r2=1703330&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/builtin/HiveUDFBase.java (original)
+++ pig/trunk/src/org/apache/pig/builtin/HiveUDFBase.java Wed Sep 16 04:22:27 2015
@@ -28,6 +28,7 @@ import org.apache.hadoop.hive.ql.exec.Fu
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 @@ abstract class HiveUDFBase extends EvalF
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);
Modified: pig/trunk/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java?rev=1703330&r1=1703329&r2=1703330&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLoaderStorerShipCacheFiles.java Wed Sep 16 04:22:27 2015
@@ -50,8 +50,7 @@ public abstract class TestLoaderStorerSh
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());
}
@@ -67,8 +66,7 @@ public abstract class TestLoaderStorerSh
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());
}