hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dhr...@apache.org
Subject svn commit: r732798 - in /hadoop/hive/trunk: ./ ant/src/org/apache/hadoop/hive/ant/ eclipse-templates/ eclipse-templates/.externalToolBuilders/ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src...
Date Thu, 08 Jan 2009 19:17:31 GMT
Author: dhruba
Date: Thu Jan  8 11:17:30 2009
New Revision: 732798

URL: http://svn.apache.org/viewvc?rev=732798&view=rev
Log:
HIVE-203. Fix eclipse templates to get junit tests to run.
(Ashish Thusoo via dhruba)


Added:
    hadoop/hive/trunk/eclipse-templates/TestCliDriver.launchtemplate
    hadoop/hive/trunk/eclipse-templates/TestHive.launchtemplate
    hadoop/hive/trunk/eclipse-templates/TestJdbc.launchtemplate
Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java
    hadoop/hive/trunk/build-common.xml
    hadoop/hive/trunk/build.xml
    hadoop/hive/trunk/eclipse-templates/.classpath
    hadoop/hive/trunk/eclipse-templates/.externalToolBuilders/Hive_Ant_Builder.launch
    hadoop/hive/trunk/eclipse-templates/.project
    hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/FileStore.java
    hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
    hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreClient.java
    hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
    hadoop/hive/trunk/ql/build.xml
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/tools/LineageInfo.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/TestMTQueries.java
    hadoop/hive/trunk/ql/src/test/templates/TestCliDriver.vm
    hadoop/hive/trunk/ql/src/test/templates/TestNegativeCliDriver.vm
    hadoop/hive/trunk/ql/src/test/templates/TestParse.vm
    hadoop/hive/trunk/ql/src/test/templates/TestParseNegative.vm
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
    hadoop/hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Thu Jan  8 11:17:30 2009
@@ -185,3 +185,6 @@
 
     HIVE-84.  Make MetaStore Client thread safe.  (Prasad Chakka via dhruba)
 
+    HIVE-203. Fix eclipse templates to get junit tests to run.
+    (Ashish Thusoo via dhruba)
+

Modified: hadoop/hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java (original)
+++ hadoop/hive/trunk/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java Thu Jan  8 11:17:30 2009
@@ -58,6 +58,8 @@
  
   protected String resultsDirectory;
 
+  protected String logDirectory;
+
   protected String template;
 
   protected String className;
@@ -121,6 +123,14 @@
     return outputDirectory;
   }
 
+  public void setLogDirectory(String logDirectory) {
+    this.logDirectory = logDirectory;
+  }
+
+  public String getLogDirectory() {
+    return this.logDirectory;
+  }
+
   public void setResultsDirectory(String resultsDirectory) {
     this.resultsDirectory = resultsDirectory;
   }
@@ -167,6 +177,10 @@
       throw new BuildException("No queryDirectory or queryFile specified");
     }
 
+    if (logDirectory == null) {
+      throw new BuildException("No logDirectory specified");
+    }
+
     if (resultsDirectory == null) {
       throw new BuildException("No resultsDirectory specified");
     }
@@ -178,6 +192,7 @@
     File [] qFiles = null;
     File outDir = null;
     File resultsDir = null;
+    File logDir = null;
     
     try {
       File inpDir = null;
@@ -199,6 +214,11 @@
       if (!outDir.exists()) {
         outDir.mkdirs();
       }
+
+      logDir = new File(logDirectory);
+      if (!logDir.exists()) {
+        throw new BuildException("Log Directory " + logDir.getCanonicalPath() + " does not exist");
+      }
       
       resultsDir = new File(resultsDirectory);
       if (!resultsDir.exists()) {
@@ -232,6 +252,7 @@
       ctx.put("className", className);
       ctx.put("qfiles", qFiles);
       ctx.put("resultsDir", resultsDir);
+      ctx.put("logDir", logDir);
 
       File outFile = new File(outDir, className + ".java");
       FileWriter writer = new FileWriter(outFile);

Modified: hadoop/hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build-common.xml?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/build-common.xml (original)
+++ hadoop/hive/trunk/build-common.xml Thu Jan  8 11:17:30 2009
@@ -132,6 +132,10 @@
 
   <target name="test-init">
     <mkdir dir="${test.data.dir}"/>
+    <mkdir dir="${test.log.dir}/clientpositive"/>
+    <mkdir dir="${test.log.dir}/clientnegative"/>
+    <mkdir dir="${test.log.dir}/positive"/>
+    <mkdir dir="${test.log.dir}/negative"/>
     <copy todir="${test.data.dir}">
       <fileset dir="${test.src.data.dir}">
         <exclude name="**/.svn"/>
@@ -230,8 +234,6 @@
   <!-- target to run the tests -->
   <target name="test"
   	depends="test-conditions,gen-test,compile-test,test-jar,test-init">
-    <delete dir="${test.log.dir}"/>
-    <mkdir dir="${test.log.dir}"/>
     <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
            fork="yes" maxmemory="256m" dir="${basedir}" timeout="${test.timeout}"
            errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">

Modified: hadoop/hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/build.xml?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/build.xml (original)
+++ hadoop/hive/trunk/build.xml Thu Jan  8 11:17:30 2009
@@ -184,6 +184,14 @@
 
   <target name="eclipse-files" depends="init"
           description="Generate files for Eclipse">
+
+    <condition property="hadoop.version" value="0.19">
+      <not>
+        <isset property="hadoop.version"/>
+      </not>
+    </condition>
+    <echo message="Using hadoop version ${hadoop.version}"/>
+
     <pathconvert property="eclipse.project">
       <path path="${basedir}"/>
       <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes"/>
@@ -195,8 +203,16 @@
       </fileset>
       <filterset>
         <filter token="PROJECT" value="${eclipse.project}"/>
+        <filter token="HADOOPVER" value="${hadoop.version}"/>
       </filterset>
     </copy>
+    <move todir="." includeemptydirs="false">
+      <fileset dir=".">
+        <include name="*.launchtemplate"/>
+      </fileset>
+      <mapper type="glob" from="*.launchtemplate" to="*.launch"/>
+    </move>
+
   </target>
 
   <target name="clean-eclipse-files"

Modified: hadoop/hive/trunk/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/eclipse-templates/.classpath?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/eclipse-templates/.classpath (original)
+++ hadoop/hive/trunk/eclipse-templates/.classpath Thu Jan  8 11:17:30 2009
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="lib" path="build/hadoopcore/hadoop-@HADOOPVER@/hadoop-@HADOOPVER@-core.jar"/>
+	<classpathentry exported="true" kind="lib" path="cli/lib/jline-0.9.94.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/asm-3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jdo2-api-2.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jpox-core-1.2.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jpox-enhancer-1.2.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jpox-rdbms-1.2.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/libfb303.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/libthrift.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.15.jar"/>
+	<classpathentry exported="true" kind="lib" path="ql/lib/antlr-3.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="ql/lib/antlr-runtime-3.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="ql/lib/commons-jexl-1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="testlibs/junit-3.8.1.jar"/>
+	<classpathentry kind="src" path="build/ql/gen-java"/>
+	<classpathentry kind="src" path="build/ql/test/src"/>
+	<classpathentry kind="src" path="cli/src/java"/>
+	<classpathentry kind="src" path="common/src/java"/>
+	<classpathentry kind="src" path="metastore/src/gen-javabean"/>
 	<classpathentry kind="src" path="metastore/src/java"/>
-	<classpathentry kind="src" path="metastore/src/test"/>
 	<classpathentry kind="src" path="metastore/src/model"/>
-	<classpathentry kind="src" path="metastore/src/gen-javabean"/>
-	<classpathentry kind="src" path="serde/src/java"/>
-	<classpathentry kind="src" path="serde/src/test"/>
-	<classpathentry kind="src" path="serde/src/gen-java"/>
-	<classpathentry kind="src" path="cli/src/java"/>
-	<classpathentry kind="src" path="build/ql/gen-java"/>
+	<classpathentry kind="src" path="metastore/src/test"/>
 	<classpathentry kind="src" path="ql/src/java"/>
 	<classpathentry kind="src" path="ql/src/test"/>
-	<classpathentry kind="src" path="common/src/java"/>
+	<classpathentry kind="src" path="serde/src/gen-java"/>
+	<classpathentry kind="src" path="serde/src/java"/>
+	<classpathentry kind="src" path="serde/src/test"/>
+	<classpathentry kind="src" path="service/src/gen-javabean"/>
 	<classpathentry kind="src" path="service/src/java"/>
 	<classpathentry kind="src" path="service/src/test"/>
-	<classpathentry kind="src" path="service/src/gen-javabean"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/asm-3.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-cli-2.0-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/derby.jar"/>
-	<classpathentry kind="lib" path="lib/jdo2-api-2.1.jar"/>
-	<classpathentry kind="lib" path="lib/jpox-core-1.2.2.jar"/>
-	<classpathentry kind="lib" path="lib/jpox-enhancer-1.2.2.jar"/>
-	<classpathentry kind="lib" path="lib/jpox-rdbms-1.2.2.jar"/>
-	<classpathentry kind="lib" path="lib/libfb303.jar"/>
-	<classpathentry kind="lib" path="lib/libthrift.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.15.jar"/>
-	<classpathentry kind="lib" path="lib/velocity-1.5.jar"/>
-	<classpathentry kind="lib" path="ql/lib/antlr-3.0.1.jar"/>
-	<classpathentry kind="lib" path="ql/lib/antlr-runtime-3.0.1.jar"/>
-	<classpathentry kind="lib" path="ql/lib/commons-jexl-1.1.jar"/>
-	<classpathentry kind="lib" path="ql/lib/stringtemplate-3.1b1.jar"/>
-	<classpathentry kind="lib" path="cli/lib/jline-0.9.94.jar"/>
-	<classpathentry kind="lib" path="build/hadoopcore/hadoop-0.19.0/hadoop-0.19.0-core.jar"/>
-	<classpathentry kind="lib" path="testlibs/junit-3.8.1.jar"/>
+	<classpathentry kind="src" path="jdbc/src/java"/>
+	<classpathentry kind="src" path="jdbc/src/test"/>
 	<classpathentry kind="output" path="build/eclipse-classes"/>
 </classpath>

Modified: hadoop/hive/trunk/eclipse-templates/.externalToolBuilders/Hive_Ant_Builder.launch
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/eclipse-templates/.externalToolBuilders/Hive_Ant_Builder.launch?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/eclipse-templates/.externalToolBuilders/Hive_Ant_Builder.launch (original)
+++ hadoop/hive/trunk/eclipse-templates/.externalToolBuilders/Hive_Ant_Builder.launch Thu Jan  8 11:17:30 2009
@@ -7,7 +7,7 @@
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/hive_ws3/build.xml"/>
+<listEntry value="/@PROJECT@/build.xml"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
@@ -16,8 +16,8 @@
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="hive_ws3"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/hive_ws3/build.xml}"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/@PROJECT@/build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,clean"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 </launchConfiguration>

Modified: hadoop/hive/trunk/eclipse-templates/.project
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/eclipse-templates/.project?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/eclipse-templates/.project (original)
+++ hadoop/hive/trunk/eclipse-templates/.project Thu Jan  8 11:17:30 2009
@@ -6,6 +6,11 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
 			<triggers>auto,clean,incremental,</triggers>
 			<arguments>
@@ -15,6 +20,7 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>

Added: hadoop/hive/trunk/eclipse-templates/TestCliDriver.launchtemplate
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/eclipse-templates/TestCliDriver.launchtemplate?rev=732798&view=auto
==============================================================================
--- hadoop/hive/trunk/eclipse-templates/TestCliDriver.launchtemplate (added)
+++ hadoop/hive/trunk/eclipse-templates/TestCliDriver.launchtemplate Thu Jan  8 11:17:30 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/hadoopcore/hadoop-@HADOOPVER@"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;@PROJECT@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/build/metastore/metastore_model.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/metastore/src/model&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/build/hadoopcore/hadoop-@HADOOPVER@/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/data/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@PROJECT@&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.cli.TestCliDriver"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
+</launchConfiguration>

Added: hadoop/hive/trunk/eclipse-templates/TestHive.launchtemplate
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/eclipse-templates/TestHive.launchtemplate?rev=732798&view=auto
==============================================================================
--- hadoop/hive/trunk/eclipse-templates/TestHive.launchtemplate (added)
+++ hadoop/hive/trunk/eclipse-templates/TestHive.launchtemplate Thu Jan  8 11:17:30 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/hadoopcore/hadoop-@HADOOPVER@"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;@PROJECT@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/build/metastore/metastore_model.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/metastore/src/model&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/build/hadoopcore/hadoop-@HADOOPVER@/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/data/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@PROJECT@&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.ql.metadata.TestHive"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
+</launchConfiguration>

Added: hadoop/hive/trunk/eclipse-templates/TestJdbc.launchtemplate
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/eclipse-templates/TestJdbc.launchtemplate?rev=732798&view=auto
==============================================================================
--- hadoop/hive/trunk/eclipse-templates/TestJdbc.launchtemplate (added)
+++ hadoop/hive/trunk/eclipse-templates/TestJdbc.launchtemplate Thu Jan  8 11:17:30 2009
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="HADOOP_HOME" value="${workspace_loc:@PROJECT@}/build/hadoopcore/hadoop-@HADOOPVER@"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;@PROJECT@&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/build/metastore/metastore_model.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/metastore/src/model&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/build/hadoopcore/hadoop-@HADOOPVER@/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/data/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;@PROJECT@&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/@PROJECT@/conf&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.hadoop.hive.jdbc.TestJdbcDriver"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@PROJECT@"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:@PROJECT@}/ql"/>
+</launchConfiguration>

Modified: hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/FileStore.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/FileStore.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/FileStore.java (original)
+++ hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/FileStore.java Thu Jan  8 11:17:30 2009
@@ -55,13 +55,11 @@
 
   private Configuration conf;
 
-  @Override
   public Configuration getConf() {
     // TODO Auto-generated method stub
     return null;
   }
 
-  @Override
   public void setConf(Configuration conf) {
     this.conf = conf;
     String msRootPath = HiveConf.getVar(conf, HiveConf.ConfVars.METASTOREDIRECTORY);
@@ -105,7 +103,6 @@
     return f;
   }
 
-  @Override
   public boolean createDatabase(Database db) throws MetaException {
     // ignores the location param
     boolean mkdir = getDBDir(db.getName()).mkdir();
@@ -115,7 +112,6 @@
     return mkdir;
   }
 
-  @Override
   public boolean createDatabase(String name) throws MetaException {
     return this.createDatabase(new Database(name, "ignored param"));
   }
@@ -220,7 +216,6 @@
     return names;
   }
 
-  @Override
   public List<String> getTables(String dbName, String pattern) throws MetaException {
     try {
       return this.getTablesByPattern(new DB(dbName, conf), pattern);
@@ -243,12 +238,10 @@
     return dbName.equals(MetaStore.DefaultDB) || f.isDirectory();
   }
 
-  @Override
   public boolean dropDatabase(String dbname) {
     return true; // no-op
   }
 
-  @Override
   public Database getDatabase(String name) throws NoSuchObjectException {
     try {
       DB db = new DB(name, conf);
@@ -259,7 +252,6 @@
     }
   }
 
-  @Override
   /**
    * getDatabases
    *
@@ -292,14 +284,12 @@
     return getSchemaFile(dbName, tableName).exists();
   }
 
-  @Override
   public void alterTable(String dbname, String name, Table newTable) throws InvalidObjectException,
       MetaException {
     // TODO Auto-generated method stub
     throw new MetaException("Not yet implemented");
   }
 
-  @Override
   public void createTable(Table tbl) throws InvalidObjectException, MetaException {
     Properties p = MetaStoreUtils.getSchema(tbl);
     try {
@@ -310,7 +300,6 @@
     }
   }
 
-  @Override
   public boolean dropTable(String dbName, String tableName) throws MetaException {
     try {
       new DB(dbName, conf).getTable(tableName, false).drop();
@@ -321,7 +310,6 @@
     return true;
   }
 
-  @Override
   public Table getTable(String dbName, String tableName) throws MetaException {
     try {
       Properties p = new DB(dbName, conf).getTable(tableName, true).getSchema();
@@ -332,67 +320,55 @@
     }
   }
 
-  @Override
   public boolean createType(Type type) {
     return true; // no-op
   }
 
-  @Override
   public boolean dropType(String typeName) {
     return true; // no-op
   }
 
-  @Override
   public boolean addPartition(Partition part) throws InvalidObjectException, MetaException {
     return true; // no-op as there is no metadata 
   }
 
-  @Override
   public boolean dropPartition(String dbName, String tableName, List<String> part_vals)
       throws MetaException {
     return true; // no-op
   }
 
-  @Override
   public Partition getPartition(String dbName, String tableName, List<String> part_vals)
       throws MetaException {
     // TODO Auto-generated method stub
     throw new MetaException("Not yet implemented");
   }
 
-  @Override
   public List<Partition> getPartitions(String dbName, String tableName, int max)
       throws MetaException {
     // TODO Auto-generated method stub
     throw new MetaException("Not yet implemented");
   }
 
-  @Override
   public Type getType(String typeName) {
     return null; // no-op
   }
 
-  @Override
   public boolean openTransaction() {
     return true;
   }
 
-  @Override
   public void rollbackTransaction() {
     // no-op
   }
 
-  @Override
   public boolean commitTransaction() {
     return true; // no-op
   }
 
-  @Override
   public void shutdown() {
     // no-op
   }
 
-  @Override
   public List<String> listPartitionNames(String db_name, String tbl_name, short max_parts)
       throws MetaException {
     // TODO Auto-generated method stub

Modified: hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Thu Jan  8 11:17:30 2009
@@ -581,7 +581,6 @@
         }
       }
 
-      @Override
       public List<String> get_tables(String dbname, String pattern) throws MetaException {
         this.incrementCounter("get_tables");
         logStartFunction("get_tables: db=" + dbname + " pat=" + pattern);

Modified: hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (original)
+++ hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java Thu Jan  8 11:17:30 2009
@@ -472,7 +472,6 @@
     return getTable(MetaStoreUtils.DEFAULT_DATABASE_NAME, tableName);
   }
 
-  @Override
   public List<String> listPartitionNames(String dbName, String tblName, short max)
       throws MetaException, TException {
     // TODO Auto-generated method stub

Modified: hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreClient.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreClient.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreClient.java (original)
+++ hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreClient.java Thu Jan  8 11:17:30 2009
@@ -335,14 +335,12 @@
   
 
   //These will disappear when the server is unified for both filestore and dbstore
-  @Override
   public List<Partition> listPartitions(String dbName, String tableName, short max_parts)
       throws NoSuchObjectException, MetaException, TException {
     //TODO: move the code from Table.getPartitions() to here
     return new ArrayList<Partition>();
   }
 
-  @Override
   public Partition getPartition(String dbName, String tableName, List<String> partVals)
       throws MetaException, TException {
     if(partVals.size() == 0) {
@@ -362,7 +360,6 @@
     }
   }
 
-  @Override
   public void createTable(Table tbl) throws AlreadyExistsException, InvalidObjectException,
       MetaException, NoSuchObjectException, TException {
     Properties schema = MetaStoreUtils.getSchema(tbl);
@@ -425,26 +422,22 @@
     return tPartition;
   }
 
-  @Override
   public void alter_table(String defaultDatabaseName, String tblName, Table table)
       throws InvalidOperationException, MetaException, TException {
     throw new MetaException("Not yet implementd in filestore");
   }
 
-  @Override
   public boolean createDatabase(String name, String location_uri) throws AlreadyExistsException,
       MetaException, TException {
     // TODO Auto-generated method stub
     return false;
   }
 
-  @Override
   public boolean dropDatabase(String name) throws MetaException, TException {
     // TODO Auto-generated method stub
     return false;
   }
 
-  @Override
   public List<String> listPartitionNames(String db_name, String tbl_name, short max_parts)
       throws MetaException, TException {
     // TODO Auto-generated method stub

Modified: hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (original)
+++ hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java Thu Jan  8 11:17:30 2009
@@ -90,12 +90,10 @@
   
   public ObjectStore() {}
 
-  @Override
   public Configuration getConf() {
     return hiveConf;
   }
 
-  @Override
   @SuppressWarnings("nls")
   public void setConf(Configuration conf) {
     this.hiveConf = conf;

Modified: hadoop/hive/trunk/ql/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/build.xml?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/build.xml (original)
+++ hadoop/hive/trunk/ql/build.xml Thu Jan  8 11:17:30 2009
@@ -43,7 +43,7 @@
   </path>
 
 
-  <target name="gen-test" depends="deploy-ant-tasks, test-conditions" >
+  <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}/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"/>
     
@@ -52,28 +52,32 @@
               queryDirectory="${ql.test.query.dir}/positive"
               queryFile="${qfile}"
               resultsDirectory="${ql.test.results.dir}/compiler" className="TestParse"
-              logFile="${test.log.dir}/testparsegen.log"/>
+              logFile="${test.log.dir}/testparsegen.log"
+              logDirectory="${test.log.dir}/positive"/>
     
     <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/ql/parse" 
               templatePath="${ql.test.template.dir}" template="TestParseNegative.vm" 
               queryDirectory="${ql.test.query.dir}/negative" 
               queryFile="${qfile}"
               resultsDirectory="${ql.test.results.dir}/compiler/errors" className="TestParseNegative"
-              logFile="${test.log.dir}/testparseneggen.log"/>
+              logFile="${test.log.dir}/testparseneggen.log"
+              logDirectory="${test.log.dir}/negative"/>
 
     <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
               templatePath="${ql.test.template.dir}" template="TestCliDriver.vm" 
               queryDirectory="${ql.test.query.clientpositive.dir}" 
               queryFile="${qfile}"
               resultsDirectory="${ql.test.results.clientpositive.dir}" className="TestCliDriver"
-              logFile="${test.log.dir}/testclidrivergen.log"/>
+              logFile="${test.log.dir}/testclidrivergen.log"
+              logDirectory="${test.log.dir}/clientpositive"/>
 
     <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli" 
               templatePath="${ql.test.template.dir}" template="TestNegativeCliDriver.vm" 
               queryDirectory="${ql.test.query.dir}/clientnegative" 
               queryFile="${qfile}"
               resultsDirectory="${ql.test.results.dir}/clientnegative" className="TestNegativeCliDriver"
-              logFile="${test.log.dir}/testnegclidrivergen.log"/>
+              logFile="${test.log.dir}/testnegclidrivergen.log"
+              logDirectory="${test.log.dir}/clientnegative"/>
 
   </target>
 

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ASTNode.java Thu Jan  8 11:17:30 2009
@@ -40,7 +40,6 @@
   /* (non-Javadoc)
    * @see org.apache.hadoop.hive.ql.lib.Node#getChildren()
    */
-  @Override
   public Vector<Node> getChildren() {
     if (super.getChildCount() == 0) {
       return null;
@@ -57,7 +56,6 @@
   /* (non-Javadoc)
    * @see org.apache.hadoop.hive.ql.lib.Node#getName()
    */
-  @Override
   public String getName() {
     return (new Integer(super.getToken().getType())).toString();
   }

Modified: hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/tools/LineageInfo.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/tools/LineageInfo.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/tools/LineageInfo.java (original)
+++ hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/tools/LineageInfo.java Thu Jan  8 11:17:30 2009
@@ -76,7 +76,6 @@
   /**
    * Implements the process method for the NodeProcessor interface.
    */
-  @Override
   public void process(Node nd, NodeProcessorCtx procCtx)
   throws SemanticException {
     ASTNode pt = (ASTNode)nd;

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=732798&r1=732797&r2=732798&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 Thu Jan  8 11:17:30 2009
@@ -154,13 +154,13 @@
     }
   }
 
-  public QTestUtil(String outDir) throws Exception {
+  public QTestUtil(String outDir, String logDir) throws Exception {
     this.outDir = outDir;
+    this.logDir = logDir;
     conf = new HiveConf(Driver.class);
 
     // System.out.println(conf.toString());
     testFiles = conf.get("test.data.files").replace('\\', '/').replace("c:", "");
-    logDir = conf.get("test.log.dir");
 
     String ow = System.getProperty("test.output.overwrite");
     overWrite = false;
@@ -724,15 +724,16 @@
    * In multithreaded mode each query file is run in a separate thread. the caller has to 
    * arrange that different query files do not collide (in terms of destination tables)
    */
-  public static boolean queryListRunner(File [] qfiles, String [] resDirs, boolean mt) {
+  public static boolean queryListRunner(File [] qfiles, String [] resDirs, String[] logDirs, boolean mt) {
 
     assert(qfiles.length == resDirs.length);
+    assert(qfiles.length == logDirs.length);
     boolean failed = false;        
 
     try {
       QTestUtil[] qt = new QTestUtil [qfiles.length];
       for(int i=0; i<qfiles.length; i++) {
-        qt[i] = new QTestUtil(resDirs[i]);
+        qt[i] = new QTestUtil(resDirs[i], logDirs[i]);
         qt[i].addFile(qfiles[i]);
       }
 

Modified: hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java (original)
+++ hadoop/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java Thu Jan  8 11:17:30 2009
@@ -35,17 +35,20 @@
 
   private String inpDir = System.getProperty("ql.test.query.clientpositive.dir");
   private String resDir = System.getProperty("ql.test.results.clientpositive.dir");
+  private String logDir = System.getProperty("test.log.dir"+"/clientpositive");
 
   public void testMTQueries1()  throws Exception {
     String[] testNames = new String [] {"join1.q", "join2.q", "groupby1.q", "groupby2.q", "join3.q", "input1.q", "input19.q"};
+    String [] logDirs = new String [testNames.length];
     String [] resDirs = new String [testNames.length];
     File [] qfiles = new File [testNames.length];
     for(int i=0; i<resDirs.length; i++) {
+      logDirs[i] = logDir;
       resDirs[i] = resDir;
       qfiles[i] = new File(inpDir, testNames[i]);
     }
 
-    boolean success = QTestUtil.queryListRunner(qfiles, resDirs, true);
+    boolean success = QTestUtil.queryListRunner(qfiles, resDirs, logDirs, true);
     if(!success)
       fail ("One or more queries failed");
   }

Modified: hadoop/hive/trunk/ql/src/test/templates/TestCliDriver.vm
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/templates/TestCliDriver.vm?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/templates/TestCliDriver.vm (original)
+++ hadoop/hive/trunk/ql/src/test/templates/TestCliDriver.vm Thu Jan  8 11:17:30 2009
@@ -25,7 +25,7 @@
   @Override
   protected void setUp() {
     try {
-      qt = new QTestUtil("$resultsDir.getCanonicalPath()");
+      qt = new QTestUtil("$resultsDir.getCanonicalPath()", "$logDir.getCanonicalPath()");
 
 #foreach ($qf in $qfiles)
       qt.addFile("$qf.getCanonicalPath()");

Modified: hadoop/hive/trunk/ql/src/test/templates/TestNegativeCliDriver.vm
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/templates/TestNegativeCliDriver.vm?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/templates/TestNegativeCliDriver.vm (original)
+++ hadoop/hive/trunk/ql/src/test/templates/TestNegativeCliDriver.vm Thu Jan  8 11:17:30 2009
@@ -25,7 +25,7 @@
   @Override
   protected void setUp() {
     try {
-      qt = new QTestUtil("$resultsDir.getCanonicalPath()");
+      qt = new QTestUtil("$resultsDir.getCanonicalPath()", "$logDir.getCanonicalPath()");
 
 #foreach ($qf in $qfiles)
       qt.addFile("$qf.getCanonicalPath()");

Modified: hadoop/hive/trunk/ql/src/test/templates/TestParse.vm
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/templates/TestParse.vm?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/templates/TestParse.vm (original)
+++ hadoop/hive/trunk/ql/src/test/templates/TestParse.vm Thu Jan  8 11:17:30 2009
@@ -22,7 +22,7 @@
   @Override
   protected void setUp() {
     try {
-      qt = new QTestUtil("$resultsDir.getCanonicalPath()");
+      qt = new QTestUtil("$resultsDir.getCanonicalPath()", "$logDir.getCanonicalPath()");
 
 #foreach ($qf in $qfiles)
       qt.addFile("$qf.getCanonicalPath()");

Modified: hadoop/hive/trunk/ql/src/test/templates/TestParseNegative.vm
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/ql/src/test/templates/TestParseNegative.vm?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/ql/src/test/templates/TestParseNegative.vm (original)
+++ hadoop/hive/trunk/ql/src/test/templates/TestParseNegative.vm Thu Jan  8 11:17:30 2009
@@ -22,7 +22,7 @@
   @Override
   protected void setUp() {
     try {
-      qt = new QTestUtil("$resultsDir.getCanonicalPath()");
+      qt = new QTestUtil("$resultsDir.getCanonicalPath()", "$logDir.getCanonicalPath()");
 
 #foreach ($qf in $qfiles)
       qt.addFile("$qf.getCanonicalPath()");

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/dynamic_type/DynamicSerDe.java Thu Jan  8 11:17:30 2009
@@ -158,18 +158,15 @@
     }
   }
 
-  @Override
   public ObjectInspector getObjectInspector() throws SerDeException {
     return dynamicSerDeStructBaseToObjectInspector(this.bt);
   }
 
-  @Override
   public Class<? extends Writable> getSerializedClass() {
     return BytesWritable.class;
   }
 
   BytesWritable ret = new BytesWritable();
-  @Override
   public Writable serialize(Object obj, ObjectInspector objInspector)
   throws SerDeException {
     try {

Modified: hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java (original)
+++ hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/thrift/TBinarySortableProtocol.java Thu Jan  8 11:17:30 2009
@@ -104,7 +104,6 @@
    */
   boolean ascending; 
   
-  @Override
   public void initialize(Configuration conf, Properties tbl) throws TException {
     sortOrder = tbl.getProperty(Constants.SERIALIZATION_SORT_ORDER);
     if (sortOrder == null) {
@@ -534,12 +533,10 @@
   }
 
   boolean lastPrimitiveWasNull;
-  @Override
   public boolean lastPrimitiveWasNull() throws TException {
     return lastPrimitiveWasNull;
   }
 
-  @Override
   public void writeNull() throws TException {
     writeRawBytes(nullByte, 0, 1);
   }

Modified: hadoop/hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java?rev=732798&r1=732797&r2=732798&view=diff
==============================================================================
--- hadoop/hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java (original)
+++ hadoop/hive/trunk/service/src/java/org/apache/hadoop/hive/service/HiveServer.java Thu Jan  8 11:17:30 2009
@@ -99,7 +99,6 @@
      *
      * @param query HiveQL query to execute
      */
-    @Override
     public void execute(String query) throws HiveServerException, TException {
       HiveServerHandler.LOG.info("Running the query: " + query);
       int rc = 0;
@@ -117,7 +116,6 @@
     /**
      * Return the schema of the query result
      */
-    @Override
     public String getSchema() throws HiveServerException, TException {
       try {
         return driver.getSchema();
@@ -132,7 +130,6 @@
      * 
      * @return the next row in a query result set. null if there is no more row to fetch.
      */
-    @Override
     public String fetchOne() throws HiveServerException, TException {
       driver.setMaxRows(1);
       Vector<String> result = new Vector<String>();
@@ -155,7 +152,6 @@
      *         row to fetch or numRows == 0. 
      * @throws HiveServerException Invalid value for numRows (numRows < 0)
      */
-    @Override
     public List<String> fetchN(int numRows) throws HiveServerException, TException {
       if (numRows < 0) {
         throw new HiveServerException("Invalid argument for number of rows: " + numRows);
@@ -174,7 +170,6 @@
      * TODO: Currently the server buffers all the rows before returning them 
      * to the client. Decide whether the buffering should be done in the client.
      */
-    @Override
     public List<String> fetchAll() throws HiveServerException, TException {
       Vector<String> rows = new Vector<String>();
       Vector<String> result = new Vector<String>();



Mime
View raw message