You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by cw...@apache.org on 2013/03/21 23:58:55 UTC
svn commit: r1459569 - in /hive/trunk: eclipse-templates/.classpath
ivy/libraries.properties metastore/ivy.xml
ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
Author: cws
Date: Thu Mar 21 22:58:55 2013
New Revision: 1459569
URL: http://svn.apache.org/r1459569
Log:
HIVE-4217. Fix show_create_table_*.q test failures (Carl Steinbach via cws)
Modified:
hive/trunk/eclipse-templates/.classpath
hive/trunk/ivy/libraries.properties
hive/trunk/metastore/ivy.xml
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
Modified: hive/trunk/eclipse-templates/.classpath
URL: http://svn.apache.org/viewvc/hive/trunk/eclipse-templates/.classpath?rev=1459569&r1=1459568&r2=1459569&view=diff
==============================================================================
--- hive/trunk/eclipse-templates/.classpath (original)
+++ hive/trunk/eclipse-templates/.classpath Thu Mar 21 22:58:55 2013
@@ -86,7 +86,7 @@
<classpathentry kind="lib" path="build/ivy/lib/default/jackson-mapper-asl-1.8.8.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/jackson-xc-1.8.8.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/mockito-all-@mockito-all.version@.jar"/>
- <classpathentry kind="lib" path="build/ivy/lib/default/stringtemplate-@stringtemplate.version@.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/default/ST4-@ST4.version@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/snappy-@snappy.version@.jar"/>
<classpathentry kind="lib" path="build/beeline/hive-beeline-@HIVE_VERSION@.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/default/tempus-fugit-@tempus-fugit.version@.jar"/>
Modified: hive/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hive/trunk/ivy/libraries.properties?rev=1459569&r1=1459568&r2=1459569&view=diff
==============================================================================
--- hive/trunk/ivy/libraries.properties (original)
+++ hive/trunk/ivy/libraries.properties Thu Mar 21 22:58:55 2013
@@ -66,10 +66,8 @@ sqlline.branch=1.0.2
slf4j-api.version=1.6.1
slf4j-log4j12.version=1.6.1
ST4.version=4.0.4
-stringtemplate.version=3.2.1
tempus-fugit.version=1.1
snappy.version=0.2
velocity.version=1.5
zookeeper.version=3.4.3
javolution.version=5.5.1
-stringtemplate.version=3.2.1
Modified: hive/trunk/metastore/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/ivy.xml?rev=1459569&r1=1459568&r2=1459569&view=diff
==============================================================================
--- hive/trunk/metastore/ivy.xml (original)
+++ hive/trunk/metastore/ivy.xml Thu Mar 21 22:58:55 2013
@@ -29,7 +29,6 @@
<dependency org="org.antlr" name="antlr" rev="${antlr.version}" transitive="false"/>
<dependency org="org.antlr" name="antlr-runtime" rev="${antlr-runtime.version}" transitive="false"/>
<dependency org="org.antlr" name="ST4" rev="${ST4.version}" transitive="false"/><!-- manually added (antlr dep), bad POM -->
- <dependency org="org.antlr" name="stringtemplate" rev="${stringtemplate.version}" transitive="false"/><!-- manually added (antlr dep), bad POM -->
<dependency org="org.apache.hive" name="hive-serde" rev="${version}"
conf="compile->default" />
<dependency org="commons-dbcp" name="commons-dbcp" rev="${commons-dbcp.version}">
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java?rev=1459569&r1=1459568&r2=1459569&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java Thu Mar 21 22:58:55 2013
@@ -45,7 +45,6 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.antlr.stringtemplate.StringTemplate;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -165,6 +164,7 @@ import org.apache.hadoop.hive.shims.Hado
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.io.IOUtils;
import org.apache.hadoop.util.ToolRunner;
+import org.stringtemplate.v4.ST;
/**
* DDLTask implementation.
@@ -1948,17 +1948,17 @@ public class DDLTask extends Task<DDLWor
return 0;
}
- StringTemplate createTab_stmt = new StringTemplate("CREATE $" + EXTERNAL + "$ TABLE " +
+ ST createTab_stmt = new ST("CREATE <" + EXTERNAL + "> TABLE " +
tableName + "(\n" +
- "$" + LIST_COLUMNS + "$)\n" +
- "$" + TBL_COMMENT + "$\n" +
- "$" + LIST_PARTITIONS + "$\n" +
- "$" + SORT_BUCKET + "$\n" +
- "$" + ROW_FORMAT + "$\n" +
+ "<" + LIST_COLUMNS + ">)\n" +
+ "<" + TBL_COMMENT + ">\n" +
+ "<" + LIST_PARTITIONS + ">\n" +
+ "<" + SORT_BUCKET + ">\n" +
+ "<" + ROW_FORMAT + ">\n" +
"LOCATION\n" +
- "$" + TBL_LOCATION + "$\n" +
+ "<" + TBL_LOCATION + ">\n" +
"TBLPROPERTIES (\n" +
- "$" + TBL_PROPERTIES + "$)\n");
+ "<" + TBL_PROPERTIES + ">)\n");
// For cases where the table is external
String tbl_external = "";
@@ -2115,16 +2115,16 @@ public class DDLTask extends Task<DDLWor
tbl_properties += StringUtils.join(realProps, ", \n");
}
- createTab_stmt.setAttribute(EXTERNAL, tbl_external);
- createTab_stmt.setAttribute(LIST_COLUMNS, tbl_columns);
- createTab_stmt.setAttribute(TBL_COMMENT, tbl_comment);
- createTab_stmt.setAttribute(LIST_PARTITIONS, tbl_partitions);
- createTab_stmt.setAttribute(SORT_BUCKET, tbl_sort_bucket);
- createTab_stmt.setAttribute(ROW_FORMAT, tbl_row_format);
- createTab_stmt.setAttribute(TBL_LOCATION, tbl_location);
- createTab_stmt.setAttribute(TBL_PROPERTIES, tbl_properties);
+ createTab_stmt.add(EXTERNAL, tbl_external);
+ createTab_stmt.add(LIST_COLUMNS, tbl_columns);
+ createTab_stmt.add(TBL_COMMENT, tbl_comment);
+ createTab_stmt.add(LIST_PARTITIONS, tbl_partitions);
+ createTab_stmt.add(SORT_BUCKET, tbl_sort_bucket);
+ createTab_stmt.add(ROW_FORMAT, tbl_row_format);
+ createTab_stmt.add(TBL_LOCATION, tbl_location);
+ createTab_stmt.add(TBL_PROPERTIES, tbl_properties);
- outStream.writeBytes(createTab_stmt.toString());
+ outStream.writeBytes(createTab_stmt.render());
((FSDataOutputStream) outStream).close();
outStream = null;
} catch (FileNotFoundException e) {