HIVE-1176. 'create if not exists' fails for a table name with

'select' in it.
(Arvind Prabhakar via jvs)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/hive/trunk@957421 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -559,10 +559,14 @@ Release 0.6.0 -  Unreleased
     getContentSummary (Paul Yang via namit)
 
     HIVE-1422. Bug in updating progres counters (John Sichi via namit)
- 
-    HIVE-1271. Make matching of type information case insensitive. 
+
+    HIVE-1271. Make matching of type information case insensitive.
     (Arvind Prabhakar via Ashish Thusoo)
 
+    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

build.properties

@@ -29,3 +29,8 @@ jasper.test.jar=${hadoop.root}/lib/jetty-ext/jasper-runtime.jar
 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

build.xml

@@ -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"/>

eclipse-templates/.classpath

@@ -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>

ivy/ivysettings.xml

@@ -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>