You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/04/24 00:24:47 UTC
svn commit: r1471183 - in /hive/branches/branch-0.11: ./ bin/ builtins/
eclipse-templates/ hcatalog/build-support/ant/ pdk/
ql/src/java/org/apache/hadoop/hive/ql/exec/
ql/src/java/org/apache/hadoop/hive/ql/session/
ql/src/test/results/clientpositive/
Author: hashutosh
Date: Tue Apr 23 22:24:46 2013
New Revision: 1471183
URL: http://svn.apache.org/r1471183
Log:
HIVE-4304: Remove unused builtins and pdk submodules (Travis Crawford via Ashutosh Chauhan)
Removed:
hive/branches/branch-0.11/builtins/
hive/branches/branch-0.11/pdk/
Modified:
hive/branches/branch-0.11/bin/hive
hive/branches/branch-0.11/build.properties
hive/branches/branch-0.11/build.xml
hive/branches/branch-0.11/eclipse-templates/.classpath
hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml
hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
hive/branches/branch-0.11/ql/src/test/results/clientpositive/show_functions.q.out
Modified: hive/branches/branch-0.11/bin/hive
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/bin/hive?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/bin/hive (original)
+++ hive/branches/branch-0.11/bin/hive Tue Apr 23 22:24:46 2013
@@ -78,11 +78,6 @@ if [ ! -f ${HIVE_LIB}/hive-exec-*.jar ];
exit 1;
fi
-if [ ! -f ${HIVE_LIB}/hive-builtins-*.jar ]; then
- echo "Missing Hive Builtins Jar: ${HIVE_LIB}/hive-builtins-*.jar"
- exit 1;
-fi
-
if [ ! -f ${HIVE_LIB}/hive-metastore-*.jar ]; then
echo "Missing Hive MetaStore Jar"
exit 2;
Modified: hive/branches/branch-0.11/build.properties
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/build.properties?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/build.properties (original)
+++ hive/branches/branch-0.11/build.properties Tue Apr 23 22:24:46 2013
@@ -72,8 +72,8 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ex
common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
# module names needed for build process
-iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils,hcatalog
-iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,pdk,builtins,testutils,hcatalog
+iterate.hive.all=ant,shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
+iterate.hive.modules=shims,common,serde,metastore,ql,contrib,service,cli,jdbc,beeline,hwi,hbase-handler,testutils,hcatalog
iterate.hive.tests=ql,contrib,hbase-handler,hwi,jdbc,metastore,odbc,serde,service,hcatalog
iterate.hive.thrift=ql,service,metastore,serde
iterate.hive.protobuf=ql
Modified: hive/branches/branch-0.11/build.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/build.xml?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/build.xml (original)
+++ hive/branches/branch-0.11/build.xml Tue Apr 23 22:24:46 2013
@@ -385,7 +385,6 @@
<mkdir dir="${target.conf.dir}"/>
<mkdir dir="${target.bin.dir}"/>
<mkdir dir="${target.scripts.dir}/metastore/upgrade"/>
- <mkdir dir="${target.scripts.dir}/pdk"/>
<mkdir dir="${target.example.dir}"/>
<mkdir dir="${target.example.dir}/files"/>
<mkdir dir="${target.example.dir}/queries"/>
@@ -402,9 +401,6 @@
<copy todir="${target.scripts.dir}/metastore/upgrade">
<fileset dir="${hive.root}/metastore/scripts/upgrade" excludes="${vcs.excludes}"/>
</copy>
- <copy todir="${target.scripts.dir}/pdk">
- <fileset dir="${hive.root}/pdk/scripts" excludes="${vcs.excludes},README"/>
- </copy>
<copy file="${basedir}/conf/hive-default.xml.template" todir="${target.conf.dir}">
<filterset>
<filter token="VERSION" value="${version}"/>
@@ -492,9 +488,6 @@
<copy todir="${target.example.dir}/files" preservelastmodified="true" flatten="true">
<fileset dir="${test.data.dir}/files" includes="*.*" excludes="${vcs.excludes}"/>
</copy>
- <copy todir="${target.example.dir}/test-plugin">
- <fileset dir="${hive.root}/pdk/test-plugin"/>
- </copy>
<copy file="${basedir}/README.txt" todir="${target.dir}">
<filterset>
<filter token="VERSION" value="${version}"/>
@@ -517,14 +510,6 @@
<copy todir="${build.dir.hive}/hcatalog">
<fileset dir="${hive.root}/hcatalog/build/hcatalog-${version}"/>
</copy>
-
- <!-- special case because builtins compilation depends on packaging
- up everything else first -->
- <ant antfile="${hive.root}/builtins/build.xml" target="package"
- inheritAll="false" />
- <copy todir="${target.lib.dir}" preservelastmodified="true" flatten="true">
- <fileset file="${build.dir.hive}/builtins/hive-builtins-${version}.jar"/>
- </copy>
</target>
@@ -683,8 +668,6 @@
<packageset dir="ql/src/gen/thrift/gen-javabean"/>
<packageset dir="${build.dir.hive}/ql/gen/antlr/gen-java"/>
<packageset dir="shims/src/common/java"/>
- <packageset dir="pdk/src/java"/>
- <packageset dir="builtins/src"/>
<link href="${javadoc.link.java}"/>
@@ -954,7 +937,6 @@
<sourcePath path="${hive.root}/ant" />
<sourcePath path="${hive.root}/beeline" />
- <sourcePath path="${hive.root}/builtins" />
<sourcePath path="${hive.root}/cli" />
<sourcePath path="${hive.root}/common" />
<sourcePath path="${hive.root}/contrib" />
@@ -964,14 +946,12 @@
<sourcePath path="${hive.root}/metastore" />
<sourcePath path="${hive.root}/hcatalog" />
<sourcePath path="${hive.root}/odbc" />
- <sourcePath path="${hive.root}/pdk" />
<sourcePath path="${hive.root}/ql" />
<sourcePath path="${hive.root}/serde" />
<sourcePath path="${hive.root}/service" />
<sourcePath path="${hive.root}/shims" />
<class location="${build.dir.hive}/anttasks/classes" />
<class location="${build.dir.hive}/beeline/classes" />
- <class location="${build.dir.hive}/builtins/classes" />
<class location="${build.dir.hive}/cli/classes" />
<class location="${build.dir.hive}/common/classes" />
<class location="${build.dir.hive}/contrib/classes" />
@@ -980,7 +960,6 @@
<class location="${build.dir.hive}/jdbc/classes" />
<class location="${build.dir.hive}/metastore/classes" />
<class location="${build.dir.hive}/hcatalog/classes" />
- <class location="${build.dir.hive}/pdk/classes" />
<class location="${build.dir.hive}/ql/classes" />
<class location="${build.dir.hive}/serde/classes" />
<class location="${build.dir.hive}/service/classes" />
@@ -1065,8 +1044,6 @@
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/beeline/hive-beeline-${version}.jar"
todir="${mvn.jar.dir}" />
- <copy file="${build.dir.hive}/builtins/hive-builtins-${version}.jar"
- todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/cli/hive-cli-${version}.jar"
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/common/hive-common-${version}.jar"
@@ -1083,8 +1060,6 @@
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/hcatalog/hive-hcatalog-${version}.jar"
todir="${mvn.jar.dir}" />
- <copy file="${build.dir.hive}/pdk/hive-pdk-${version}.jar"
- todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/ql/hive-exec-${version}.jar"
todir="${mvn.jar.dir}" />
<copy file="${build.dir.hive}/serde/hive-serde-${version}.jar"
@@ -1099,8 +1074,6 @@
tofile="${mvn.pom.dir}/hive-anttasks-${version}.pom" />
<copy file="${build.dir.hive}/beeline/pom.xml"
tofile="${mvn.pom.dir}/hive-beeline-${version}.pom" />
- <copy file="${build.dir.hive}/builtins/pom.xml"
- tofile="${mvn.pom.dir}/hive-builtins-${version}.pom" />
<copy file="${build.dir.hive}/cli/pom.xml"
tofile="${mvn.pom.dir}/hive-cli-${version}.pom" />
<copy file="${build.dir.hive}/common/pom.xml"
@@ -1117,8 +1090,6 @@
tofile="${mvn.pom.dir}/hive-metastore-${version}.pom" />
<copy file="${build.dir.hive}/hcatalog/pom.xml"
tofile="${mvn.pom.dir}/hive-hcatalog-${version}.pom" />
- <copy file="${build.dir.hive}/pdk/pom.xml"
- tofile="${mvn.pom.dir}/hive-pdk-${version}.pom" />
<copy file="${build.dir.hive}/ql/pom.xml"
tofile="${mvn.pom.dir}/hive-exec-${version}.pom" />
<copy file="${build.dir.hive}/serde/pom.xml"
@@ -1207,9 +1178,6 @@
<param name="hive.project" value="beeline" />
</antcall>
<antcall target="maven-publish-artifact">
- <param name="hive.project" value="builtins" />
- </antcall>
- <antcall target="maven-publish-artifact">
<param name="hive.project" value="cli" />
</antcall>
<antcall target="maven-publish-artifact">
@@ -1237,9 +1205,6 @@
<param name="hive.project" value="hcatalog" />
</antcall>
<antcall target="maven-publish-artifact">
- <param name="hive.project" value="pdk" />
- </antcall>
- <antcall target="maven-publish-artifact">
<param name="hive.project" value="serde" />
</antcall>
<antcall target="maven-publish-artifact">
@@ -1383,16 +1348,6 @@
output.file="${mvn.pom.dir}/hive-hcatalog-${version}.pom.asc"
gpg.passphrase="${gpg.passphrase}"/>
- <!-- hive-pdk -->
- <sign-artifact
- input.file="${mvn.pom.dir}/hive-pdk-${version}.jar"
- output.file="${mvn.pom.dir}/hive-pdk-${version}.jar.asc"
- gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact
- input.file="${mvn.pom.dir}/hive-pdk-${version}.pom"
- output.file="${mvn.pom.dir}/hive-pdk-${version}.pom.asc"
- gpg.passphrase="${gpg.passphrase}"/>
-
<!-- hive-serde -->
<sign-artifact
input.file="${mvn.jar.dir}/hive-serde-${version}.jar"
Modified: hive/branches/branch-0.11/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/eclipse-templates/.classpath?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/eclipse-templates/.classpath (original)
+++ hive/branches/branch-0.11/eclipse-templates/.classpath Tue Apr 23 22:24:46 2013
@@ -89,7 +89,6 @@
<classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
<classpathentry kind="lib" path="build/beeline/hive-beeline-@HIVE_VERSION@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/tempus-fugit-@tempus-fugit.version@.jar"/>
- <classpathentry kind="lib" path="build/builtins/hive-builtins-@HIVE_VERSION@.jar"/>
<classpathentry kind="src" path="build/contrib/test/src"/>
<classpathentry kind="src" path="build/metastore/gen/antlr/gen-java"/>
<classpathentry kind="lib" path="build/testutils/hive-testutils-@HIVE_VERSION@.jar"/>
@@ -97,7 +96,6 @@
<classpathentry kind="src" path="build/ql/gen/antlr/gen-java"/>
<classpathentry kind="src" path="beeline/src/java"/>
<classpathentry kind="src" path="beeline/src/test"/>
- <classpathentry kind="src" path="builtins/src"/>
<classpathentry kind="src" path="cli/src/java"/>
<classpathentry kind="src" path="cli/src/test"/>
<classpathentry kind="src" path="common/src/java"/>
@@ -115,8 +113,6 @@
<classpathentry kind="src" path="metastore/src/java"/>
<classpathentry kind="src" path="metastore/src/model"/>
<classpathentry kind="src" path="metastore/src/test"/>
- <classpathentry kind="src" path="pdk/src/java"/>
- <classpathentry kind="src" path="pdk/test-plugin/src"/>
<classpathentry kind="src" path="ql/src/gen/thrift/gen-javabean"/>
<classpathentry kind="src" path="ql/src/gen/protobuf/gen-java"/>
<classpathentry kind="src" path="ql/src/java"/>
Modified: hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml (original)
+++ hive/branches/branch-0.11/hcatalog/build-support/ant/deploy.xml Tue Apr 23 22:24:46 2013
@@ -66,7 +66,6 @@
<_mvnpublish module="beeline" />
<_mvnpublish module="hwi" />
<_mvnpublish module="hbase-handler" />
- <_mvnpublish module="pdk" />
<_mvnpublish module="testutils" />
</target>
Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java (original)
+++ hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Tue Apr 23 22:24:46 2013
@@ -2420,8 +2420,5 @@ public final class Utilities {
return sb.toString();
}
-
- public static Class getBuiltinUtilsClass() throws ClassNotFoundException {
- return Class.forName("org.apache.hive.builtins.BuiltinUtils");
- }
}
+
Modified: hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java (original)
+++ hive/branches/branch-0.11/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java Tue Apr 23 22:24:46 2013
@@ -191,19 +191,6 @@ public class SessionState {
ls = new LineageState();
overriddenConfigurations = new HashMap<String, String>();
overriddenConfigurations.putAll(HiveConf.getConfSystemProperties());
-
- // Register the Hive builtins jar and all of its functions
- try {
- Class<?> pluginClass = Utilities.getBuiltinUtilsClass();
- URL jarLocation = pluginClass.getProtectionDomain().getCodeSource()
- .getLocation();
- add_builtin_resource(
- ResourceType.JAR, jarLocation.toString());
- FunctionRegistry.registerFunctionsFromPluginJar(
- jarLocation, pluginClass.getClassLoader());
- } catch (Exception ex) {
- throw new RuntimeException("Failed to load Hive builtin functions", ex);
- }
}
public void setCmd(String cmdString) {
Modified: hive/branches/branch-0.11/ql/src/test/results/clientpositive/show_functions.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.11/ql/src/test/results/clientpositive/show_functions.q.out?rev=1471183&r1=1471182&r2=1471183&view=diff
==============================================================================
--- hive/branches/branch-0.11/ql/src/test/results/clientpositive/show_functions.q.out (original)
+++ hive/branches/branch-0.11/ql/src/test/results/clientpositive/show_functions.q.out Tue Apr 23 22:24:46 2013
@@ -167,7 +167,6 @@ translate
trim
ucase
unhex
-union_map
unix_timestamp
upper
var_pop