hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhr...@apache.org
Subject svn commit: r730284 - in /hadoop/hive/trunk: ./ data/conf/ ql/src/java/org/apache/hadoop/hive/ql/optimizer/ ql/src/test/org/apache/hadoop/hive/ql/ ql/src/test/org/apache/hadoop/hive/ql/io/
Date Wed, 31 Dec 2008 00:52:04 GMT
Author: dhruba
Date: Tue Dec 30 16:52:04 2008
New Revision: 730284

URL: http://svn.apache.org/viewvc?rev=730284&view=rev
Log:
HIVE-196. Two test runs can run simultaneously on the same machine.
(Ashish Thusoo via dhruba)


Removed:
    hadoop/hive/trunk/data/conf/hive-log4j.properties
Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/build-common.xml
    hadoop/hive/trunk/data/conf/hive-site.xml
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
    hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
    hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=730284&r1=730283&r2=730284&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Dec 30 16:52:04 2008
@@ -164,3 +164,6 @@
     tables when alias.* expressions are present in the select list of a 
     join. (Ashish Thusoo via dhruba)
 
+    HIVE-196. Two test runs can run simultaneously on the same machine.
+    (Ashish Thusoo via dhruba)
+

Modified: hadoop/hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build-common.xml?rev=730284&r1=730283&r2=730284&view=diff
==============================================================================
--- hadoop/hive/trunk/build-common.xml (original)
+++ hadoop/hive/trunk/build-common.xml Tue Dec 30 16:52:04 2008
@@ -38,6 +38,7 @@
   <property name="hadoop.version" value="0.19.0"/>
   <property name="hadoop.root" location="${build.dir.hadoop}/hadoop-${hadoop.version}"/>
   <property name="hadoop.jar" location="${hadoop.root}/hadoop-${hadoop.version}-core.jar"/>
+  <property name="hadoop.conf.dir" location="${hadoop.root}/conf"/>
 
   <property name="javac.debug" value="on"/>
   <property name="javac.version" value="1.5"/>

Modified: hadoop/hive/trunk/data/conf/hive-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/data/conf/hive-site.xml?rev=730284&r1=730283&r2=730284&view=diff
==============================================================================
--- hadoop/hive/trunk/data/conf/hive-site.xml (original)
+++ hadoop/hive/trunk/data/conf/hive-site.xml Tue Dec 30 16:52:04 2008
@@ -12,7 +12,7 @@
 <!-- Hive Execution Parameters -->
 <property>
   <name>hive.exec.scratchdir</name>
-  <value>/tmp/hive-${user.name}</value>
+  <value>${user.dir}/../build/ql/tmp</value>
   <description>Scratch space for Hive jobs</description>
 </property>
 

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java?rev=730284&r1=730283&r2=730284&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
(original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
Tue Dec 30 16:52:04 2008
@@ -313,7 +313,7 @@
     int randomid = opProcCtx.getRandomId();
     int pathid   = opProcCtx.getPathId();
       
-    String taskTmpDir = scratchDir + File.separator + randomid + '.' + pathid ;
+    String taskTmpDir = (new Path(scratchDir + File.separator + randomid + '.' + pathid)).toString();
     pathid++;
     opProcCtx.setPathId(pathid);
     

Modified: hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java?rev=730284&r1=730283&r2=730284&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java Tue Dec 30 16:52:04
2008
@@ -68,7 +68,7 @@
 public class QTestUtil {
 
   private String testWarehouse;
-  private String tmpdir = "/tmp/"+System.getProperty("user.name")+"/";
+  private String tmpdir =  System.getProperty("user.dir")+"/../build/ql/tmp";
   private Path tmppath = new Path(tmpdir);
   private String testFiles;
   private String outDir;
@@ -524,7 +524,7 @@
       cmdArray[1] = "-b";
       cmdArray[2] = "-I";
       cmdArray[3] = "\\(\\(<java version=\".*\" class=\"java.beans.XMLDecoder\">\\)"
+
-        "\\|\\(<string>/tmp/.*</string>\\)" +
+        "\\|\\(<string>.*/tmp/.*</string>\\)" +
         "\\|\\(<string>file:.*</string>\\)" +
         "\\|\\(<string>/.*/warehouse/.*</string>\\)\\)";
       cmdArray[4] = outf.getPath();
@@ -634,7 +634,7 @@
     cmdArray = new String[5];
     cmdArray[0] = "diff";
     cmdArray[1] = "-I";
-    cmdArray[2] = "\\(file:\\)\\|\\(tmp/hive-.*\\)";
+    cmdArray[2] = "\\(file:\\)\\|\\(/tmp/.*\\)";
     cmdArray[3] = (new File(logDir, tname + ".out")).getPath();
     cmdArray[4] = (new File(outDir, tname + ".out")).getPath();
     System.out.println(cmdArray[0] + " " + cmdArray[1] + " " + cmdArray[2] + " " +

Modified: hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java?rev=730284&r1=730283&r2=730284&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java
(original)
+++ hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java
Tue Dec 30 16:52:04 2008
@@ -56,7 +56,7 @@
       conf = new Configuration();
       job = new JobConf(conf);
       fs = FileSystem.getLocal(conf);
-      dir = new Path(System.getProperty("test.build.data",".") + "/mapred");
+      dir = new Path(System.getProperty("test.data.dir",".") + "/mapred");
       file = new Path(dir, "test.txt");
       reporter = Reporter.NULL;
       fs.delete(dir, true);
@@ -133,7 +133,7 @@
       conf = new Configuration();
       job = new JobConf(conf);
       fs = FileSystem.getLocal(conf);
-      dir = new Path(System.getProperty("test.build.data",".") + "/mapred");
+      dir = new Path(System.getProperty("test.data.dir",".") + "/mapred");
       file = new Path(dir, "test.txt");
       reporter = Reporter.NULL;
       fs.delete(dir, true);
@@ -210,7 +210,7 @@
       conf = new Configuration();
       job = new JobConf(conf);
       fs = FileSystem.getLocal(conf);
-      dir = new Path(System.getProperty("test.build.data",".") + "/mapred");
+      dir = new Path(System.getProperty("test.data.dir",".") + "/mapred");
       file = new Path(dir, "test.txt");
       reporter = Reporter.NULL;
       fs.delete(dir, true);



Mime
View raw message