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 2012/09/28 07:42:28 UTC
svn commit: r1391308 - in /hive/trunk: build-common.xml
ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
Author: hashutosh
Date: Fri Sep 28 05:42:28 2012
New Revision: 1391308
URL: http://svn.apache.org/viewvc?rev=1391308&view=rev
Log:
HIVE-3478 : Remove the specialized logic to handle the file schemas in windows vs unix from build.xml (Kanna Karanam via Ashutosh Chauhan)
Modified:
hive/trunk/build-common.xml
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
Modified: hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1391308&r1=1391307&r2=1391308&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Fri Sep 28 05:42:28 2012
@@ -390,11 +390,9 @@
<equals arg1="windows" arg2="${os.family}"/>
<then>
<property name="junit.script.extension" value=".cmd"/>
- <property name="junit.file.schema" value=""/>
</then>
<else>
<property name="junit.script.extension" value=""/>
- <property name="junit.file.schema" value="file://"/>
</else>
</if>
<if>
@@ -413,9 +411,9 @@
<env key="TZ" value="US/Pacific"/>
<sysproperty key="test.output.overwrite" value="${overwrite}"/>
<sysproperty key="test.service.standalone.server" value="${standalone}"/>
- <sysproperty key="log4j.configuration" value="${junit.file.schema}${test.src.data.dir}/conf/hive-log4j.properties"/>
+ <sysproperty key="log4j.configuration" value="file:///${test.src.data.dir}/conf/hive-log4j.properties"/>
<sysproperty key="derby.stream.error.file" value="${test.build.dir}/derby.log"/>
- <sysproperty key="hive.aux.jars.path" value="${junit.file.schema}${test.build.dir}/test-udfs.jar"/>
+ <sysproperty key="hive.aux.jars.path" value="file:///${test.build.dir}/test-udfs.jar"/>
<sysproperty key="ql.test.query.clientpositive.dir" value="${ql.test.query.clientpositive.dir}"/>
<sysproperty key="ql.test.results.clientpositive.dir" value="${ql.test.results.clientpositive.dir}"/>
<sysproperty key="test.log.dir" value="${test.log.dir}"/>
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1391308&r1=1391307&r2=1391308&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java Fri Sep 28 05:42:28 2012
@@ -243,11 +243,6 @@ public class QTestUtil {
String orgScratchDir = conf.getVar(HiveConf.ConfVars.SCRATCHDIR);
conf.setVar(HiveConf.ConfVars.SCRATCHDIR, getHdfsUriString(orgScratchDir));
-
- if (miniMr) {
- String orgAuxJarFolder = conf.getAuxJars();
- conf.setAuxJars(getHdfsUriString("file://" + orgAuxJarFolder));
- }
}
private String getHdfsUriString(String uriStr) {