Repository: hive
Updated Branches:
  refs/heads/master bfa34f339 -> 9cfdd4bb0


http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/org/apache/hadoop/hive/ql/parse/TestSQL11ReservedKeyWordsPositive.java
----------------------------------------------------------------------
diff --git 
a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestSQL11ReservedKeyWordsPositive.java
 
b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestSQL11ReservedKeyWordsPositive.java
deleted file mode 100644
index d0e6132..0000000
--- 
a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestSQL11ReservedKeyWordsPositive.java
+++ /dev/null
@@ -1,822 +0,0 @@
-/**
- * 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.parse;
-
-import java.io.IOException;
-
-import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
-import org.apache.hadoop.hive.ql.Context;
-import org.apache.hadoop.hive.ql.session.SessionState;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Parser tests for SQL11 Reserved KeyWords. Please find more information in
- * HIVE-6617. Total number : 74 + 2 (MySQL)
- */
-public class TestSQL11ReservedKeyWordsPositive {
-  private static HiveConf conf;
-
-  private ParseDriver pd;
-
-  @BeforeClass
-  public static void initialize() {
-    conf = new HiveConf(SemanticAnalyzer.class);
-    conf.setBoolVar(ConfVars.HIVE_SUPPORT_SQL11_RESERVED_KEYWORDS, false);
-    SessionState.start(conf);
-  }
-
-  @Before
-  public void setup() throws SemanticException, IOException {
-    pd = new ParseDriver();
-  }
-
-  ASTNode parse(String query) throws ParseException {
-    ASTNode nd = null;
-    try {
-      nd = pd.parse(query, new Context(conf));
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    return (ASTNode) nd.getChild(0);
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_ALL() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE ALL (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname all) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_ALTER() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE ALTER (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname alter) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_ARRAY() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE ARRAY (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname array) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_AS() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE AS (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname as) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_AUTHORIZATION() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE AUTHORIZATION (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname authorization) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_BETWEEN() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE BETWEEN (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname between) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_BIGINT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE BIGINT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname bigint) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_BINARY() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE BINARY (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname binary) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_BOOLEAN() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE BOOLEAN (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname boolean) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_BOTH() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE BOTH (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname both) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_BY() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE BY (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname by) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_CREATE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE CREATE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname create) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_CUBE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE CUBE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname cube) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_CURRENT_DATE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE CURRENT_DATE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname current_date) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_CURRENT_TIMESTAMP() throws 
ParseException {
-    ASTNode ast = parse("CREATE TABLE CURRENT_TIMESTAMP (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname current_timestamp) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_CURSOR() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE CURSOR (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname cursor) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_DATE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE DATE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname date) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_DECIMAL() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE DECIMAL (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname decimal) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_DELETE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE DELETE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname delete) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_DESCRIBE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE DESCRIBE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname describe) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_DOUBLE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE DOUBLE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname double) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_DROP() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE DROP (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname drop) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_EXISTS() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE EXISTS (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname exists) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_EXTERNAL() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE EXTERNAL (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname external) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_FALSE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE FALSE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname false) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_FETCH() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE FETCH (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname fetch) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_FLOAT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE FLOAT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname float) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_FOR() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE FOR (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname for) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_FULL() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE FULL (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname full) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_GRANT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE GRANT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname grant) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_GROUP() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE GROUP (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname group) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_GROUPING() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE GROUPING (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname grouping) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_IMPORT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE IMPORT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname import) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_IN() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE IN (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname in) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_INNER() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE INNER (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname inner) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_INSERT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE INSERT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname insert) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_INT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE INT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname int) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_INTERSECT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE INTERSECT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname intersect) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_INTO() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE INTO (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname into) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_IS() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE IS (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname is) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_LATERAL() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE LATERAL (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname lateral) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_LEFT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE LEFT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname left) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_LIKE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE LIKE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname like) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_LOCAL() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE LOCAL (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname local) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_NONE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE NONE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname none) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_NULL() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE NULL (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname null) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_OF() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE OF (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname of) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_ORDER() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE ORDER (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname order) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_OUT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE OUT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname out) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_OUTER() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE OUTER (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname outer) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_PARTITION() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE PARTITION (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname partition) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_PERCENT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE PERCENT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname percent) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_PROCEDURE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE PROCEDURE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname procedure) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_RANGE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE RANGE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname range) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_READS() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE READS (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname reads) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_REVOKE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE REVOKE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname revoke) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_RIGHT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE RIGHT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname right) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_ROLLUP() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE ROLLUP (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname rollup) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_ROW() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE ROW (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname row) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_ROWS() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE ROWS (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname rows) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_SET() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE SET (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname set) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_SMALLINT() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE SMALLINT (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname smallint) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_TABLE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE TABLE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname table) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_TIMESTAMP() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE TIMESTAMP (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname timestamp) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_TO() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE TO (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname to) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_TRIGGER() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE TRIGGER (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname trigger) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_TRUE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE TRUE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname true) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_TRUNCATE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE TRUNCATE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname truncate) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_UNION() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE UNION (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname union) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_UPDATE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE UPDATE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname update) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_USER() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE USER (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname user) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_USING() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE USING (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname using) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_VALUES() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE VALUES (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname values) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_WITH() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE WITH (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname with) tok_liketable (tok_tabcollist 
(tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  // MySQL reserved keywords.
-  @Test
-  public void testSQL11ReservedKeyWords_RLIKE() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE RLIKE (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname rlike) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-
-  @Test
-  public void testSQL11ReservedKeyWords_REGEXP() throws ParseException {
-    ASTNode ast = parse("CREATE TABLE REGEXP (col STRING)");
-    Assert
-        .assertEquals(
-            "AST doesn't match",
-            "(tok_createtable (tok_tabname regexp) tok_liketable 
(tok_tabcollist (tok_tabcol col tok_string)))",
-            ast.toStringTree());
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/queries/clientpositive/keyword_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/keyword_2.q 
b/ql/src/test/queries/clientpositive/keyword_2.q
index 054e26a..e8be760 100644
--- a/ql/src/test/queries/clientpositive/keyword_2.q
+++ b/ql/src/test/queries/clientpositive/keyword_2.q
@@ -1,4 +1,3 @@
-set hive.support.sql11.reserved.keywords=false;
 drop table varchar_udf_1;
 
 create table varchar_udf_1 (c1 string, c2 string, c3 varchar(10), c4 
varchar(20));
@@ -6,9 +5,9 @@ insert overwrite table varchar_udf_1
   select key, value, key, value from src where key = '238' limit 1;
 
 select
-  regexp(c2, 'val'),
-  regexp(c4, 'val'),
-  regexp(c2, 'val') = regexp(c4, 'val')
+  c2 regexp 'val',
+  c4 regexp 'val',
+  (c2 regexp 'val') = (c4 regexp 'val')
 from varchar_udf_1 limit 1;
 
 drop table varchar_udf_1;

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/queries/clientpositive/ppd_field_garbage.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/ppd_field_garbage.q 
b/ql/src/test/queries/clientpositive/ppd_field_garbage.q
index 67bea5c..85021f1 100644
--- a/ql/src/test/queries/clientpositive/ppd_field_garbage.q
+++ b/ql/src/test/queries/clientpositive/ppd_field_garbage.q
@@ -1,8 +1,6 @@
-set hive.support.sql11.reserved.keywords=false;
--- We need the above setting for backward compatibility because 'user' is a 
keyword in SQL2011
 -- ppd leaves invalid expr in field expr
-CREATE TABLE test_issue (fileid int, infos ARRAY<STRUCT<user:INT>>, test_c 
STRUCT<user_c:STRUCT<age:INT>>);
-CREATE VIEW v_test_issue AS SELECT fileid, i.user, test_c.user_c.age FROM 
test_issue LATERAL VIEW explode(infos) info AS i;
+CREATE TABLE test_issue (fileid int, infos ARRAY<STRUCT<u:INT>>, test_c 
STRUCT<user_c:STRUCT<age:INT>>);
+CREATE VIEW v_test_issue AS SELECT fileid, i.u, test_c.user_c.age FROM 
test_issue LATERAL VIEW explode(infos) info AS i;
 
 -- dummy data
 LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE test_issue;

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/queries/clientpositive/udaf_collect_set_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udaf_collect_set_2.q 
b/ql/src/test/queries/clientpositive/udaf_collect_set_2.q
index d18509b..769655b 100644
--- a/ql/src/test/queries/clientpositive/udaf_collect_set_2.q
+++ b/ql/src/test/queries/clientpositive/udaf_collect_set_2.q
@@ -1,5 +1,3 @@
-set hive.support.sql11.reserved.keywords=false;
-
 DESCRIBE FUNCTION collect_set;
 DESCRIBE FUNCTION EXTENDED collect_set;
 
@@ -15,13 +13,13 @@ FIELDS TERMINATED BY ',';
 
 LOAD DATA LOCAL INPATH "../../data/files/customers.txt" INTO TABLE customers;
 
-CREATE TABLE orders (id int, cid int, date date, amount double)
+CREATE TABLE orders (id int, cid int, d date, amount double)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ',';
 
 LOAD DATA LOCAL INPATH "../../data/files/orders.txt" INTO TABLE orders;
 
-CREATE TABLE nested_orders (id int, cid int, date date, sub map<string,double>)
+CREATE TABLE nested_orders (id int, cid int, d date, sub map<string,double>)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 COLLECTION ITEMS TERMINATED BY '$'
@@ -33,35 +31,35 @@ LOAD DATA LOCAL INPATH "../../data/files/nested_orders.txt" 
INTO TABLE nested_or
 
 -- 1.1 when field is primitive
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", o.amount)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", 
o.date, "amount", o.amount)))
+SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
 -- cast decimal
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", cast(o.amount as decimal(10,1)))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", 
o.date, "amount", cast(o.amount as decimal(10,1)))))
+SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
 
-SELECT c.id, sort_array(collect_set(struct(c.name, o.date, o.amount)))
+SELECT c.id, sort_array(collect_set(struct(c.name, o.d, o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_list(struct(c.name, o.date, o.amount)))
+SELECT c.id, sort_array(collect_list(struct(c.name, o.d, o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id;
@@ -69,22 +67,22 @@ ON (c.id = o.cid) GROUP BY c.id;
 
 -- 1.2 when field is map
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", o.sub)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", 
o.date, "sub", o.sub)))
+SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_set(struct(c.name, o.date, o.sub)))
+SELECT c.id, sort_array(collect_set(struct(c.name, o.d, o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_list(struct(c.name, o.date, o.sub)))
+SELECT c.id, sort_array(collect_list(struct(c.name, o.d, o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;
@@ -92,22 +90,22 @@ ON (c.id = o.cid) GROUP BY c.id;
 
 -- 1.3 when field is list
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", map_values(o.sub))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", 
o.date, "sub", map_values(o.sub))))
+SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_set(struct(c.name, o.date, map_values(o.sub))))
+SELECT c.id, sort_array(collect_set(struct(c.name, o.d, map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;
 
-SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
map_values(o.sub))))
+SELECT c.id, sort_array(collect_list(struct(c.name, o.d, map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id;

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientnegative/authorization_cannot_create_all_role.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientnegative/authorization_cannot_create_all_role.q.out 
b/ql/src/test/results/clientnegative/authorization_cannot_create_all_role.q.out
index 3bc663b..0bb8788 100644
--- 
a/ql/src/test/results/clientnegative/authorization_cannot_create_all_role.q.out
+++ 
b/ql/src/test/results/clientnegative/authorization_cannot_create_all_role.q.out
@@ -2,4 +2,4 @@ PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
-FAILED: ParseException line 2:12 Failed to recognize predicate 'all'. Failed 
rule: 'identifier' in create role
+FAILED: ParseException line 2:12 cannot recognize input near 'all' '<EOF>' 
'<EOF>' in create role

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientnegative/authorization_cannot_create_none_role.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientnegative/authorization_cannot_create_none_role.q.out
 
b/ql/src/test/results/clientnegative/authorization_cannot_create_none_role.q.out
index a8f6c1c..618cba6 100644
--- 
a/ql/src/test/results/clientnegative/authorization_cannot_create_none_role.q.out
+++ 
b/ql/src/test/results/clientnegative/authorization_cannot_create_none_role.q.out
@@ -2,4 +2,4 @@ PREHOOK: query: set role ADMIN
 PREHOOK: type: SHOW_ROLES
 POSTHOOK: query: set role ADMIN
 POSTHOOK: type: SHOW_ROLES
-FAILED: ParseException line 2:12 Failed to recognize predicate 'None'. Failed 
rule: 'identifier' in create role
+FAILED: ParseException line 2:12 cannot recognize input near 'None' '<EOF>' 
'<EOF>' in create role

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientnegative/cte_with_in_subquery.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/cte_with_in_subquery.q.out 
b/ql/src/test/results/clientnegative/cte_with_in_subquery.q.out
index 1122ca5..2ead43b 100644
--- a/ql/src/test/results/clientnegative/cte_with_in_subquery.q.out
+++ b/ql/src/test/results/clientnegative/cte_with_in_subquery.q.out
@@ -1 +1 @@
-FAILED: ParseException line 1:20 cannot recognize input near 'with' 'q1' 'as' 
in from source
+FAILED: SemanticException [Error 10001]: Line 1:44 Table not found 'q2'

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientnegative/lateral_view_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/lateral_view_join.q.out 
b/ql/src/test/results/clientnegative/lateral_view_join.q.out
index 74a7ea5..b96f18f 100644
--- a/ql/src/test/results/clientnegative/lateral_view_join.q.out
+++ b/ql/src/test/results/clientnegative/lateral_view_join.q.out
@@ -1 +1 @@
-FAILED: ParseException line 1:59 Failed to recognize predicate 'AS'. Failed 
rule: 'identifier' in table alias
+FAILED: ParseException line 1:59 cannot recognize input near 'AS' 'myTable' 
'JOIN' in table alias

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientnegative/subq_insert.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/subq_insert.q.out 
b/ql/src/test/results/clientnegative/subq_insert.q.out
index 4847634..620409b 100644
--- a/ql/src/test/results/clientnegative/subq_insert.q.out
+++ b/ql/src/test/results/clientnegative/subq_insert.q.out
@@ -1 +1 @@
-FAILED: ParseException line 2:22 cannot recognize input near 'INSERT' 
'OVERWRITE' 'TABLE' in from source
+FAILED: SemanticException [Error 10024]: Line 2:38 Cannot insert in a 
subquery. Inserting to table  'src1'

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientpositive/keyword_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/keyword_2.q.out 
b/ql/src/test/results/clientpositive/keyword_2.q.out
index 3d248fb..c8389f5 100644
--- a/ql/src/test/results/clientpositive/keyword_2.q.out
+++ b/ql/src/test/results/clientpositive/keyword_2.q.out
@@ -25,17 +25,17 @@ POSTHOOK: Lineage: varchar_udf_1.c2 SIMPLE 
[(src)src.FieldSchema(name:value, typ
 POSTHOOK: Lineage: varchar_udf_1.c3 EXPRESSION [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
 POSTHOOK: Lineage: varchar_udf_1.c4 EXPRESSION 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: select
-  regexp(c2, 'val'),
-  regexp(c4, 'val'),
-  regexp(c2, 'val') = regexp(c4, 'val')
+  c2 regexp 'val',
+  c4 regexp 'val',
+  (c2 regexp 'val') = (c4 regexp 'val')
 from varchar_udf_1 limit 1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@varchar_udf_1
 #### A masked pattern was here ####
 POSTHOOK: query: select
-  regexp(c2, 'val'),
-  regexp(c4, 'val'),
-  regexp(c2, 'val') = regexp(c4, 'val')
+  c2 regexp 'val',
+  c4 regexp 'val',
+  (c2 regexp 'val') = (c4 regexp 'val')
 from varchar_udf_1 limit 1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@varchar_udf_1

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out 
b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
index 7425988..f2e76a7 100644
--- a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
@@ -42,13 +42,13 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
"../../data/files/customers.txt" INTO TA
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@customers
-PREHOOK: query: CREATE TABLE orders (id int, cid int, date date, amount double)
+PREHOOK: query: CREATE TABLE orders (id int, cid int, d date, amount double)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orders
-POSTHOOK: query: CREATE TABLE orders (id int, cid int, date date, amount 
double)
+POSTHOOK: query: CREATE TABLE orders (id int, cid int, d date, amount double)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 POSTHOOK: type: CREATETABLE
@@ -62,7 +62,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
"../../data/files/orders.txt" INTO TABLE
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@orders
-PREHOOK: query: CREATE TABLE nested_orders (id int, cid int, date date, sub 
map<string,double>)
+PREHOOK: query: CREATE TABLE nested_orders (id int, cid int, d date, sub 
map<string,double>)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 COLLECTION ITEMS TERMINATED BY '$'
@@ -70,7 +70,7 @@ MAP KEYS TERMINATED BY ':'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@nested_orders
-POSTHOOK: query: CREATE TABLE nested_orders (id int, cid int, date date, sub 
map<string,double>)
+POSTHOOK: query: CREATE TABLE nested_orders (id int, cid int, d date, sub 
map<string,double>)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 COLLECTION ITEMS TERMINATED BY '$'
@@ -90,7 +90,7 @@ PREHOOK: query: -- 1. test struct
 
 -- 1.1 when field is primitive
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", o.amount)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -102,7 +102,7 @@ POSTHOOK: query: -- 1. test struct
 
 -- 1.1 when field is primitive
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", o.amount)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -113,7 +113,7 @@ POSTHOOK: Input: default@orders
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}]
 2      
[{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -121,7 +121,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -134,7 +134,7 @@ POSTHOOK: Input: default@orders
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}]
 PREHOOK: query: -- cast decimal
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", cast(o.amount as decimal(10,1)))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -144,7 +144,7 @@ PREHOOK: Input: default@orders
 #### A masked pattern was here ####
 POSTHOOK: query: -- cast decimal
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", cast(o.amount as decimal(10,1)))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -155,7 +155,7 @@ POSTHOOK: Input: default@orders
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}]
 2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", cast(o.amount as decimal(10,1)))))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -163,7 +163,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", cast(o.amount as decimal(10,1)))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -174,7 +174,7 @@ POSTHOOK: Input: default@orders
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}]
 2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}]
-PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -182,7 +182,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -193,7 +193,7 @@ POSTHOOK: Input: default@orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -201,7 +201,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -214,7 +214,7 @@ POSTHOOK: Input: default@orders
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}]
 PREHOOK: query: -- 1.2 when field is map
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", o.sub)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -224,7 +224,7 @@ PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 POSTHOOK: query: -- 1.2 when field is map
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", o.sub)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -235,7 +235,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -243,7 +243,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -254,7 +254,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -262,7 +262,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -273,7 +273,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -281,7 +281,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -294,7 +294,7 @@ POSTHOOK: Input: default@nested_orders
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
 PREHOOK: query: -- 1.3 when field is list
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", map_values(o.sub))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -304,7 +304,7 @@ PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 POSTHOOK: query: -- 1.3 when field is list
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", map_values(o.sub))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -315,7 +315,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}]
 2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -323,7 +323,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -334,7 +334,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}]
 2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}]
-PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -342,7 +342,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -353,7 +353,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[1200.5,29.36]}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":[30.5,41.35]},{"col1":"Martin","col2":"2014-12-12","col3":[210.03,100.56,500.0]}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -361,7 +361,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientpositive/ppd_field_garbage.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_field_garbage.q.out 
b/ql/src/test/results/clientpositive/ppd_field_garbage.q.out
index 1ce7a39..bf16dd7 100644
--- a/ql/src/test/results/clientpositive/ppd_field_garbage.q.out
+++ b/ql/src/test/results/clientpositive/ppd_field_garbage.q.out
@@ -1,21 +1,19 @@
-PREHOOK: query: -- We need the above setting for backward compatibility 
because 'user' is a keyword in SQL2011
--- ppd leaves invalid expr in field expr
-CREATE TABLE test_issue (fileid int, infos ARRAY<STRUCT<user:INT>>, test_c 
STRUCT<user_c:STRUCT<age:INT>>)
+PREHOOK: query: -- ppd leaves invalid expr in field expr
+CREATE TABLE test_issue (fileid int, infos ARRAY<STRUCT<u:INT>>, test_c 
STRUCT<user_c:STRUCT<age:INT>>)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@test_issue
-POSTHOOK: query: -- We need the above setting for backward compatibility 
because 'user' is a keyword in SQL2011
--- ppd leaves invalid expr in field expr
-CREATE TABLE test_issue (fileid int, infos ARRAY<STRUCT<user:INT>>, test_c 
STRUCT<user_c:STRUCT<age:INT>>)
+POSTHOOK: query: -- ppd leaves invalid expr in field expr
+CREATE TABLE test_issue (fileid int, infos ARRAY<STRUCT<u:INT>>, test_c 
STRUCT<user_c:STRUCT<age:INT>>)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@test_issue
-PREHOOK: query: CREATE VIEW v_test_issue AS SELECT fileid, i.user, 
test_c.user_c.age FROM test_issue LATERAL VIEW explode(infos) info AS i
+PREHOOK: query: CREATE VIEW v_test_issue AS SELECT fileid, i.u, 
test_c.user_c.age FROM test_issue LATERAL VIEW explode(infos) info AS i
 PREHOOK: type: CREATEVIEW
 PREHOOK: Input: default@test_issue
 PREHOOK: Output: database:default
 PREHOOK: Output: default@v_test_issue
-POSTHOOK: query: CREATE VIEW v_test_issue AS SELECT fileid, i.user, 
test_c.user_c.age FROM test_issue LATERAL VIEW explode(infos) info AS i
+POSTHOOK: query: CREATE VIEW v_test_issue AS SELECT fileid, i.u, 
test_c.user_c.age FROM test_issue LATERAL VIEW explode(infos) info AS i
 POSTHOOK: type: CREATEVIEW
 POSTHOOK: Input: default@test_issue
 POSTHOOK: Output: database:default

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/clientpositive/udaf_collect_set_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/udaf_collect_set_2.q.out 
b/ql/src/test/results/clientpositive/udaf_collect_set_2.q.out
index 7425988..f2e76a7 100644
--- a/ql/src/test/results/clientpositive/udaf_collect_set_2.q.out
+++ b/ql/src/test/results/clientpositive/udaf_collect_set_2.q.out
@@ -42,13 +42,13 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
"../../data/files/customers.txt" INTO TA
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@customers
-PREHOOK: query: CREATE TABLE orders (id int, cid int, date date, amount double)
+PREHOOK: query: CREATE TABLE orders (id int, cid int, d date, amount double)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orders
-POSTHOOK: query: CREATE TABLE orders (id int, cid int, date date, amount 
double)
+POSTHOOK: query: CREATE TABLE orders (id int, cid int, d date, amount double)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 POSTHOOK: type: CREATETABLE
@@ -62,7 +62,7 @@ POSTHOOK: query: LOAD DATA LOCAL INPATH 
"../../data/files/orders.txt" INTO TABLE
 POSTHOOK: type: LOAD
 #### A masked pattern was here ####
 POSTHOOK: Output: default@orders
-PREHOOK: query: CREATE TABLE nested_orders (id int, cid int, date date, sub 
map<string,double>)
+PREHOOK: query: CREATE TABLE nested_orders (id int, cid int, d date, sub 
map<string,double>)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 COLLECTION ITEMS TERMINATED BY '$'
@@ -70,7 +70,7 @@ MAP KEYS TERMINATED BY ':'
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@nested_orders
-POSTHOOK: query: CREATE TABLE nested_orders (id int, cid int, date date, sub 
map<string,double>)
+POSTHOOK: query: CREATE TABLE nested_orders (id int, cid int, d date, sub 
map<string,double>)
 ROW FORMAT DELIMITED
 FIELDS TERMINATED BY ','
 COLLECTION ITEMS TERMINATED BY '$'
@@ -90,7 +90,7 @@ PREHOOK: query: -- 1. test struct
 
 -- 1.1 when field is primitive
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", o.amount)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -102,7 +102,7 @@ POSTHOOK: query: -- 1. test struct
 
 -- 1.1 when field is primitive
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", o.amount)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -113,7 +113,7 @@ POSTHOOK: Input: default@orders
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}]
 2      
[{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -121,7 +121,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -134,7 +134,7 @@ POSTHOOK: Input: default@orders
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}]
 PREHOOK: query: -- cast decimal
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", cast(o.amount as decimal(10,1)))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -144,7 +144,7 @@ PREHOOK: Input: default@orders
 #### A masked pattern was here ####
 POSTHOOK: query: -- cast decimal
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "amount", cast(o.amount as decimal(10,1)))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -155,7 +155,7 @@ POSTHOOK: Input: default@orders
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}]
 2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", cast(o.amount as decimal(10,1)))))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -163,7 +163,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "amount", cast(o.amount as decimal(10,1)))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -174,7 +174,7 @@ POSTHOOK: Input: default@orders
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}]
 2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}]
-PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -182,7 +182,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -193,7 +193,7 @@ POSTHOOK: Input: default@orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.amount)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -201,7 +201,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.amount)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -214,7 +214,7 @@ POSTHOOK: Input: default@orders
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}]
 PREHOOK: query: -- 1.2 when field is map
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", o.sub)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -224,7 +224,7 @@ PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 POSTHOOK: query: -- 1.2 when field is map
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", o.sub)))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -235,7 +235,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -243,7 +243,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -254,7 +254,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -262,7 +262,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -273,7 +273,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"grape\"":1200.5,"\"rice\"":29.36}}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.sub)))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -281,7 +281,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
o.sub)))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -294,7 +294,7 @@ POSTHOOK: Input: default@nested_orders
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
 PREHOOK: query: -- 1.3 when field is list
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", map_values(o.sub))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -304,7 +304,7 @@ PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 POSTHOOK: query: -- 1.3 when field is list
 
-SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", 
o.date, "sub", map_values(o.sub))))
+SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, 
"sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -315,7 +315,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}]
 2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -323,7 +323,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.date, "sub", map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -334,7 +334,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}]
 2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}]
-PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -342,7 +342,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.date, 
map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -353,7 +353,7 @@ POSTHOOK: Input: default@nested_orders
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[1200.5,29.36]}]
 2      
[{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":[30.5,41.35]},{"col1":"Martin","col2":"2014-12-12","col3":[210.03,100.56,500.0]}]
-PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
map_values(o.sub))))
+PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id
@@ -361,7 +361,7 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@customers
 PREHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.date, 
map_values(o.sub))))
+POSTHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
 ON (c.id = o.cid) GROUP BY c.id

http://git-wip-us.apache.org/repos/asf/hive/blob/9cfdd4bb/ql/src/test/results/compiler/errors/missing_overwrite.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/compiler/errors/missing_overwrite.q.out 
b/ql/src/test/results/compiler/errors/missing_overwrite.q.out
index 7fed7a5..441558a 100644
--- a/ql/src/test/results/compiler/errors/missing_overwrite.q.out
+++ b/ql/src/test/results/compiler/errors/missing_overwrite.q.out
@@ -1 +1 @@
-Parse Error: line 2:7 cannot recognize input near 'INSERT' 'TABLE' 'dest1' in 
table source
\ No newline at end of file
+Parse Error: line 2:0 cannot recognize input near 'INSERT' 'TABLE' 'dest1' in 
insert clause
\ No newline at end of file

Reply via email to