diff --git a/parser/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g b/parser/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g index 2b865f3cf7..9d9bcc917b 100644 --- a/parser/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g +++ b/parser/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g @@ -154,7 +154,6 @@ TOK_UNIONTYPE; TOK_COLTYPELIST; TOK_CREATEDATABASE; TOK_CREATETABLE; -TOK_TRUNCATETABLE; TOK_LIKETABLE; TOK_DESCTABLE; TOK_DESCFUNCTION; @@ -1186,7 +1185,7 @@ truncateTableStatement @init { pushMsg("truncate table statement", state); } @after { popMsg(state); } : KW_TRUNCATE KW_TABLE tablePartitionPrefix (KW_COLUMNS LPAREN columnNameList RPAREN)? force? - -> ^(TOK_TRUNCATETABLE tablePartitionPrefix columnNameList? force?); + -> ^(KW_TRUNCATE tablePartitionPrefix columnNameList? force?); dropTableStatement @init { pushMsg("drop statement", state); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/misc/truncate/TruncateTableAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/misc/truncate/TruncateTableAnalyzer.java index 1655f3f768..2733518a84 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/misc/truncate/TruncateTableAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/misc/truncate/TruncateTableAnalyzer.java @@ -64,7 +64,7 @@ /** * Analyzer for truncate table commands. */ -@DDLType(types = HiveParser.TOK_TRUNCATETABLE) +@DDLType(types = HiveParser.KW_TRUNCATE) public class TruncateTableAnalyzer extends AbstractBaseAlterTableAnalyzer { public TruncateTableAnalyzer(QueryState queryState) throws SemanticException { super(queryState); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java index c75829c272..ec582ef35b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java @@ -143,7 +143,7 @@ ALTERPARTITION_LOCATION("ALTERPARTITION_LOCATION", HiveParser.TOK_ALTERPARTITION_LOCATION, new Privilege[]{Privilege.ALTER_DATA}, null), CREATETABLE("CREATETABLE", HiveParser.TOK_CREATETABLE, null, new Privilege[]{Privilege.CREATE}), - TRUNCATETABLE("TRUNCATETABLE", HiveParser.TOK_TRUNCATETABLE, null, new Privilege[]{Privilege.DROP}), + TRUNCATETABLE("TRUNCATETABLE", HiveParser.KW_TRUNCATE, null, new Privilege[]{Privilege.DROP}), CREATETABLE_AS_SELECT("CREATETABLE_AS_SELECT", (int[])null, new Privilege[]{Privilege.SELECT}, new Privilege[]{Privilege.CREATE}), QUERY("QUERY", HiveParser.TOK_QUERY, new Privilege[]{Privilege.SELECT},