You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2013/10/24 15:42:35 UTC

svn commit: r1535378 [3/5] - in /hive/branches/maven: ./ ant/ beeline/ cli/ common/ contrib/ data/conf/ data/files/ hbase-handler/ hbase-handler/src/test/queries/negative/ hcatalog/ hcatalog/core/ hcatalog/core/src/main/java/org/apache/hcatalog/mapredu...

Modified: hive/branches/maven/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/pom.xml?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/pom.xml (original)
+++ hive/branches/maven/pom.xml Thu Oct 24 13:42:32 2013
@@ -17,7 +17,7 @@
 
   <groupId>org.apache.hive</groupId>
   <artifactId>hive</artifactId>
-  <version>0.99.0-SNAPSHOT</version>
+  <version>0.13.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Hive</name>
@@ -46,8 +46,10 @@
   </modules>
 
   <properties>
+    <hive.version.shortname>0.13.0</hive.version.shortname>
+
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.local.repository>${user.home}/.m2/repository</maven.local.repository>
+    <maven.repo.local>${user.home}/.m2/repository</maven.repo.local>
     <hive.path.to.root>.</hive.path.to.root>
     <test.tmp.dir>${project.build.directory}/tmp</test.tmp.dir>
     <test.warehouse.dir>${project.build.directory}/warehouse</test.warehouse.dir>
@@ -77,11 +79,12 @@
     <commons-pool.version>1.5.4</commons-pool.version>
     <derby.version>10.4.2.0</derby.version>
     <guava.version>11.0.2</guava.version>
+    <groovy.version>2.1.6</groovy.version>
     <hadoop-20.version>0.20.2</hadoop-20.version>
     <hadoop-20S.version>1.1.2</hadoop-20S.version>
     <hadoop-23.version>2.0.5-alpha</hadoop-23.version>
     <hbase.version>0.94.6.1</hbase.version>
-    <jackson.version>1.8.8</jackson.version>
+    <jackson.version>1.9.2</jackson.version>
     <javaewah.version>0.3.2</javaewah.version>
     <javolution.version>5.5.1</javolution.version>
     <jersey.version>1.14</jersey.version>
@@ -93,10 +96,11 @@
     <jms.version>1.1</jms.version>
     <json.version>20090211</json.version>
     <junit.version>4.10</junit.version>
-    <kryo.version>2.22-SNAPSHOT</kryo.version>
+    <kryo.version>2.22</kryo.version>
     <libfb303.version>0.9.0</libfb303.version>
     <libthrift.version>0.9.0</libthrift.version>
     <log4j.version>1.2.16</log4j.version>
+    <maven-javadoc-plugin.version>2.4</maven-javadoc-plugin.version>
     <mockito-all.version>1.8.2</mockito-all.version>
     <mina.version>2.0.0-M5</mina.version>
     <pig.version>0.10.1</pig.version>
@@ -108,6 +112,7 @@
     <snappy.version>0.2</snappy.version>
     <wadl-resourcedoc-doclet.version>1.4</wadl-resourcedoc-doclet.version>
     <velocity.version>1.5</velocity.version>
+    <xerces.version>2.9.1</xerces.version>
     <zookeeper.version>3.4.3</zookeeper.version>
   </properties>
 
@@ -121,6 +126,9 @@
         <enabled>true</enabled>
         <checksumPolicy>warn</checksumPolicy>
       </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
     </repository>
     <repository>
       <id>glassfish-repository</id>
@@ -289,6 +297,27 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <filesets>
+            <fileset>
+              <directory>./</directory>
+              <includes>
+                <include>datanucleus.log</include>
+                <include>derby.log</include>
+              </includes>
+              <followSymlinks>false</followSymlinks>
+            </fileset>
+            <fileset>
+              <directory>build</directory>
+              <followSymlinks>false</followSymlinks>
+            </fileset>
+          </filesets>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <excludes>
@@ -303,6 +332,7 @@
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <reuseForks>false</reuseForks>
           <failIfNoTests>false</failIfNoTests>
+          <argLine></argLine>
           <additionalClasspathElements>
             <additionalClasspathElement>${test.tmp.dir}/conf</additionalClasspathElement>
             <additionalClasspathElement>${basedir}/${hive.path.to.root}/conf</additionalClasspathElement>
@@ -315,20 +345,33 @@
           </environmentVariables>
           <systemPropertyVariables>
             <build.dir>${project.build.directory}</build.dir>
+            <!-- required by zk test ClientBase -->
+            <build.test.dir>${test.tmp.dir}</build.test.dir>
+            <!-- required by a few tests to find the derby jar -->
             <derby.version>${derby.version}</derby.version>
             <derby.stream.error.file>${test.tmp.dir}/derby.log</derby.stream.error.file>
             <hadoop.bin.path>${basedir}/${hive.path.to.root}/testutils/hadoop</hadoop.bin.path>
+            <!-- required by Hadoop's JobHistory -->
+            <hadoop.log.dir>${test.tmp.dir}</hadoop.log.dir>
             <hive.root>${basedir}/${hive.path.to.root}/</hive.root>
             <hive.version>${project.version}</hive.version>
-            <maven.local.repository>${maven.local.repository}</maven.local.repository>
+            <!-- required for hive-exec jar path and tests which reference a jar -->
+            <maven.local.repository>${maven.repo.local}</maven.local.repository>
+            <mapred.job.tracker>local</mapred.job.tracker>
             <log4j.configuration>file://${test.tmp.dir}/conf/hive-log4j.properties</log4j.configuration>
+            <log4j.debug>true</log4j.debug>
+            <!-- don't diry up /tmp -->
             <java.io.tmpdir>${test.tmp.dir}</java.io.tmpdir>
+            <!-- Hadoop's minidfs class uses this -->
+            <test.build.data>${test.tmp.dir}</test.build.data>
+            <!-- required by QTestUtil -->
             <test.data.files>${basedir}/${hive.path.to.root}/data/files</test.data.files>
             <test.data.dir>${basedir}/${hive.path.to.root}/data/files</test.data.dir>
             <test.tmp.dir>${test.tmp.dir}</test.tmp.dir>
             <test.dfs.mkdir>${test.dfs.mkdir}</test.dfs.mkdir>
             <test.output.overwrite>${test.output.overwrite}</test.output.overwrite>
             <test.warehouse.dir>${test.warehouse.scheme}${test.warehouse.dir}</test.warehouse.dir>
+            <!-- EnforceReadOnlyTables hook and QTestUtil -->
             <test.src.tables>src,src1,srcbucket,srcbucket2,src_json,src_thrift,src_sequencefile,srcpart,alltypesorc</test.src.tables>
           </systemPropertyVariables>
         </configuration>

Added: hive/branches/maven/ql/.gitignore
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/.gitignore?rev=1535378&view=auto
==============================================================================
--- hive/branches/maven/ql/.gitignore (added)
+++ hive/branches/maven/ql/.gitignore Thu Oct 24 13:42:32 2013
@@ -0,0 +1 @@
+dependency-reduced-pom.xml

Modified: hive/branches/maven/ql/pom.xml
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/pom.xml?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/pom.xml (original)
+++ hive/branches/maven/ql/pom.xml Thu Oct 24 13:42:32 2013
@@ -19,11 +19,11 @@
   <parent>
     <groupId>org.apache.hive</groupId>
     <artifactId>hive</artifactId>
-    <version>0.99.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>hive-ql</artifactId>
+  <artifactId>hive-exec</artifactId>
   <packaging>jar</packaging>
   <name>Hive Query Language</name>
 
@@ -100,6 +100,11 @@
       <version>${avro.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>${ant.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libfb303</artifactId>
       <version>${libfb303.version}</version>
@@ -115,6 +120,11 @@
       <version>${zookeeper.version}</version>
     </dependency>
     <dependency>
+      <groupId>org.codehaus.groovy</groupId>
+      <artifactId>groovy-all</artifactId>
+      <version>${groovy.version}</version>
+    </dependency>
+    <dependency>
       <groupId>org.datanucleus</groupId>
       <artifactId>datanucleus-core</artifactId>
       <version>${datanucleus-core.version}</version>
@@ -280,13 +290,11 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
-              <shadedClassifierName>exec-bundle</shadedClassifierName>
               <artifactSet>
                 <includes>
                   <!-- order is meant to be the same as the ant build -->
                   <include>org.apache.hive:hive-common</include>
-                  <include>org.apache.hive:hive-ql</include>
+                  <include>org.apache.hive:hive-exec</include>
                   <include>org.apache.hive:hive-serde</include>
                   <include>com.esotericsoftware.kryo:kryo</include>
                   <include>org.apache.thrift:libthrift</include>

Modified: hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original)
+++ hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Thu Oct 24 13:42:32 2013
@@ -140,55 +140,45 @@ public class Driver implements CommandPr
 
   private String userName;
 
-  private boolean checkLockManager() {
+  private boolean checkConcurrency() throws SemanticException {
     boolean supportConcurrency = conf.getBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY);
     if (!supportConcurrency) {
+      LOG.info("Concurrency mode is disabled, not creating a lock manager");
       return false;
     }
-    if ((hiveLockMgr == null)) {
-      try {
-        setLockManager();
-      } catch (SemanticException e) {
-        errorMessage = "FAILED: Error in semantic analysis: " + e.getMessage();
-        SQLState = ErrorMsg.findSQLState(e.getMessage());
-        downstreamError = e;
-        console.printError(errorMessage, "\n"
-            + org.apache.hadoop.util.StringUtils.stringifyException(e));
-        return false;
-      }
-    }
+    createLockManager();
     // the reason that we set the lock manager for the cxt here is because each
     // query has its own ctx object. The hiveLockMgr is shared accross the
     // same instance of Driver, which can run multiple queries.
     ctx.setHiveLockMgr(hiveLockMgr);
-    return hiveLockMgr != null;
+    return true;
   }
 
-  private void setLockManager() throws SemanticException {
-    boolean supportConcurrency = conf.getBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY);
-    if (supportConcurrency) {
-      String lockMgr = conf.getVar(HiveConf.ConfVars.HIVE_LOCK_MANAGER);
-      if ((lockMgr == null) || (lockMgr.isEmpty())) {
-        throw new SemanticException(ErrorMsg.LOCKMGR_NOT_SPECIFIED.getMsg());
-      }
-
-      try {
-        hiveLockMgr = (HiveLockManager) ReflectionUtils.newInstance(conf.getClassByName(lockMgr),
-            conf);
-        hiveLockMgr.setContext(new HiveLockManagerCtx(conf));
-      } catch (Exception e) {
-        // set hiveLockMgr to null just in case this invalid manager got set to
-        // next query's ctx.
-        if (hiveLockMgr != null) {
-          try {
-            hiveLockMgr.close();
-          } catch (LockException e1) {
-            //nothing can do here
-          }
-          hiveLockMgr = null;
+  private void createLockManager() throws SemanticException {
+    if (hiveLockMgr != null) {
+      return;
+    }
+    String lockMgr = conf.getVar(HiveConf.ConfVars.HIVE_LOCK_MANAGER);
+    LOG.info("Creating lock manager of type " + lockMgr);
+    if ((lockMgr == null) || (lockMgr.isEmpty())) {
+      throw new SemanticException(ErrorMsg.LOCKMGR_NOT_SPECIFIED.getMsg());
+    }
+    try {
+      hiveLockMgr = (HiveLockManager) ReflectionUtils.newInstance(conf.getClassByName(lockMgr),
+          conf);
+      hiveLockMgr.setContext(new HiveLockManagerCtx(conf));
+    } catch (Exception e1) {
+      // set hiveLockMgr to null just in case this invalid manager got set to
+      // next query's ctx.
+      if (hiveLockMgr != null) {
+        try {
+          hiveLockMgr.close();
+        } catch (LockException e2) {
+          //nothing can do here
         }
-        throw new SemanticException(ErrorMsg.LOCKMGR_NOT_INITIALIZED.getMsg() + e.getMessage());
+        hiveLockMgr = null;
       }
+      throw new SemanticException(ErrorMsg.LOCKMGR_NOT_INITIALIZED.getMsg() + e1.getMessage(), e1);
     }
   }
 
@@ -1009,7 +999,18 @@ public class Driver implements CommandPr
     }
 
     boolean requireLock = false;
-    boolean ckLock = checkLockManager();
+    boolean ckLock = false;
+    try {
+      ckLock = checkConcurrency();
+    } catch (SemanticException e) {
+      errorMessage = "FAILED: Error in semantic analysis: " + e.getMessage();
+      SQLState = ErrorMsg.findSQLState(e.getMessage());
+      downstreamError = e;
+      console.printError(errorMessage, "\n"
+          + org.apache.hadoop.util.StringUtils.stringifyException(e));
+      ret = 10;
+      return new CommandProcessorResponse(ret, errorMessage, SQLState);
+    }
 
     if (ckLock) {
       boolean lockOnlyMapred = HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_LOCK_MAPRED_ONLY);

Modified: hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBridge.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBridge.java?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBridge.java (original)
+++ hive/branches/maven/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFBridge.java Thu Oct 24 13:42:32 2013
@@ -43,23 +43,43 @@ import org.apache.hadoop.hive.serde2.typ
  *
  */
 public class GenericUDFBridge extends GenericUDF implements Serializable {
+  private static final long serialVersionUID = 4994861742809511113L;
+
   /**
    * The name of the UDF.
    */
-  String udfName;
+  private String udfName;
 
   /**
    * Whether the UDF is an operator or not. This controls how the display string
    * is generated.
    */
-  boolean isOperator;
+  private boolean isOperator;
 
   /**
    * The underlying UDF class Name.
    */
-  String udfClassName;
+  private String udfClassName;
+
+  /**
+   * The underlying method of the UDF class.
+   */
+  private transient Method udfMethod;
 
   /**
+   * Helper to convert the parameters before passing to udfMethod.
+   */
+  private transient ConversionHelper conversionHelper;
+  /**
+   * The actual udf object.
+   */
+  private transient UDF udf;
+  /**
+   * The non-deferred real arguments for method invocation.
+   */
+  private transient Object[] realArguments;
+  
+  /**
    * Create a new GenericUDFBridge object.
    *
    * @param udfName
@@ -73,7 +93,7 @@ public class GenericUDFBridge extends Ge
     this.isOperator = isOperator;
     this.udfClassName = udfClassName;
   }
-
+  
   // For Java serialization only
   public GenericUDFBridge() {
   }
@@ -110,24 +130,6 @@ public class GenericUDFBridge extends Ge
     }
   }
 
-  /**
-   * The underlying method of the UDF class.
-   */
-  transient Method udfMethod;
-
-  /**
-   * Helper to convert the parameters before passing to udfMethod.
-   */
-  transient ConversionHelper conversionHelper;
-  /**
-   * The actual udf object.
-   */
-  transient UDF udf;
-  /**
-   * The non-deferred real arguments for method invocation.
-   */
-  transient Object[] realArguments;
-
   @Override
   public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException {
 

Modified: hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/BaseTestQueries.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/BaseTestQueries.java?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/BaseTestQueries.java (original)
+++ hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/BaseTestQueries.java Thu Oct 24 13:42:32 2013
@@ -28,11 +28,11 @@ import junit.framework.TestCase;
 public abstract class BaseTestQueries extends TestCase {
 
   protected final String inpDir = System
-      .getProperty("ql.test.query.clientpositive.dir");
+      .getProperty("hive.root") + "/ql/src/test/queries/clientpositive";
   protected final String resDir = System
-      .getProperty("ql.test.results.clientpositive.dir");
-  protected final String logDir = System.getProperty("test.log.dir")
-      + "/clientpositive";
+      .getProperty("hive.root") + "/ql/src/test/results/clientpositive";
+  protected final String logDir = System
+      .getProperty("build.dir") + "/junit-qfile-results/clientpositive";
 
   /**
    * Create a file for each test name in the inpDir.

Modified: hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java Thu Oct 24 13:42:32 2013
@@ -477,14 +477,14 @@ public class QTestUtil {
   /**
    * Clear out any side effects of running tests
    */
-  public void clearPostTestEffects () throws Exception {
+  public void clearPostTestEffects() throws Exception {
     setup.postTest(conf);
   }
 
   /**
    * Clear out any side effects of running tests
    */
-  public void clearTestSideEffects () throws Exception {
+  public void clearTestSideEffects() throws Exception {
     // Delete any tables other than the source tables
     // and any databases other than the default database.
     for (String dbName : db.getAllDatabases()) {
@@ -766,7 +766,7 @@ public class QTestUtil {
 
     cliDriver = new CliDriver();
     if (tname.equals("init_file.q")) {
-      ss.initFiles.add("../data/scripts/test_init_file.sql");
+      ss.initFiles.add("../../data/scripts/test_init_file.sql");
     }
     cliDriver.processInitFiles(ss);
   }

Modified: hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java (original)
+++ hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestLocationQueries.java Thu Oct 24 13:42:32 2013
@@ -32,6 +32,14 @@ import java.util.regex.Pattern;
  *  ignored.
  */
 public class TestLocationQueries extends BaseTestQueries {
+
+  public TestLocationQueries() {
+    File logDirFile = new File(logDir);
+    if (!(logDirFile.exists() || logDirFile.mkdirs())) {
+      fail("Could not create " + logDir);
+    }
+  }
+
   /**
    * Our own checker - validate the location of the partition.
    */

Modified: hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java (original)
+++ hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/TestMTQueries.java Thu Oct 24 13:42:32 2013
@@ -25,12 +25,19 @@ import java.io.File;
  */
 public class TestMTQueries extends BaseTestQueries {
 
+  public TestMTQueries() {
+    File logDirFile = new File(logDir);
+    if (!(logDirFile.exists() || logDirFile.mkdirs())) {
+      fail("Could not create " + logDir);
+    }
+  }
+
   public void testMTQueries1() throws Exception {
     String[] testNames = new String[] {"join1.q", "join2.q", "groupby1.q",
         "groupby2.q", "join3.q", "input1.q", "input19.q"};
 
     File[] qfiles = setupQFiles(testNames);
-
+ 
     QTestUtil[] qts = QTestUtil.queryListRunnerSetup(qfiles, resDir, logDir);
     boolean success = QTestUtil.queryListRunnerMultiThreaded(qfiles, qts);
     if (!success) {

Added: hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFBridge.java
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFBridge.java?rev=1535378&view=auto
==============================================================================
--- hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFBridge.java (added)
+++ hive/branches/maven/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFBridge.java Thu Oct 24 13:42:32 2013
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hive.ql.udf.generic;
+
+import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
+import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
+import org.junit.Test;
+
+public class TestGenericUDFBridge {
+
+  @Test(expected = UDFArgumentException.class)
+  public void testInvalidName() throws Exception {
+    GenericUDFBridge udf = new GenericUDFBridge("someudf", false, "not a class name");
+    udf.initialize(new ObjectInspector[0]);
+    udf.close();
+  }
+
+  @Test(expected = UDFArgumentException.class)
+  public void testNullName() throws Exception {
+    GenericUDFBridge udf = new GenericUDFBridge("someudf", false, null);
+    udf.initialize(new ObjectInspector[0]);
+    udf.close();
+  }
+}

Modified: hive/branches/maven/ql/src/test/queries/clientnegative/compute_stats_long.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientnegative/compute_stats_long.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientnegative/compute_stats_long.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientnegative/compute_stats_long.q Thu Oct 24 13:42:32 2013
@@ -1,7 +1,7 @@
 create table tab_int(a int);
 
 -- insert some data
-LOAD DATA LOCAL INPATH "../data/files/int.txt" INTO TABLE tab_int;
+LOAD DATA LOCAL INPATH "../../data/files/int.txt" INTO TABLE tab_int;
 
 -- compute stats should raise an error since the number of bit vectors > 1024
 select compute_stats(a, 10000) from tab_int;

Modified: hive/branches/maven/ql/src/test/queries/clientnegative/deletejar.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientnegative/deletejar.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientnegative/deletejar.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientnegative/deletejar.q Thu Oct 24 13:42:32 2013
@@ -1,4 +1,4 @@
 
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-serde.jar;
-DELETE JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-serde.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
+DELETE JAR ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
 CREATE TABLE DELETEJAR(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE;

Modified: hive/branches/maven/ql/src/test/queries/clientnegative/invalid_columns.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientnegative/invalid_columns.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientnegative/invalid_columns.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientnegative/invalid_columns.q Thu Oct 24 13:42:32 2013
@@ -1,4 +1,4 @@
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-serde.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
 CREATE TABLE DELETEJAR(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' 
 STORED AS TEXTFILE
 TBLPROPERTIES('columns'='valid_colname,invalid.colname');

Modified: hive/branches/maven/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientnegative/windowing_ll_no_neg.q Thu Oct 24 13:42:32 2013
@@ -13,7 +13,7 @@ CREATE TABLE part(
     p_comment STRING
 );
 
-LOAD DATA LOCAL INPATH '../data/files/part_tiny.txt' overwrite into table part;
+LOAD DATA LOCAL INPATH '../../data/files/part_tiny.txt' overwrite into table part;
 
 
 select p_mfgr, p_name, p_size,

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/alter1.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/alter1.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/alter1.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/alter1.q Thu Oct 24 13:42:32 2013
@@ -15,7 +15,7 @@ describe extended alter1;
 alter table alter1 set serdeproperties('s1'='10', 's2' ='20');
 describe extended alter1;
 
-add jar ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-serde.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
 alter table alter1 set serde 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties('s1'='9');
 describe extended alter1;
 
@@ -56,7 +56,7 @@ DESCRIBE EXTENDED alter1;
 ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20');
 DESCRIBE EXTENDED alter1;
 
-add jar ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-serde.jar;
+add jar ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
 ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9');
 DESCRIBE EXTENDED alter1;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/create_like.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/create_like.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/create_like.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/create_like.q Thu Oct 24 13:42:32 2013
@@ -21,8 +21,8 @@ INSERT OVERWRITE TABLE table2 SELECT key
 SELECT * FROM table1;
 SELECT * FROM table2;
 
-CREATE EXTERNAL TABLE table4 (a INT) LOCATION '${system:test.src.data.dir}/files/ext_test';
-CREATE EXTERNAL TABLE table5 LIKE table4 LOCATION '${system:test.src.data.dir}/files/ext_test';
+CREATE EXTERNAL TABLE table4 (a INT) LOCATION '${system:hive.root}/data/files/ext_test';
+CREATE EXTERNAL TABLE table5 LIKE table4 LOCATION '${system:hive.root}/data/files/ext_test';
 
 SELECT * FROM table4;
 SELECT * FROM table5;
@@ -31,5 +31,5 @@ DROP TABLE table5;
 SELECT * FROM table4;
 DROP TABLE table4;
 
-CREATE EXTERNAL TABLE table4 (a INT) LOCATION '${system:test.src.data.dir}/files/ext_test';
+CREATE EXTERNAL TABLE table4 (a INT) LOCATION '${system:hive.root}/data/files/ext_test';
 SELECT * FROM table4;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/custom_input_output_format.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/custom_input_output_format.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/custom_input_output_format.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/custom_input_output_format.q Thu Oct 24 13:42:32 2013
@@ -1,4 +1,3 @@
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-udf.jar;
 CREATE TABLE src1_rot13_iof(key STRING, value STRING) 
   STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.udf.Rot13InputFormat'
             OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.udf.Rot13OutputFormat';

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_00_nonpart_empty.q Thu Oct 24 13:42:32 2013
@@ -5,8 +5,8 @@ set hive.test.mode.nosamplelist=exim_dep
 create table exim_department ( dep_id int comment "department id") 	
 	stored as textfile	
 	tblproperties("creator"="krishna");
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
@@ -16,7 +16,7 @@ use importer;
 import from 'ql/test/data/exports/exim_department';
 describe extended exim_department;
 show table extended like exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 select * from exim_department;
 drop table exim_department;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_01_nonpart.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_01_nonpart.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_01_nonpart.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_01_nonpart.q Thu Oct 24 13:42:32 2013
@@ -6,8 +6,8 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" into table exim_department;		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
@@ -17,7 +17,7 @@ use importer;
 import from 'ql/test/data/exports/exim_department';
 describe extended exim_department;
 show table extended like exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 select * from exim_department;
 drop table exim_department;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_00_part_empty.q Thu Oct 24 13:42:32 2013
@@ -7,8 +7,8 @@ create table exim_employee ( emp_id int 
 	partitioned by (emp_country string comment "two char iso code", emp_state string comment "free text")
 	stored as textfile	
 	tblproperties("creator"="krishna");
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -18,7 +18,7 @@ use importer;
 import from 'ql/test/data/exports/exim_employee';
 describe extended exim_employee;
 show table extended like exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_part.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_part.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_part.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_02_part.q Thu Oct 24 13:42:32 2013
@@ -9,8 +9,8 @@ create table exim_employee ( emp_id int 
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="in", emp_state="tn");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -20,7 +20,7 @@ use importer;
 import from 'ql/test/data/exports/exim_employee';
 describe extended exim_employee;
 show table extended like exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_03_nonpart_over_compat.q Thu Oct 24 13:42:32 2013
@@ -6,8 +6,8 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
@@ -21,6 +21,6 @@ import from 'ql/test/data/exports/exim_d
 describe extended exim_department;
 select * from exim_department;
 drop table exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 
 drop database importer;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_all_part.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_all_part.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_all_part.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_all_part.q Thu Oct 24 13:42:32 2013
@@ -15,8 +15,8 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -26,7 +26,7 @@ use importer;
 import from 'ql/test/data/exports/exim_employee';
 describe extended exim_employee;
 show table extended like exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_04_evolved_parts.q Thu Oct 24 13:42:32 2013
@@ -19,8 +19,8 @@ alter table exim_employee set fileformat
 	outputformat "org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat";
 
 alter table exim_employee add partition (emp_country='in', emp_state='ka');
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -32,7 +32,7 @@ describe extended exim_employee;
 describe extended exim_employee partition (emp_country='in', emp_state='tn');
 describe extended exim_employee partition (emp_country='in', emp_state='ka');
 show table extended like exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_05_some_part.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_05_some_part.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_05_some_part.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_05_some_part.q Thu Oct 24 13:42:32 2013
@@ -15,8 +15,8 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee partition (emp_state="ka") to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -26,7 +26,7 @@ use importer;
 import from 'ql/test/data/exports/exim_employee';
 describe extended exim_employee;
 show table extended like exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_06_one_part.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_06_one_part.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_06_one_part.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_06_one_part.q Thu Oct 24 13:42:32 2013
@@ -15,8 +15,8 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee partition (emp_country="in",emp_state="ka") to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -26,7 +26,7 @@ use importer;
 import from 'ql/test/data/exports/exim_employee';
 describe extended exim_employee;
 show table extended like exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_07_all_part_over_nonoverlap.q Thu Oct 24 13:42:32 2013
@@ -15,8 +15,8 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -34,6 +34,6 @@ import from 'ql/test/data/exports/exim_e
 describe extended exim_employee;
 select * from exim_employee;
 drop table exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 
 drop database importer;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_08_nonpart_rename.q Thu Oct 24 13:42:32 2013
@@ -6,8 +6,8 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" into table exim_department;		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
@@ -23,6 +23,6 @@ describe extended exim_imported_dept;
 select * from exim_imported_dept;
 drop table exim_imported_dept;
 drop table exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 
 drop database importer;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_09_part_spec_nonoverlap.q Thu Oct 24 13:42:32 2013
@@ -15,8 +15,8 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -35,6 +35,6 @@ import table exim_employee partition (em
 describe extended exim_employee;
 select * from exim_employee;
 drop table exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 
 drop database importer;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_10_external_managed.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_10_external_managed.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_10_external_managed.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_10_external_managed.q Thu Oct 24 13:42:32 2013
@@ -2,18 +2,18 @@ set hive.test.mode=true;
 set hive.test.mode.prefix=;
 set hive.test.mode.nosamplelist=exim_department,exim_employee;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_department/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 create external table exim_department ( dep_id int comment "department id") 	
 	stored as textfile	
 	location 'ql/test/data/tablestore/exim_department'
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" into table exim_department;		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
-dfs -rmr target/ql/test/data/tablestore/exim_department;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 
 create database importer;
 use importer;
@@ -22,6 +22,6 @@ import from 'ql/test/data/exports/exim_d
 describe extended exim_department;
 select * from exim_department;
 drop table exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 
 drop database importer;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_11_managed_external.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_11_managed_external.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_11_managed_external.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_11_managed_external.q Thu Oct 24 13:42:32 2013
@@ -6,8 +6,8 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" into table exim_department;		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
@@ -17,7 +17,7 @@ use importer;
 import external table exim_department from 'ql/test/data/exports/exim_department';
 describe extended exim_department;
 select * from exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 select * from exim_department;
 drop table exim_department;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_13_managed_location.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_13_managed_location.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_13_managed_location.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_13_managed_location.q Thu Oct 24 13:42:32 2013
@@ -6,23 +6,23 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" into table exim_department;		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_department/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 
 import table exim_department from 'ql/test/data/exports/exim_department' 
 	location 'ql/test/data/tablestore/exim_department';
 describe extended exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 select * from exim_department;
-dfs -rmr target/ql/test/data/tablestore/exim_department;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 select * from exim_department;
 drop table exim_department;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_14_managed_location_over_existing.q Thu Oct 24 13:42:32 2013
@@ -6,16 +6,16 @@ create table exim_department ( dep_id in
 	stored as textfile	
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" into table exim_department;		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_department/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 
 create table exim_department ( dep_id int comment "department id") 	
 	stored as textfile
@@ -24,9 +24,9 @@ create table exim_department ( dep_id in
 import table exim_department from 'ql/test/data/exports/exim_department'
 	location 'ql/test/data/tablestore/exim_department';
 describe extended exim_department;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 select * from exim_department;
-dfs -rmr target/ql/test/data/tablestore/exim_department;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_department;
 select * from exim_department;	
 drop table exim_department;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_15_external_part.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_15_external_part.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_15_external_part.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_15_external_part.q Thu Oct 24 13:42:32 2013
@@ -15,16 +15,16 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_employee/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
 create external table exim_employee ( emp_id int comment "employee id") 	
 	comment "employee table"
@@ -40,9 +40,9 @@ import external table exim_employee part
 	from 'ql/test/data/exports/exim_employee';
 describe extended exim_employee;
 select * from exim_employee;	
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_16_part_external.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_16_part_external.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_16_part_external.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_16_part_external.q Thu Oct 24 13:42:32 2013
@@ -15,18 +15,18 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_employee/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore2/exim_employee/temp;
-dfs -rmr target/ql/test/data/tablestore2/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore2/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore2/exim_employee;
 
 create external table exim_employee ( emp_id int comment "employee id") 	
 	comment "employee table"
@@ -39,11 +39,11 @@ import table exim_employee partition (em
 	location 'ql/test/data/tablestore/exim_employee';
 show table extended like exim_employee;
 show table extended like exim_employee partition (emp_country="us", emp_state="tn");		
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
-dfs -rmr target/ql/test/data/tablestore2/exim_employee;
+dfs -rmr target/tmp/ql/test/data/tablestore2/exim_employee;
 
 drop database importer;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_17_part_managed.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_17_part_managed.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_17_part_managed.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_17_part_managed.q Thu Oct 24 13:42:32 2013
@@ -15,16 +15,16 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_employee/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
 create table exim_employee ( emp_id int comment "employee id") 	
 	comment "employee table"
@@ -39,9 +39,9 @@ alter table exim_employee add partition	
 show table extended like exim_employee;
 show table extended like exim_employee partition (emp_country="us", emp_state="tn");
 show table extended like exim_employee partition (emp_country="us", emp_state="ap");	
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_18_part_external.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_18_part_external.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_18_part_external.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_18_part_external.q Thu Oct 24 13:42:32 2013
@@ -15,8 +15,8 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -29,7 +29,7 @@ describe extended exim_employee;	
 show table extended like exim_employee;
 show table extended like exim_employee partition (emp_country="us", emp_state="tn");
 select * from exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_00_part_external_location.q Thu Oct 24 13:42:32 2013
@@ -11,16 +11,16 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="in", emp_state="tn");	
 load data local inpath "../../data/files/test2.dat" 
 	into table exim_employee partition (emp_country="in", emp_state="ka");	
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_employee/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
 import external table exim_employee 
 	from 'ql/test/data/exports/exim_employee'
@@ -29,9 +29,9 @@ describe extended exim_employee;	
 show table extended like exim_employee;
 show table extended like exim_employee partition (emp_country="in", emp_state="tn");
 show table extended like exim_employee partition (emp_country="in", emp_state="ka");
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_part_external_location.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_part_external_location.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_part_external_location.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_19_part_external_location.q Thu Oct 24 13:42:32 2013
@@ -15,16 +15,16 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_employee/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
 import external table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
@@ -32,9 +32,9 @@ import external table exim_employee part
 describe extended exim_employee;	
 show table extended like exim_employee;
 show table extended like exim_employee partition (emp_country="us", emp_state="tn");
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_20_part_managed_location.q Thu Oct 24 13:42:32 2013
@@ -15,16 +15,16 @@ load data local inpath "../../data/files
 	into table exim_employee partition (emp_country="us", emp_state="tn");	
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="us", emp_state="ka");		
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
 create database importer;
 use importer;
 
-dfs ${system:test.dfs.mkdir} target/ql/test/data/tablestore/exim_employee/temp;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/tablestore/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 
 import table exim_employee partition (emp_country="us", emp_state="tn") 
 	from 'ql/test/data/exports/exim_employee'
@@ -32,9 +32,9 @@ import table exim_employee partition (em
 describe extended exim_employee;	
 show table extended like exim_employee;
 show table extended like exim_employee partition (emp_country="us", emp_state="tn");
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 select * from exim_employee;
-dfs -rmr target/ql/test/data/tablestore/exim_employee;
+dfs -rmr target/tmp/ql/test/data/tablestore/exim_employee;
 select * from exim_employee;
 drop table exim_employee;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_21_export_authsuccess.q Thu Oct 24 13:42:32 2013
@@ -7,8 +7,8 @@ load data local inpath "../../data/files
 set hive.security.authorization.enabled=true;
 
 grant Select on table exim_department to user hive_test_user;
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 
 set hive.security.authorization.enabled=false;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_22_import_exist_authsuccess.q Thu Oct 24 13:42:32 2013
@@ -4,8 +4,8 @@ set hive.test.mode.nosamplelist=exim_dep
 
 create table exim_department ( dep_id int) stored as textfile;
 load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/temp;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
@@ -22,5 +22,5 @@ set hive.security.authorization.enabled=
 select * from exim_department;
 drop table exim_department;
 drop database importer;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_23_import_part_authsuccess.q Thu Oct 24 13:42:32 2013
@@ -9,8 +9,8 @@ create table exim_employee ( emp_id int 
 	tblproperties("creator"="krishna");
 load data local inpath "../../data/files/test.dat" 
 	into table exim_employee partition (emp_country="in", emp_state="tn");
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_employee/temp;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_employee/temp;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 export table exim_employee to 'ql/test/data/exports/exim_employee';
 drop table exim_employee;
 
@@ -29,6 +29,6 @@ import from 'ql/test/data/exports/exim_e
 
 set hive.security.authorization.enabled=false;
 select * from exim_employee;
-dfs -rmr target/ql/test/data/exports/exim_employee;
+dfs -rmr target/tmp/ql/test/data/exports/exim_employee;
 drop table exim_employee;
 drop database importer;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/exim_24_import_nonexist_authsuccess.q Thu Oct 24 13:42:32 2013
@@ -4,8 +4,8 @@ set hive.test.mode.nosamplelist=exim_dep
 
 create table exim_department ( dep_id int) stored as textfile;
 load data local inpath "../../data/files/test.dat" into table exim_department;
-dfs ${system:test.dfs.mkdir} target/ql/test/data/exports/exim_department/test;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs ${system:test.dfs.mkdir} target/tmp/ql/test/data/exports/exim_department/test;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 export table exim_department to 'ql/test/data/exports/exim_department';
 drop table exim_department;
 
@@ -20,5 +20,5 @@ set hive.security.authorization.enabled=
 select * from exim_department;
 drop table exim_department;
 drop database importer;
-dfs -rmr target/ql/test/data/exports/exim_department;
+dfs -rmr target/tmp/ql/test/data/exports/exim_department;
 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/input16.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/input16.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/input16.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/input16.q Thu Oct 24 13:42:32 2013
@@ -1,6 +1,6 @@
 -- TestSerDe is a user defined serde where the default delimiter is Ctrl-B
 DROP TABLE INPUT16;
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-serde.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
 CREATE TABLE INPUT16(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' STORED AS TEXTFILE;
 LOAD DATA LOCAL INPATH '../../data/files/kv1_cb.txt' INTO TABLE INPUT16;
 SELECT INPUT16.VALUE, INPUT16.KEY FROM INPUT16;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/input16_cc.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/input16_cc.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/input16_cc.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/input16_cc.q Thu Oct 24 13:42:32 2013
@@ -4,7 +4,7 @@ set hive.input.format=org.apache.hadoop.
 -- the user is overwriting it with ctrlC
 
 DROP TABLE INPUT16_CC;
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-test-serde.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-test-serde/${system:hive.version}/hive-it-test-serde-${system:hive.version}.jar;
 CREATE TABLE INPUT16_CC(KEY STRING, VALUE STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.TestSerDe'  with serdeproperties ('testserde.default.serialization.format'='\003', 'dummy.prop.not.used'='dummyy.val') STORED AS TEXTFILE;
 LOAD DATA LOCAL INPATH '../../data/files/kv1_cc.txt' INTO TABLE INPUT16_CC;
 SELECT INPUT16_CC.VALUE, INPUT16_CC.KEY FROM INPUT16_CC;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/input44.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/input44.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/input44.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/input44.q Thu Oct 24 13:42:32 2013
@@ -3,4 +3,4 @@ CREATE TABLE dest(key INT, value STRING)
 SET hive.output.file.extension=.txt;
 INSERT OVERWRITE TABLE dest SELECT src.* FROM src;
 
-dfs -cat ${system:test.tmp.dir}/warehouse/dest/*.txt
+dfs -cat ${system:test.warehouse.dir}/dest/*.txt

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/input45.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/input45.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/input45.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/input45.q Thu Oct 24 13:42:32 2013
@@ -4,6 +4,6 @@ SET hive.output.file.extension=.txt;
 
 INSERT OVERWRITE DIRECTORY 'target/data/x/y/z/' SELECT src.* FROM src;
 
-dfs -cat ${system:test.tmp.dir}/data/x/y/z/*.txt;
+dfs -cat ${system:build.dir}/data/x/y/z/*.txt;
 
-dfs -rmr ${system:test.tmp.dir}/data/x;
+dfs -rmr ${system:build.dir}/data/x;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat17.q Thu Oct 24 13:42:32 2013
@@ -3,7 +3,7 @@
 -- CustomSerDe(1, 2, 3) irrespective of the inserted values
 
 DROP TABLE PW17;
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-custom-serde.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-serde/${system:hive.version}/hive-it-custom-serde-${system:hive.version}.jar;
 CREATE TABLE PW17(USER STRING, COMPLEXDT ARRAY<INT>) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe1';
 LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW17 PARTITION (YEAR='1');
 ALTER TABLE PW17 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe2';

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/partition_wise_fileformat18.q Thu Oct 24 13:42:32 2013
@@ -4,7 +4,7 @@
 -- CustomSerDe(4, 5) irrespective of the inserted values
 
 DROP TABLE PW18;
-ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-internal/${system:hive.version}/hive-internal-${system:hive.version}-custom-serde.jar;
+ADD JAR ${system:maven.local.repository}/org/apache/hive/hive-it-custom-serde/${system:hive.version}/hive-it-custom-serde-${system:hive.version}.jar;
 CREATE TABLE PW18(USER STRING, COMPLEXDT UNIONTYPE<INT, DOUBLE>) PARTITIONED BY (YEAR STRING) ROW FORMAT SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe5';
 LOAD DATA LOCAL INPATH '../../data/files/pw17.txt' INTO TABLE PW18 PARTITION (YEAR='1');
 ALTER TABLE PW18 PARTITION(YEAR='1') SET SERDE 'org.apache.hadoop.hive.serde2.CustomSerDe4';

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/ptf_matchpath.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/ptf_matchpath.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/ptf_matchpath.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/ptf_matchpath.q Thu Oct 24 13:42:32 2013
@@ -10,7 +10,7 @@ ARR_DELAY float, 
 FL_NUM string 
 );
 
-LOAD DATA LOCAL INPATH '../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny;
+LOAD DATA LOCAL INPATH '../../data/files/flights_tiny.txt' OVERWRITE INTO TABLE flights_tiny;
 
 -- 1. basic Matchpath test
 select origin_city_name, fl_num, year, month, day_of_month, sz, tpath 

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/repair.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/repair.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/repair.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/repair.q Thu Oct 24 13:42:32 2013
@@ -1,10 +1,12 @@
+DROP TABLE IF EXISTS repairtable;
+
 CREATE TABLE repairtable(col STRING) PARTITIONED BY (p1 STRING, p2 STRING);
 
 MSCK TABLE repairtable;
 
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/warehouse/repairtable/p1=a/p2=a;
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/warehouse/repairtable/p1=b/p2=a;
-dfs -touchz ${system:test.tmp.dir}/warehouse/repairtable/p1=b/p2=a/datafile;
+dfs ${system:test.dfs.mkdir} ${system:test.warehouse.dir}/repairtable/p1=a/p2=a;
+dfs ${system:test.dfs.mkdir} ${system:test.warehouse.dir}/repairtable/p1=b/p2=a;
+dfs -touchz ${system:test.warehouse.dir}/repairtable/p1=b/p2=a/datafile;
 
 MSCK TABLE repairtable;
 
@@ -12,4 +14,4 @@ MSCK REPAIR TABLE repairtable;
 
 MSCK TABLE repairtable;
 
-
+DROP TABLE repairtable;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/scriptfile1.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/scriptfile1.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/scriptfile1.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/scriptfile1.q Thu Oct 24 13:42:32 2013
@@ -3,7 +3,7 @@ set hive.input.format=org.apache.hadoop.
 -- EXCLUDE_OS_WINDOWS
 CREATE TABLE dest1(key INT, value STRING);
 
-ADD FILE src/test/scripts/testgrep;
+ADD FILE ../../ql/src/test/scripts/testgrep;
 
 FROM (
   FROM src

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/set_processor_namespaces.q Thu Oct 24 13:42:32 2013
@@ -24,7 +24,7 @@ set b=a;
 set c=${hiveconf:${hiveconf:b}};
 set c;
 
-set ver=$(system:hive.version};
+set jar=${system:maven.local.repository}/org/apache/derby/derby/${system:derby.version}/derby-${system:derby.version}.jar;
 
 add file ${hiveconf:jar};
 delete file ${hiveconf:jar};

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/stats_noscan_2.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/stats_noscan_2.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/stats_noscan_2.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/stats_noscan_2.q Thu Oct 24 13:42:32 2013
@@ -1,7 +1,7 @@
 
 -- test analyze table compute statistiscs [noscan] on external table 
 -- 1 test table
-CREATE EXTERNAL TABLE anaylyze_external (a INT) LOCATION '${system:test.src.data.dir}/files/ext_test';
+CREATE EXTERNAL TABLE anaylyze_external (a INT) LOCATION '${system:hive.root}/data/files/ext_test';
 SELECT * FROM anaylyze_external;
 analyze table anaylyze_external compute statistics;
 describe formatted anaylyze_external;

Modified: hive/branches/maven/ql/src/test/queries/clientpositive/symlink_text_input_format.q
URL: http://svn.apache.org/viewvc/hive/branches/maven/ql/src/test/queries/clientpositive/symlink_text_input_format.q?rev=1535378&r1=1535377&r2=1535378&view=diff
==============================================================================
--- hive/branches/maven/ql/src/test/queries/clientpositive/symlink_text_input_format.q (original)
+++ hive/branches/maven/ql/src/test/queries/clientpositive/symlink_text_input_format.q Thu Oct 24 13:42:32 2013
@@ -1,12 +1,12 @@
-
+DROP TABLE IF EXISTS symlink_text_input_format;
 
 EXPLAIN
 CREATE TABLE symlink_text_input_format (key STRING, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat';
 
 CREATE TABLE symlink_text_input_format (key STRING, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat';
 
-dfs -cp ../../data/files/symlink1.txt ${system:test.tmp.dir}/warehouse/symlink_text_input_format/symlink1.txt;
-dfs -cp ../../data/files/symlink2.txt ${system:test.tmp.dir}/warehouse/symlink_text_input_format/symlink2.txt;
+dfs -cp ../../data/files/symlink1.txt ${system:test.warehouse.dir}/symlink_text_input_format/symlink1.txt;
+dfs -cp ../../data/files/symlink2.txt ${system:test.warehouse.dir}/symlink_text_input_format/symlink2.txt;
 
 EXPLAIN SELECT * FROM symlink_text_input_format order by key, value;
 
@@ -20,5 +20,4 @@ EXPLAIN SELECT count(1) FROM symlink_tex
 
 SELECT count(1) FROM symlink_text_input_format;
 
-
-
+DROP TABLE symlink_text_input_format;