You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by jv...@apache.org on 2010/06/24 07:21:59 UTC

svn commit: r957423 - in /hadoop/hive/branches/branch-0.6: ./ eclipse-templates/ ivy/ lib/ metastore/ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/

Author: jvs
Date: Thu Jun 24 05:21:58 2010
New Revision: 957423

URL: http://svn.apache.org/viewvc?rev=957423&view=rev
Log:
HIVE-1176. 'create if not exists' fails for a table name with
'select' in it.
(Arvind Prabhakar via jvs)


Added:
    hadoop/hive/branches/branch-0.6/ql/src/test/queries/clientpositive/tablename_with_select.q
    hadoop/hive/branches/branch-0.6/ql/src/test/results/clientpositive/tablename_with_select.q.out
Removed:
    hadoop/hive/branches/branch-0.6/lib/datanucleus-core-1.1.2.LICENSE
    hadoop/hive/branches/branch-0.6/lib/datanucleus-core-1.1.2.jar
    hadoop/hive/branches/branch-0.6/lib/datanucleus-enhancer-1.1.2.LICENSE
    hadoop/hive/branches/branch-0.6/lib/datanucleus-enhancer-1.1.2.jar
    hadoop/hive/branches/branch-0.6/lib/datanucleus-rdbms-1.1.2.LICENSE
    hadoop/hive/branches/branch-0.6/lib/datanucleus-rdbms-1.1.2.jar
    hadoop/hive/branches/branch-0.6/lib/jdo2-api-2.3-SNAPSHOT.LICENSE
    hadoop/hive/branches/branch-0.6/lib/jdo2-api-2.3-SNAPSHOT.jar
Modified:
    hadoop/hive/branches/branch-0.6/CHANGES.txt
    hadoop/hive/branches/branch-0.6/build.properties
    hadoop/hive/branches/branch-0.6/build.xml
    hadoop/hive/branches/branch-0.6/eclipse-templates/.classpath
    hadoop/hive/branches/branch-0.6/ivy/ivysettings.xml
    hadoop/hive/branches/branch-0.6/metastore/ivy.xml
    hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java

Modified: hadoop/hive/branches/branch-0.6/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/CHANGES.txt?rev=957423&r1=957422&r2=957423&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.6/CHANGES.txt Thu Jun 24 05:21:58 2010
@@ -541,6 +541,10 @@ Release 0.6.0 -  Unreleased
     HIVE-1417. Archived partitions throw error with queries calling
     getContentSummary (Paul Yang via namit)
 
+    HIVE-1176. 'create if not exists' fails for a table name with
+    'select' in it.
+    (Arvind Prabhakar via jvs)
+
 Release 0.5.0 -  Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hive/branches/branch-0.6/build.properties
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/build.properties?rev=957423&r1=957422&r2=957423&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/build.properties (original)
+++ hadoop/hive/branches/branch-0.6/build.properties Thu Jun 24 05:21:58 2010
@@ -29,3 +29,8 @@ jasper.test.jar=${hadoop.root}/lib/jetty
 jasperc.test.jar=${hadoop.root}/lib/jetty-ext/jasper-compiler.jar
 jsp.test.jar=${hadoop.root}/lib/jetty-ext/jsp-api.jar
 common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
+
+#
+# Data nucleus repository - needed for jdo2-api-2.3-ec.jar download
+#
+datanucleus.repo=http://www.datanucleus.org/downloads/maven2

Modified: hadoop/hive/branches/branch-0.6/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/build.xml?rev=957423&r1=957422&r2=957423&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/build.xml (original)
+++ hadoop/hive/branches/branch-0.6/build.xml Thu Jun 24 05:21:58 2010
@@ -301,9 +301,10 @@
       <fileset file="${build.dir.hive}/hwi/hive-hwi-${version}.war"/>
       <fileset file="${build.dir.hive}/contrib/hive-contrib-${version}.jar"/>
       <fileset file="${build.dir.hive}/contrib/hive-hbase_handler-${version}.jar"/>
-      <fileset file="${build.dir.hive}/ivy/lib/metastore/default/commons-dbcp-*.jar"/>
-      <fileset file="${build.dir.hive}/ivy/lib/metastore/default/commons-pool-*.jar"/>
-      <fileset file="${build.dir.hive}/ivy/lib/metastore/default/datanucleus-connectionpool-*.jar"/>
+      <fileset dir="${build.dir.hive}/ivy/lib/metastore/default">
+        <include name="*.jar"/>
+        <exclude name="*.tar.gz"/>
+      </fileset>
     </copy>
     <copy todir="${target.example.dir}/files" preservelastmodified="true" flatten="true">
       <fileset dir="${test.data.dir}/files" includes="*.*" excludes="**/.svn"/>

Modified: hadoop/hive/branches/branch-0.6/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/eclipse-templates/.classpath?rev=957423&r1=957422&r2=957423&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/eclipse-templates/.classpath (original)
+++ hadoop/hive/branches/branch-0.6/eclipse-templates/.classpath Thu Jun 24 05:21:58 2010
@@ -16,16 +16,20 @@
 	<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.3-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/datanucleus-core-1.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/datanucleus-enhancer-1.1.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/datanucleus-rdbms-1.1.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="testlibs/junit-3.8.1.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/jdo2-api-2.3-ec.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/datanucleus-core-2.0.3.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/datanucleus-enhancer-2.0.3.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/datanucleus-rdbms-2.0.3.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/commons-collections-3.2.1.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/commons-dbcp-1.4.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/datanucleus-connectionpool-2.0.1.jar"/>
+  <classpathentry kind="lib" path="build/dist/lib/commons-pool-1.5.4.jar"/>
 	<classpathentry kind="src" path="build/ql/gen-java"/>
 	<classpathentry kind="src" path="build/contrib/test/src"/>
 	<classpathentry kind="src" path="build/ql/test/src"/>
@@ -50,11 +54,7 @@
 	<classpathentry kind="src" path="jdbc/src/test"/>
 	<classpathentry kind="src" path="shims/src/@HADOOPVERPREF@/java"/>
 	<classpathentry kind="src" path="shims/src/common/java"/>
-    <classpathentry kind="src" path="hwi/src/java"/>
+  <classpathentry kind="src" path="hwi/src/java"/>
 	<classpathentry kind="src" path="hwi/src/test"/>
-    <classpathentry kind="lib" path="build/dist/lib/commons-collections-3.2.1.jar"/>
-    <classpathentry kind="lib" path="build/dist/lib/commons-dbcp-1.2.2.jar"/>
-    <classpathentry kind="lib" path="build/dist/lib/datanucleus-connectionpool-1.0.2.jar"/>
-    <classpathentry kind="lib" path="build/dist/lib/commons-pool-1.2.jar"/>
-    <classpathentry kind="output" path="build/eclipse-classes"/>
+  <classpathentry kind="output" path="build/eclipse-classes"/>
 </classpath>

Modified: hadoop/hive/branches/branch-0.6/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/ivy/ivysettings.xml?rev=957423&r1=957422&r2=957423&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/ivy/ivysettings.xml (original)
+++ hadoop/hive/branches/branch-0.6/ivy/ivysettings.xml Thu Jun 24 05:21:58 2010
@@ -47,6 +47,10 @@
     <ibiblio name="apache-snapshot" root="${snapshot.apache.org}" m2compatible="true"
         checkmodified="true" changingPattern=".*SNAPSHOT"/>
 
+    <url name="datanucleus-repo" m2compatible="true">
+      <artifact pattern="${datanucleus.repo}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
+    </url>
+
     <filesystem name="fs" m2compatible="true" force="true">
        <artifact pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].[ext]"/>
        <ivy pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].pom"/>
@@ -56,16 +60,19 @@
       <resolver ref="hadoop-source"/>
       <resolver ref="apache-snapshot"/> 
       <resolver ref="maven2"/>
+      <resolver ref="datanucleus-repo"/>
     </chain>
 
     <chain name="internal" dual="true">
       <resolver ref="fs"/>
       <resolver ref="apache-snapshot"/> 
       <resolver ref="maven2"/>
+      <resolver ref="datanucleus-repo"/>
     </chain>
 
     <chain name="external">
       <resolver ref="maven2"/>
+      <resolver ref="datanucleus-repo"/>
     </chain>
     
   </resolvers>

Modified: hadoop/hive/branches/branch-0.6/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/metastore/ivy.xml?rev=957423&r1=957422&r2=957423&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/metastore/ivy.xml (original)
+++ hadoop/hive/branches/branch-0.6/metastore/ivy.xml Thu Jun 24 05:21:58 2010
@@ -4,21 +4,47 @@
         <dependency org="hadoop" name="core" rev="${hadoop.version.ant-internal}">
           <artifact name="hadoop" type="source" ext="tar.gz"/>
         </dependency>
-	<dependency org="commons-dbcp" name="commons-dbcp" rev="1.2.2">
+	      <dependency org="commons-dbcp" name="commons-dbcp" rev="1.4">
           <exclude module="commons-pool" />
+          <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
         </dependency>
-        <dependency org="commons-pool" name="commons-pool" rev="1.2">
-          <exclude module="commons-collections" />
-          <exclude module="xerces" />
-          <exclude module="xml-apis" />
-        </dependency>
-        <dependency org="org.datanucleus" name="datanucleus-connectionpool" rev="1.0.2">
+        <dependency org="commons-pool" name="commons-pool" rev="1.5.4"/>
+        <dependency org="org.datanucleus" name="datanucleus-connectionpool" rev="2.0.1">
           <exclude module="proxool" />
           <exclude module="c3p0" />
           <exclude module="datanucleus-core" />
           <exclude module="datanucleus-rdbms" />
           <exclude module="commons-collections" />
           <exclude module="commons-pool" />
+          <exclude module="commons-dbcp" />
+        </dependency>
+        <dependency org="org.datanucleus" name="datanucleus-core" rev="2.0.3">
+          <exclude org="javax.jdo" module="jdo2-api"/>
+          <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
+          <exclude org="org.eclipse.equinox" module="org.eclipse.equinox.registry"/>
+          <exclude org="org.eclipse.equinox" module="org.eclipse.equinox.common"/>
+          <exclude org="org.eclipse.core" module="org.eclipse.core.runtime"/>
+          <exclude org="org.eclipse.osgi" module="org.eclipse.osgi"/>
+          <exclude org="log4j" module="log4j"/>
+        </dependency>
+        <dependency org="org.datanucleus" name="datanucleus-enhancer" rev="2.0.3">
+          <exclude org="org.datanucleus" module="datanucleus-core"/>
+          <exclude org="javax.jdo" module="jdo2-api"/>
+          <exclude org="asm" module="asm"/>
+          <exclude org="org.apache.ant" module="ant"/>
+        </dependency>
+        <dependency org="org.datanucleus" name="datanucleus-rdbms" rev="2.0.3">
+          <exclude org="org.datanucleus" module="datanucleus-core"/>
+          <exclude org="javax.jdo" module="jdo2-api"/>
+          <exclude org="org.apache.geronimo.specs" module="geronimo-jta_1.1_spec"/>
+          <exclude org="org.datanucleus" module="datanucleus-thirdparty"/>
+          <exclude org="org.apache.ant" module="ant"/>
+          <exclude org="oracle" module="ojdbc14_g"/>
+        </dependency>
+        <dependency org="javax.jdo" name="jdo2-api" rev="2.3-ec">
+          <exclude org="javax.transaction" module="jta"/>
+          <exclude org="org.apache.ant" module="ant"/>
+          <exclude org="org.apache.geronimo.specs" module="geronimo-jpa_3.0_spec"/>
         </dependency>
     </dependencies>
 </ivy-module>

Modified: hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java?rev=957423&r1=957422&r2=957423&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (original)
+++ hadoop/hive/branches/branch-0.6/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java Thu Jun 24 05:21:58 2010
@@ -20,6 +20,8 @@ package org.apache.hadoop.hive.metastore
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -226,7 +228,7 @@ public class HiveMetaStoreClient impleme
   public Partition add_partition(Partition new_part)
       throws InvalidObjectException, AlreadyExistsException, MetaException,
       TException {
-    return client.add_partition(new_part);
+    return deepCopy(client.add_partition(new_part));
   }
 
   /**
@@ -244,12 +246,14 @@ public class HiveMetaStoreClient impleme
   public Partition appendPartition(String db_name, String table_name,
       List<String> part_vals) throws InvalidObjectException,
       AlreadyExistsException, MetaException, TException {
-    return client.append_partition(db_name, table_name, part_vals);
+    return deepCopy(client.append_partition(db_name, table_name, part_vals));
   }
 
   public Partition appendPartition(String dbName, String tableName, String partName)
-      throws InvalidObjectException, AlreadyExistsException, MetaException, TException {
-    return client.append_partition_by_name(dbName, tableName, partName);
+      throws InvalidObjectException, AlreadyExistsException,
+             MetaException, TException {
+    return deepCopy(
+        client.append_partition_by_name(dbName, tableName, partName));
   }
   /**
    * @param name
@@ -439,7 +443,15 @@ public class HiveMetaStoreClient impleme
    */
   public Map<String, Type> getTypeAll(String name) throws MetaException,
       TException {
-    return client.get_type_all(name);
+    Map<String, Type> result = null;
+    Map<String, Type> fromClient = client.get_type_all(name);
+    if (fromClient != null) {
+      result = new LinkedHashMap<String, Type>();
+      for (String key : fromClient.keySet()) {
+        result.put(key, deepCopy(fromClient.get(key)));
+      }
+    }
+    return result;
   }
 
   /**
@@ -463,13 +475,16 @@ public class HiveMetaStoreClient impleme
    */
   public List<Partition> listPartitions(String db_name, String tbl_name,
       short max_parts) throws NoSuchObjectException, MetaException, TException {
-    return client.get_partitions(db_name, tbl_name, max_parts);
+    return deepCopyPartitions(
+        client.get_partitions(db_name, tbl_name, max_parts));
   }
 
   @Override
-  public List<Partition> listPartitions(String db_name, String tbl_name, List<String> part_vals,
-      short max_parts) throws NoSuchObjectException, MetaException, TException {
-    return client.get_partitions_ps(db_name, tbl_name, part_vals, max_parts);
+  public List<Partition> listPartitions(String db_name, String tbl_name,
+      List<String> part_vals, short max_parts)
+      throws NoSuchObjectException, MetaException, TException {
+    return deepCopyPartitions(
+        client.get_partitions_ps(db_name, tbl_name, part_vals, max_parts));
   }
 
   /**
@@ -482,7 +497,7 @@ public class HiveMetaStoreClient impleme
    */
   public Database getDatabase(String name) throws NoSuchObjectException,
       MetaException, TException {
-    return client.get_database(name);
+    return deepCopy(client.get_database(name));
   }
 
   /**
@@ -497,7 +512,7 @@ public class HiveMetaStoreClient impleme
    */
   public Partition getPartition(String db_name, String tbl_name,
       List<String> part_vals) throws MetaException, TException {
-    return client.get_partition(db_name, tbl_name, part_vals);
+    return deepCopy(client.get_partition(db_name, tbl_name, part_vals));
   }
 
   /**
@@ -513,7 +528,7 @@ public class HiveMetaStoreClient impleme
    */
   public Table getTable(String dbname, String name) throws MetaException,
       TException, NoSuchObjectException {
-    return client.get_table(dbname, name);
+    return deepCopy(client.get_table(dbname, name));
   }
 
   /**
@@ -524,7 +539,7 @@ public class HiveMetaStoreClient impleme
    * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#get_type(java.lang.String)
    */
   public Type getType(String name) throws MetaException, TException {
-    return client.get_type(name);
+    return deepCopy(client.get_type(name));
   }
 
   public List<String> getTables(String dbname, String tablePattern)
@@ -586,7 +601,7 @@ public class HiveMetaStoreClient impleme
   public List<FieldSchema> getFields(String db, String tableName)
       throws MetaException, TException, UnknownTableException,
       UnknownDBException {
-    return client.get_fields(db, tableName);
+    return deepCopyFieldSchemas(client.get_fields(db, tableName));
   }
 
   /**
@@ -602,7 +617,7 @@ public class HiveMetaStoreClient impleme
   public List<FieldSchema> getSchema(String db, String tableName)
       throws MetaException, TException, UnknownTableException,
       UnknownDBException {
-    return client.get_schema(db, tableName);
+    return deepCopyFieldSchemas(client.get_schema(db, tableName));
   }
 
   public String getConfigValue(String name, String defaultValue)
@@ -612,12 +627,13 @@ public class HiveMetaStoreClient impleme
 
   public Partition getPartition(String db, String tableName, String partName)
       throws MetaException, TException, UnknownTableException, NoSuchObjectException {
-    return client.get_partition_by_name(db, tableName, partName);
+    return deepCopy(client.get_partition_by_name(db, tableName, partName));
   }
 
   public Partition appendPartitionByName(String dbName, String tableName, String partName)
       throws InvalidObjectException, AlreadyExistsException, MetaException, TException {
-    return client.append_partition_by_name(dbName, tableName, partName);
+    return deepCopy(
+        client.append_partition_by_name(dbName, tableName, partName));
   }
 
   public boolean dropPartitionByName(String dbName, String tableName, String partName, boolean deleteData)
@@ -641,4 +657,81 @@ public class HiveMetaStoreClient impleme
   public Map<String, String> partitionNameToSpec(String name) throws MetaException, TException {
     return client.partition_name_to_spec(name);
   }
+
+  /**
+   * @param partition
+   * @return
+   */
+  private Partition deepCopy(Partition partition) {
+    Partition copy = null;
+    if (partition != null) {
+      copy = new Partition(partition);
+    }
+    return copy;
+  }
+
+  private Database deepCopy(Database database) {
+    Database copy = null;
+    if (database != null) {
+      copy = new Database(database);
+    }
+    return copy;
+  }
+
+  private Table deepCopy(Table table) {
+    Table copy = null;
+    if (table != null) {
+      copy = new Table(table);
+    }
+    return copy;
+  }
+
+  private Type deepCopy(Type type) {
+    Type copy = null;
+    if (type != null) {
+      copy = new Type(type);
+    }
+    return copy;
+  }
+
+  private FieldSchema deepCopy(FieldSchema schema) {
+    FieldSchema copy = null;
+    if (schema != null) {
+      copy = new FieldSchema(schema);
+    }
+    return copy;
+  }
+
+  private List<Partition> deepCopyPartitions(List<Partition> partitions) {
+    List<Partition> copy = null;
+    if (partitions != null) {
+      copy = new ArrayList<Partition>();
+      for (Partition part : partitions) {
+        copy.add(deepCopy(part));
+      }
+    }
+    return copy;
+  }
+
+  private List<Table> deepCopyTables(List<Table> tables) {
+    List<Table> copy = null;
+    if (tables != null) {
+      copy = new ArrayList<Table>();
+      for (Table tab : tables) {
+        copy.add(deepCopy(tab));
+      }
+    }
+    return copy;
+  }
+
+  private List<FieldSchema> deepCopyFieldSchemas(List<FieldSchema> schemas) {
+    List<FieldSchema> copy = null;
+    if (schemas != null) {
+      copy = new ArrayList<FieldSchema>();
+      for (FieldSchema schema : schemas) {
+        copy.add(deepCopy(schema));
+      }
+    }
+    return copy;
+  }
 }

Added: hadoop/hive/branches/branch-0.6/ql/src/test/queries/clientpositive/tablename_with_select.q
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/ql/src/test/queries/clientpositive/tablename_with_select.q?rev=957423&view=auto
==============================================================================
--- hadoop/hive/branches/branch-0.6/ql/src/test/queries/clientpositive/tablename_with_select.q (added)
+++ hadoop/hive/branches/branch-0.6/ql/src/test/queries/clientpositive/tablename_with_select.q Thu Jun 24 05:21:58 2010
@@ -0,0 +1,9 @@
+DROP TABLE tmp_select;
+CREATE TABLE tmp_select(a INT, b STRING);
+DESCRIBE tmp_select;
+
+INSERT OVERWRITE TABLE tmp_select SELECT key, value FROM src;
+
+SELECT a, b FROM tmp_select ORDER BY a;
+
+DROP TABLE tmp_select;

Added: hadoop/hive/branches/branch-0.6/ql/src/test/results/clientpositive/tablename_with_select.q.out
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.6/ql/src/test/results/clientpositive/tablename_with_select.q.out?rev=957423&view=auto
==============================================================================
--- hadoop/hive/branches/branch-0.6/ql/src/test/results/clientpositive/tablename_with_select.q.out (added)
+++ hadoop/hive/branches/branch-0.6/ql/src/test/results/clientpositive/tablename_with_select.q.out Thu Jun 24 05:21:58 2010
@@ -0,0 +1,542 @@
+PREHOOK: query: DROP TABLE tmp_select
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE tmp_select
+POSTHOOK: type: DROPTABLE
+PREHOOK: query: CREATE TABLE tmp_select(a INT, b STRING)
+PREHOOK: type: CREATETABLE
+POSTHOOK: query: CREATE TABLE tmp_select(a INT, b STRING)
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: default@tmp_select
+PREHOOK: query: DESCRIBE tmp_select
+PREHOOK: type: DESCTABLE
+POSTHOOK: query: DESCRIBE tmp_select
+POSTHOOK: type: DESCTABLE
+a	int	
+b	string	
+PREHOOK: query: INSERT OVERWRITE TABLE tmp_select SELECT key, value FROM src
+PREHOOK: type: QUERY
+PREHOOK: Input: default@src
+PREHOOK: Output: default@tmp_select
+POSTHOOK: query: INSERT OVERWRITE TABLE tmp_select SELECT key, value FROM src
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@src
+POSTHOOK: Output: default@tmp_select
+POSTHOOK: Lineage: tmp_select.a EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: tmp_select.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: SELECT a, b FROM tmp_select ORDER BY a
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tmp_select
+PREHOOK: Output: file:/var/folders/rF/rFg7A9swER0pyf9VBov+VU+++TM/-Tmp-/arvind/hive_2010-06-23_16-31-21_482_1534986163090777807/10000
+POSTHOOK: query: SELECT a, b FROM tmp_select ORDER BY a
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tmp_select
+POSTHOOK: Output: file:/var/folders/rF/rFg7A9swER0pyf9VBov+VU+++TM/-Tmp-/arvind/hive_2010-06-23_16-31-21_482_1534986163090777807/10000
+POSTHOOK: Lineage: tmp_select.a EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: tmp_select.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+0	val_0
+0	val_0
+0	val_0
+2	val_2
+4	val_4
+5	val_5
+5	val_5
+5	val_5
+8	val_8
+9	val_9
+10	val_10
+11	val_11
+12	val_12
+12	val_12
+15	val_15
+15	val_15
+17	val_17
+18	val_18
+18	val_18
+19	val_19
+20	val_20
+24	val_24
+24	val_24
+26	val_26
+26	val_26
+27	val_27
+28	val_28
+30	val_30
+33	val_33
+34	val_34
+35	val_35
+35	val_35
+35	val_35
+37	val_37
+37	val_37
+41	val_41
+42	val_42
+42	val_42
+43	val_43
+44	val_44
+47	val_47
+51	val_51
+51	val_51
+53	val_53
+54	val_54
+57	val_57
+58	val_58
+58	val_58
+64	val_64
+65	val_65
+66	val_66
+67	val_67
+67	val_67
+69	val_69
+70	val_70
+70	val_70
+70	val_70
+72	val_72
+72	val_72
+74	val_74
+76	val_76
+76	val_76
+77	val_77
+78	val_78
+80	val_80
+82	val_82
+83	val_83
+83	val_83
+84	val_84
+84	val_84
+85	val_85
+86	val_86
+87	val_87
+90	val_90
+90	val_90
+90	val_90
+92	val_92
+95	val_95
+95	val_95
+96	val_96
+97	val_97
+97	val_97
+98	val_98
+98	val_98
+100	val_100
+100	val_100
+103	val_103
+103	val_103
+104	val_104
+104	val_104
+105	val_105
+111	val_111
+113	val_113
+113	val_113
+114	val_114
+116	val_116
+118	val_118
+118	val_118
+119	val_119
+119	val_119
+119	val_119
+120	val_120
+120	val_120
+125	val_125
+125	val_125
+126	val_126
+128	val_128
+128	val_128
+128	val_128
+129	val_129
+129	val_129
+131	val_131
+133	val_133
+134	val_134
+134	val_134
+136	val_136
+137	val_137
+137	val_137
+138	val_138
+138	val_138
+138	val_138
+138	val_138
+143	val_143
+145	val_145
+146	val_146
+146	val_146
+149	val_149
+149	val_149
+150	val_150
+152	val_152
+152	val_152
+153	val_153
+155	val_155
+156	val_156
+157	val_157
+158	val_158
+160	val_160
+162	val_162
+163	val_163
+164	val_164
+164	val_164
+165	val_165
+165	val_165
+166	val_166
+167	val_167
+167	val_167
+167	val_167
+168	val_168
+169	val_169
+169	val_169
+169	val_169
+169	val_169
+170	val_170
+172	val_172
+172	val_172
+174	val_174
+174	val_174
+175	val_175
+175	val_175
+176	val_176
+176	val_176
+177	val_177
+178	val_178
+179	val_179
+179	val_179
+180	val_180
+181	val_181
+183	val_183
+186	val_186
+187	val_187
+187	val_187
+187	val_187
+189	val_189
+190	val_190
+191	val_191
+191	val_191
+192	val_192
+193	val_193
+193	val_193
+193	val_193
+194	val_194
+195	val_195
+195	val_195
+196	val_196
+197	val_197
+197	val_197
+199	val_199
+199	val_199
+199	val_199
+200	val_200
+200	val_200
+201	val_201
+202	val_202
+203	val_203
+203	val_203
+205	val_205
+205	val_205
+207	val_207
+207	val_207
+208	val_208
+208	val_208
+208	val_208
+209	val_209
+209	val_209
+213	val_213
+213	val_213
+214	val_214
+216	val_216
+216	val_216
+217	val_217
+217	val_217
+218	val_218
+219	val_219
+219	val_219
+221	val_221
+221	val_221
+222	val_222
+223	val_223
+223	val_223
+224	val_224
+224	val_224
+226	val_226
+228	val_228
+229	val_229
+229	val_229
+230	val_230
+230	val_230
+230	val_230
+230	val_230
+230	val_230
+233	val_233
+233	val_233
+235	val_235
+237	val_237
+237	val_237
+238	val_238
+238	val_238
+239	val_239
+239	val_239
+241	val_241
+242	val_242
+242	val_242
+244	val_244
+247	val_247
+248	val_248
+249	val_249
+252	val_252
+255	val_255
+255	val_255
+256	val_256
+256	val_256
+257	val_257
+258	val_258
+260	val_260
+262	val_262
+263	val_263
+265	val_265
+265	val_265
+266	val_266
+272	val_272
+272	val_272
+273	val_273
+273	val_273
+273	val_273
+274	val_274
+275	val_275
+277	val_277
+277	val_277
+277	val_277
+277	val_277
+278	val_278
+278	val_278
+280	val_280
+280	val_280
+281	val_281
+281	val_281
+282	val_282
+282	val_282
+283	val_283
+284	val_284
+285	val_285
+286	val_286
+287	val_287
+288	val_288
+288	val_288
+289	val_289
+291	val_291
+292	val_292
+296	val_296
+298	val_298
+298	val_298
+298	val_298
+302	val_302
+305	val_305
+306	val_306
+307	val_307
+307	val_307
+308	val_308
+309	val_309
+309	val_309
+310	val_310
+311	val_311
+311	val_311
+311	val_311
+315	val_315
+316	val_316
+316	val_316
+316	val_316
+317	val_317
+317	val_317
+318	val_318
+318	val_318
+318	val_318
+321	val_321
+321	val_321
+322	val_322
+322	val_322
+323	val_323
+325	val_325
+325	val_325
+327	val_327
+327	val_327
+327	val_327
+331	val_331
+331	val_331
+332	val_332
+333	val_333
+333	val_333
+335	val_335
+336	val_336
+338	val_338
+339	val_339
+341	val_341
+342	val_342
+342	val_342
+344	val_344
+344	val_344
+345	val_345
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+351	val_351
+353	val_353
+353	val_353
+356	val_356
+360	val_360
+362	val_362
+364	val_364
+365	val_365
+366	val_366
+367	val_367
+367	val_367
+368	val_368
+369	val_369
+369	val_369
+369	val_369
+373	val_373
+374	val_374
+375	val_375
+377	val_377
+378	val_378
+379	val_379
+382	val_382
+382	val_382
+384	val_384
+384	val_384
+384	val_384
+386	val_386
+389	val_389
+392	val_392
+393	val_393
+394	val_394
+395	val_395
+395	val_395
+396	val_396
+396	val_396
+396	val_396
+397	val_397
+397	val_397
+399	val_399
+399	val_399
+400	val_400
+401	val_401
+401	val_401
+401	val_401
+401	val_401
+401	val_401
+402	val_402
+403	val_403
+403	val_403
+403	val_403
+404	val_404
+404	val_404
+406	val_406
+406	val_406
+406	val_406
+406	val_406
+407	val_407
+409	val_409
+409	val_409
+409	val_409
+411	val_411
+413	val_413
+413	val_413
+414	val_414
+414	val_414
+417	val_417
+417	val_417
+417	val_417
+418	val_418
+419	val_419
+421	val_421
+424	val_424
+424	val_424
+427	val_427
+429	val_429
+429	val_429
+430	val_430
+430	val_430
+430	val_430
+431	val_431
+431	val_431
+431	val_431
+432	val_432
+435	val_435
+436	val_436
+437	val_437
+438	val_438
+438	val_438
+438	val_438
+439	val_439
+439	val_439
+443	val_443
+444	val_444
+446	val_446
+448	val_448
+449	val_449
+452	val_452
+453	val_453
+454	val_454
+454	val_454
+454	val_454
+455	val_455
+457	val_457
+458	val_458
+458	val_458
+459	val_459
+459	val_459
+460	val_460
+462	val_462
+462	val_462
+463	val_463
+463	val_463
+466	val_466
+466	val_466
+466	val_466
+467	val_467
+468	val_468
+468	val_468
+468	val_468
+468	val_468
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+470	val_470
+472	val_472
+475	val_475
+477	val_477
+478	val_478
+478	val_478
+479	val_479
+480	val_480
+480	val_480
+480	val_480
+481	val_481
+482	val_482
+483	val_483
+484	val_484
+485	val_485
+487	val_487
+489	val_489
+489	val_489
+489	val_489
+489	val_489
+490	val_490
+491	val_491
+492	val_492
+492	val_492
+493	val_493
+494	val_494
+495	val_495
+496	val_496
+497	val_497
+498	val_498
+498	val_498
+498	val_498
+PREHOOK: query: DROP TABLE tmp_select
+PREHOOK: type: DROPTABLE
+POSTHOOK: query: DROP TABLE tmp_select
+POSTHOOK: type: DROPTABLE
+POSTHOOK: Output: default@tmp_select
+POSTHOOK: Lineage: tmp_select.a EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: tmp_select.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]