You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by na...@apache.org on 2010/01/08 18:07:32 UTC
svn commit: r897265 - in /hadoop/hive/trunk: ./ ant/ bin/ bin/ext/
common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/ hwi/
hwi/src/test/org/apache/hadoop/hive/hwi/ metastore/ ql/
Author: namit
Date: Fri Jan 8 17:05:59 2010
New Revision: 897265
URL: http://svn.apache.org/viewvc?rev=897265&view=rev
Log:
HIVE-978 Hive jars should follow Hadoop naming and include version
(Chad Metcalf and Zheng Shao via namit)
Modified:
hadoop/hive/trunk/CHANGES.txt
hadoop/hive/trunk/ant/build.xml
hadoop/hive/trunk/bin/ext/cli.sh
hadoop/hive/trunk/bin/ext/hiveserver.sh
hadoop/hive/trunk/bin/ext/hwi.sh
hadoop/hive/trunk/bin/ext/lineage.sh
hadoop/hive/trunk/bin/hive
hadoop/hive/trunk/build-common.xml
hadoop/hive/trunk/build.xml
hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hadoop/hive/trunk/conf/hive-default.xml
hadoop/hive/trunk/contrib/build.xml
hadoop/hive/trunk/hwi/build.xml
hadoop/hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java
hadoop/hive/trunk/metastore/build.xml
hadoop/hive/trunk/ql/build.xml
Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Fri Jan 8 17:05:59 2010
@@ -421,6 +421,9 @@
HIVE-1031 describe function array throws ParseException
(Carl Steinbach via namit)
+ HIVE-978 Hive jars should follow Hadoop naming and include version
+ (Chad Metcalf and Zheng Shao via namit)
+
Release 0.4.0 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/hive/trunk/ant/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ant/build.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/ant/build.xml (original)
+++ hadoop/hive/trunk/ant/build.xml Fri Jan 8 17:05:59 2010
@@ -46,7 +46,7 @@
<target name="jar" depends="compile">
<copy file="${src.dir}/org/apache/hadoop/hive/ant/antlib.xml"
todir="${build.dir}/classes/org/apache/hadoop/hive/ant"/>
- <jar destfile="${build.dir}/hive_anttasks.jar">
+ <jar destfile="${build.dir}/hive-anttasks-${version}.jar">
<fileset dir="${build.dir}/classes"/>
</jar>
</target>
Modified: hadoop/hive/trunk/bin/ext/cli.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/cli.sh?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/cli.sh (original)
+++ hadoop/hive/trunk/bin/ext/cli.sh Fri Jan 8 17:05:59 2010
@@ -5,7 +5,7 @@
CLASS=org.apache.hadoop.hive.cli.CliDriver
# cli specific code
- if [ ! -f "${HIVE_LIB}/hive_cli.jar" ]; then
+ if [ ! -f ${HIVE_LIB}/hive-cli-*.jar ]; then
echo "Missing Hive CLI Jar"
exit 3;
fi
@@ -32,10 +32,10 @@
fi
if [ $minor_ver -lt 20 ]; then
- exec $HADOOP jar $AUX_JARS_CMD_LINE ${HIVE_LIB}/hive_cli.jar $CLASS $HIVE_OPTS "$@"
+ exec $HADOOP jar $AUX_JARS_CMD_LINE ${HIVE_LIB}/hive-cli-*.jar $CLASS $HIVE_OPTS "$@"
else
# hadoop 20 or newer - skip the aux_jars option. picked up from hiveconf
- exec $HADOOP jar ${HIVE_LIB}/hive_cli.jar $CLASS $HIVE_OPTS "$@"
+ exec $HADOOP jar ${HIVE_LIB}/hive-cli-*.jar $CLASS $HIVE_OPTS "$@"
fi
}
Modified: hadoop/hive/trunk/bin/ext/hiveserver.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/hiveserver.sh?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/hiveserver.sh (original)
+++ hadoop/hive/trunk/bin/ext/hiveserver.sh Fri Jan 8 17:05:59 2010
@@ -7,7 +7,7 @@
if $cygwin; then
HIVE_LIB=`cygpath -w "$HIVE_LIB"`
fi
- JAR=${HIVE_LIB}/hive_service.jar
+ JAR=${HIVE_LIB}/hive-service-*.jar
version=$($HADOOP version | awk '{if (NR == 1) {print $2;}}');
Modified: hadoop/hive/trunk/bin/ext/hwi.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/hwi.sh?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/hwi.sh (original)
+++ hadoop/hive/trunk/bin/ext/hwi.sh Fri Jan 8 17:05:59 2010
@@ -8,8 +8,10 @@
fi
CLASS=org.apache.hadoop.hive.hwi.HWIServer
- export HWI_JAR_FILE=${HIVE_LIB}/hive_hwi.jar
- export HWI_WAR_FILE=${HIVE_LIB}/hive_hwi.war
+ # The ls hack forces the * to be expanded which is required because
+ # System.getenv doesn't do globbing
+ export HWI_JAR_FILE=$(ls ${HIVE_LIB}/hive-hwi-*.jar)
+ export HWI_WAR_FILE=$(ls ${HIVE_LIB}/hive-hwi-*.war)
#hwi requires ant jars
if [ "$ANT_LIB" = "" ] ; then
Modified: hadoop/hive/trunk/bin/ext/lineage.sh
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/ext/lineage.sh?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/ext/lineage.sh (original)
+++ hadoop/hive/trunk/bin/ext/lineage.sh Fri Jan 8 17:05:59 2010
@@ -20,7 +20,7 @@
CLASS=org.apache.hadoop.hive.ql.tools.LineageInfo
# cli specific code
- if [ ! -f "${HIVE_LIB}/hive_exec.jar" ]; then
+ if [ ! -f ${HIVE_LIB}/hive-exec-*.jar ]; then
echo "Missing Hive exec Jar"
exit 3;
fi
@@ -29,7 +29,7 @@
HIVE_LIB=`cygpath -w "$HIVE_LIB"`
fi
- exec $HADOOP jar ${HIVE_LIB}/hive_exec.jar $CLASS "$@"
+ exec $HADOOP jar ${HIVE_LIB}/hive-exec-*.jar $CLASS "$@"
}
lineage_help () {
Modified: hadoop/hive/trunk/bin/hive
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/bin/hive?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/bin/hive (original)
+++ hadoop/hive/trunk/bin/hive Fri Jan 8 17:05:59 2010
@@ -30,18 +30,18 @@
HIVE_LIB=${HIVE_HOME}/lib
# needed for execution
-if [ ! -f "${HIVE_LIB}/hive_exec.jar" ]; then
- echo "Missing Hive Execution Jar: ${HIVE_LIB}/hive_exec.jar"
+if [ ! -f ${HIVE_LIB}/hive-exec-*.jar ]; then
+ echo "Missing Hive Execution Jar: ${HIVE_LIB}/hive-exec-*.jar"
exit 1;
fi
-if [ ! -f "${HIVE_LIB}/hive_metastore.jar" ]; then
+if [ ! -f ${HIVE_LIB}/hive-metastore-*.jar ]; then
echo "Missing Hive MetaStore Jar"
exit 2;
fi
# cli specific code
-if [ ! -f "${HIVE_LIB}/hive_cli.jar" ]; then
+if [ ! -f ${HIVE_LIB}/hive-cli-*.jar ]; then
echo "Missing Hive CLI Jar"
exit 3;
fi
Modified: hadoop/hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build-common.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/build-common.xml (original)
+++ hadoop/hive/trunk/build-common.xml Fri Jan 8 17:05:59 2010
@@ -167,7 +167,7 @@
<target name="jar" depends="compile">
<echo message="Jar: ${ant.project.name}"/>
<jar
- jarfile="${build.dir}/hive_${ant.project.name}.jar"
+ jarfile="${build.dir}/hive-${ant.project.name}-${version}.jar"
basedir="${build.classes}">
<manifest>
<!-- Not putting these in their own manifest section, since that inserts
@@ -276,7 +276,7 @@
</subant>
<taskdef name="getversionpref" classname="org.apache.hadoop.hive.ant.GetVersionPref"
- classpath="${build.dir.hive}/anttasks/hive_anttasks.jar"/>
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar"/>
</target>
Modified: hadoop/hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/build.xml (original)
+++ hadoop/hive/trunk/build.xml Fri Jan 8 17:05:59 2010
@@ -96,7 +96,7 @@
<path id="common-classpath">
<pathelement location="${hadoop.jar}"/>
<pathelement location="${build.dir.hive}/classes"/>
- <fileset dir="${hive.root}" includes="hive_*.jar"/>
+ <fileset dir="${hive.root}" includes="hive-*.jar"/>
<fileset dir="${hive.root}/lib" includes="*.jar"/>
<fileset dir="${hive.root}/ql/lib" includes="*.jar"/>
</path>
@@ -242,12 +242,12 @@
<!-- copy jar files -->
<copy todir="${target.lib.dir}" preservelastmodified="true" flatten="true">
<fileset dir="${hive.root}" includes="*/*.jar, */*/*.jar" excludes="**/antlr-2*,**/antlr-3*,**/TestSerDe.jar"/>
- <fileset file="${build.dir.hive}/cli/hive_cli.jar"/>
- <fileset file="${build.dir.hive}/common/hive_common.jar"/>
- <fileset file="${build.dir.hive}/ql/hive_exec.jar"/>
- <fileset file="${build.dir.hive}/metastore/hive_metastore.jar"/>
- <fileset file="${build.dir.hive}/hwi/hive_hwi.war"/>
- <fileset file="${build.dir.hive}/contrib/hive_contrib.jar"/>
+ <fileset file="${build.dir.hive}/cli/hive-cli-${version}.jar"/>
+ <fileset file="${build.dir.hive}/common/hive-common-${version}.jar"/>
+ <fileset file="${build.dir.hive}/ql/hive-exec-${version}.jar"/>
+ <fileset file="${build.dir.hive}/metastore/hive-metastore-${version}.jar"/>
+ <fileset file="${build.dir.hive}/hive-hwi-${version}.war"/>
+ <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
</copy>
<copy todir="${target.example.dir}/files" preservelastmodified="true" flatten="true">
<fileset dir="${test.data.dir}/files" includes="*.*" excludes="**/.svn"/>
@@ -275,7 +275,7 @@
<echo message="Using hadoop version ${hadoop.version.ant-internal}"/>
<taskdef name="getversionpref" classname="org.apache.hadoop.hive.ant.GetVersionPref"
- classpath="${build.dir.hive}/anttasks/hive_anttasks.jar"/>
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-{$version}.jar"/>
<getversionpref property="hadoop.version.ant-internal.prefix" input="${hadoop.version.ant-internal}"/>
Modified: hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hadoop/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Fri Jan 8 17:05:59 2010
@@ -152,7 +152,7 @@
// HWI
HIVEHWILISTENHOST("hive.hwi.listen.host","0.0.0.0"),
HIVEHWILISTENPORT("hive.hwi.listen.port","9999"),
- HIVEHWIWARFILE("hive.hwi.war.file",System.getenv("HIVE_HOME")+"/lib/hive_hwi.war"),
+ HIVEHWIWARFILE("hive.hwi.war.file",System.getenv("HWI_WAR_FILE")),
// mapper/reducer memory in local mode
HIVEHADOOPMAXMEM("hive.mapred.local.mem", 0),
Modified: hadoop/hive/trunk/conf/hive-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/conf/hive-default.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/conf/hive-default.xml (original)
+++ hadoop/hive/trunk/conf/hive-default.xml Fri Jan 8 17:05:59 2010
@@ -336,12 +336,6 @@
</property>
<property>
- <name>hive.hwi.war.file</name>
- <value>lib/hive_hwi.war</value>
- <description>path appended to HIVE_HOME to locate the HWI WAR file</description>
-</property>
-
-<property>
<name>hive.exec.pre.hooks</name>
<value></value>
<description>Pre Execute Hook for Tests</description>
Modified: hadoop/hive/trunk/contrib/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/contrib/build.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/contrib/build.xml (original)
+++ hadoop/hive/trunk/contrib/build.xml Fri Jan 8 17:05:59 2010
@@ -58,7 +58,7 @@
<target name="gen-test" depends="deploy-ant-tasks, test-conditions, test-init" >
<taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
- classpath="${build.dir.hive}/anttasks/hive_anttasks.jar:${hive.root}/lib/velocity-1.5.jar:${hive.root}/lib/commons-collections-3.2.1.jar:${hive.root}/lib/commons-lang-2.4.jar"/>
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${hive.root}/lib/velocity-1.5.jar:${hive.root}/lib/commons-collections-3.2.1.jar:${hive.root}/lib/commons-lang-2.4.jar"/>
<mkdir dir="${test.build.src}/org/apache/hadoop/hive/ql/parse"/>
<mkdir dir="${test.build.src}/org/apache/hadoop/hive/cli"/>
@@ -106,4 +106,22 @@
</target>
+ <!-- override target jar because contrib tests need to add contrib jars,
+ which needs to be a constant without the version number -->
+ <target name="jar" depends="compile">
+ <echo message="Jar: ${ant.project.name}"/>
+ <jar
+ jarfile="${build.dir}/hive_${ant.project.name}.jar"
+ basedir="${build.classes}">
+ <manifest>
+ <!-- Not putting these in their own manifest section, since that inserts
+ a new-line, which breaks the reading of the attributes. -->
+ <attribute name="Implementation-Title" value="Hive"/>
+ <attribute name="Implementation-Version" value="${version}"/>
+ <attribute name="Implementation-Vendor" value="Apache"/>
+ </manifest>
+ </jar>
+ </target>
+
+
</project>
Modified: hadoop/hive/trunk/hwi/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hwi/build.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/hwi/build.xml (original)
+++ hadoop/hive/trunk/hwi/build.xml Fri Jan 8 17:05:59 2010
@@ -44,7 +44,7 @@
<!--hive_hwi.war file contains only the JSP sources -->
<target name="war">
- <jar jarfile="${build.dir.hive}/hwi/hive_hwi.war" basedir="${basedir}/web"/>
+ <jar jarfile="${build.dir.hive}/hwi/hive-hwi-${version}.war" basedir="${basedir}/web"/>
</target>
<!-- Compile is a clone of the build-common.xml compile, with one exception:
Modified: hadoop/hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java (original)
+++ hadoop/hive/trunk/hwi/src/test/org/apache/hadoop/hive/hwi/TestHWIServer.java Fri Jan 8 17:05:59 2010
@@ -4,7 +4,10 @@
import org.apache.hadoop.hive.conf.HiveConf;
import junit.framework.TestCase;
+import java.util.Properties;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.commons.logging.Log;
@@ -32,11 +35,23 @@
}
public final void testServerInit() throws Exception {
-
+ StringBuilder warFile = new StringBuilder("../build/hwi/hive-hwi-");
+ Properties props = new Properties();
+
+ // try retrieve version from build.properties file
+ try {
+ props.load(new FileInputStream("../build.properties"));
+ warFile.append(props.getProperty("version")).append(".war");
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
JettyShims.Server webServer;
webServer = ShimLoader.getJettyShims().startServer("0.0.0.0", 9999);
assertNotNull(webServer);
- webServer.addWar("../build/hwi/hive_hwi.war", "/hwi");
+ webServer.addWar(warFile.toString(), "/hwi");
webServer.start();
// webServer.join();
webServer.stop();
Modified: hadoop/hive/trunk/metastore/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/build.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/build.xml (original)
+++ hadoop/hive/trunk/metastore/build.xml Fri Jan 8 17:05:59 2010
@@ -56,7 +56,7 @@
<uptodate property="enhanceModel.notRequired">
<srcfiles dir= "${model.dir}" includes="**/*.java,*.jdo"/>
- <mapper type="merge" to="${build.dir}/hive_${name}.jar"/>
+ <mapper type="merge" to="${build.dir}/hive-${name}-${version}.jar"/>
</uptodate>
<target name="model-enhance" depends="model-compile" unless="enhanceModel.notRequired" >
@@ -80,7 +80,7 @@
<target name="model-jar" depends="model-enhance">
<echo message="Jar: ${name}"/>
<jar
- jarfile="${build.dir}/${name}_model.jar"
+ jarfile="${build.dir}/${name}-model-${version}.jar"
basedir="${build.classes}"
includes="**/model/M*"
/>
Modified: hadoop/hive/trunk/ql/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/build.xml?rev=897265&r1=897264&r2=897265&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/build.xml (original)
+++ hadoop/hive/trunk/ql/build.xml Fri Jan 8 17:05:59 2010
@@ -60,7 +60,7 @@
<target name="gen-test" depends="deploy-ant-tasks, test-conditions, test-init" >
<taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
- classpath="${build.dir.hive}/anttasks/hive_anttasks.jar:${hive.root}/lib/velocity-1.5.jar:${hive.root}/lib/commons-collections-3.2.1.jar:${hive.root}/lib/commons-lang-2.4.jar"/>
+ classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${hive.root}/lib/velocity-1.5.jar:${hive.root}/lib/commons-collections-3.2.1.jar:${hive.root}/lib/commons-lang-2.4.jar"/>
<qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/ql/parse"
templatePath="${ql.test.template.dir}" template="TestParse.vm"
@@ -156,7 +156,7 @@
</patternset>
</unzip>
<!-- jar jarfile="${build.dir}/hive_${name}.jar" basedir="${build.classes}" / -->
- <jar jarfile="${build.dir}/hive_exec.jar">
+ <jar jarfile="${build.dir}/hive-exec-${version}.jar">
<fileset dir="${build.dir.hive}/common/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/ql/classes" includes="**/*.class"/>
<fileset dir="${build.dir.hive}/serde/classes" includes="**/*.class"/>
@@ -171,7 +171,7 @@
<target name="deploy" depends="jar">
<echo message="hive: ${name}"/>
<mkdir dir="${deploy.dir}"/>
- <copy file="${build.dir}/hive_exec.jar"
+ <copy file="${build.dir}/hive-exec-${version}.jar"
todir="${deploy.dir}"/>
</target>