http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/index_creation.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_creation.q.out 
b/ql/src/test/results/clientpositive/index_creation.q.out
deleted file mode 100644
index 49b3f11..0000000
--- a/ql/src/test/results/clientpositive/index_creation.q.out
+++ /dev/null
@@ -1,321 +0,0 @@
-PREHOOK: query: drop index src_index_2 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_2 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_3 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_3 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_4 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_4 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_5 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_5 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_6 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_6 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_7 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_7 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_8 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_8 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_9 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_9 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop table `_t`
-PREHOOK: type: DROPTABLE
-POSTHOOK: query: drop table `_t`
-POSTHOOK: type: DROPTABLE
-PREHOOK: query: create index src_index_2 on table src(key) as 'compact' WITH 
DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_2 on table src(key) as 'compact' WITH 
DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index_2__
-PREHOOK: query: desc extended default__src_src_index_2__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__src_src_index_2__
-POSTHOOK: query: desc extended default__src_src_index_2__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__src_src_index_2__
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create index src_index_3 on table src(key) as 'compact' WITH 
DEFERRED REBUILD in table src_idx_src_index_3
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_3 on table src(key) as 'compact' WITH 
DEFERRED REBUILD in table src_idx_src_index_3
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_idx_src_index_3
-PREHOOK: query: desc extended src_idx_src_index_3
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@src_idx_src_index_3
-POSTHOOK: query: desc extended src_idx_src_index_3
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@src_idx_src_index_3
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create index src_index_4 on table src(key) as 'compact' WITH 
DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS 
TEXTFILE
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_4 on table src(key) as 'compact' WITH 
DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS 
TEXTFILE
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index_4__
-PREHOOK: query: desc extended default__src_src_index_4__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__src_src_index_4__
-POSTHOOK: query: desc extended default__src_src_index_4__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__src_src_index_4__
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create index src_index_5 on table src(key) as 'compact' WITH 
DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\'
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_5 on table src(key) as 'compact' WITH 
DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\'
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index_5__
-PREHOOK: query: desc extended default__src_src_index_5__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__src_src_index_5__
-POSTHOOK: query: desc extended default__src_src_index_5__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__src_src_index_5__
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create index src_index_6 on table src(key) as 'compact' WITH 
DEFERRED REBUILD STORED AS RCFILE
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_6 on table src(key) as 'compact' WITH 
DEFERRED REBUILD STORED AS RCFILE
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index_6__
-PREHOOK: query: desc extended default__src_src_index_6__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__src_src_index_6__
-POSTHOOK: query: desc extended default__src_src_index_6__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__src_src_index_6__
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create index src_index_7 on table src(key) as 'compact' WITH 
DEFERRED REBUILD in table src_idx_src_index_7 STORED AS RCFILE
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_7 on table src(key) as 'compact' WITH 
DEFERRED REBUILD in table src_idx_src_index_7 STORED AS RCFILE
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@src_idx_src_index_7
-PREHOOK: query: desc extended src_idx_src_index_7
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@src_idx_src_index_7
-POSTHOOK: query: desc extended src_idx_src_index_7
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@src_idx_src_index_7
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create index src_index_8 on table src(key) as 'compact' WITH 
DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2")
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_8 on table src(key) as 'compact' WITH 
DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2")
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index_8__
-PREHOOK: query: desc extended default__src_src_index_8__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__src_src_index_8__
-POSTHOOK: query: desc extended default__src_src_index_8__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__src_src_index_8__
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create index src_index_9 on table src(key) as 'compact' WITH 
DEFERRED REBUILD TBLPROPERTIES ("prop1"="val1", "prop2"="val2")
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: create index src_index_9 on table src(key) as 'compact' WITH 
DEFERRED REBUILD TBLPROPERTIES ("prop1"="val1", "prop2"="val2")
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index_9__
-PREHOOK: query: desc extended default__src_src_index_9__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__src_src_index_9__
-POSTHOOK: query: desc extended default__src_src_index_9__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__src_src_index_9__
-key                    string                  default             
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: create table `_t`(`_i` int, `_j` int)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@_t
-POSTHOOK: query: create table `_t`(`_i` int, `_j` int)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@_t
-PREHOOK: query: create index x on table `_t`(`_j`) as 'compact' WITH DEFERRED 
REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@_t
-POSTHOOK: query: create index x on table `_t`(`_j`) as 'compact' WITH DEFERRED 
REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@_t
-POSTHOOK: Output: default@default___t_x__
-PREHOOK: query: alter index x on `_t` rebuild
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@_t
-PREHOOK: Output: default@default___t_x__
-POSTHOOK: query: alter index x on `_t` rebuild
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@_t
-POSTHOOK: Output: default@default___t_x__
-POSTHOOK: Lineage: default___t_x__._bucketname SIMPLE 
[(_t)_t.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default___t_x__._j SIMPLE [(_t)_t.FieldSchema(name:_j, 
type:int, comment:null), ]
-POSTHOOK: Lineage: default___t_x__._offsets EXPRESSION 
[(_t)_t.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-PREHOOK: query: create index x2 on table `_t`(`_i`,`_j`) as 'compact' WITH 
DEFERRED
-REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@_t
-POSTHOOK: query: create index x2 on table `_t`(`_i`,`_j`) as 'compact' WITH 
DEFERRED
-REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@_t
-POSTHOOK: Output: default@default___t_x2__
-PREHOOK: query: alter index x2 on `_t` rebuild
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@_t
-PREHOOK: Output: default@default___t_x2__
-POSTHOOK: query: alter index x2 on `_t` rebuild
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@_t
-POSTHOOK: Output: default@default___t_x2__
-POSTHOOK: Lineage: default___t_x2__._bucketname SIMPLE 
[(_t)_t.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default___t_x2__._i SIMPLE [(_t)_t.FieldSchema(name:_i, 
type:int, comment:null), ]
-POSTHOOK: Lineage: default___t_x2__._j SIMPLE [(_t)_t.FieldSchema(name:_j, 
type:int, comment:null), ]
-POSTHOOK: Lineage: default___t_x2__._offsets EXPRESSION 
[(_t)_t.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-PREHOOK: query: drop index src_index_2 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_2 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_3 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_3 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_4 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_4 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_5 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_5 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_6 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_6 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_7 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_7 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_8 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_8 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop index src_index_9 on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index_9 on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: drop table `_t`
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@_t
-PREHOOK: Output: default@_t
-POSTHOOK: query: drop table `_t`
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@_t
-POSTHOOK: Output: default@_t
-PREHOOK: query: show tables
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:default
-POSTHOOK: query: show tables
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:default
-alltypesorc
-alltypesparquet
-cbo_t1
-cbo_t2
-cbo_t3
-lineitem
-part
-src
-src1
-src_cbo
-src_json
-src_sequencefile
-src_thrift
-srcbucket
-srcbucket2
-srcpart

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/index_in_db.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_in_db.q.out 
b/ql/src/test/results/clientpositive/index_in_db.q.out
deleted file mode 100644
index 6d7b0c3..0000000
--- a/ql/src/test/results/clientpositive/index_in_db.q.out
+++ /dev/null
@@ -1,57 +0,0 @@
-PREHOOK: query: drop database if exists index_test_db cascade
-PREHOOK: type: DROPDATABASE
-POSTHOOK: query: drop database if exists index_test_db cascade
-POSTHOOK: type: DROPDATABASE
-PREHOOK: query: create database index_test_db
-PREHOOK: type: CREATEDATABASE
-PREHOOK: Output: database:index_test_db
-POSTHOOK: query: create database index_test_db
-POSTHOOK: type: CREATEDATABASE
-POSTHOOK: Output: database:index_test_db
-PREHOOK: query: use index_test_db
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:index_test_db
-POSTHOOK: query: use index_test_db
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:index_test_db
-PREHOOK: query: create table testtb (id int, name string)
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:index_test_db
-PREHOOK: Output: index_test_db@testtb
-POSTHOOK: query: create table testtb (id int, name string)
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:index_test_db
-POSTHOOK: Output: index_test_db@testtb
-PREHOOK: query: create index id_index on table testtb (id) as 'COMPACT' WITH 
DEFERRED REBUILD  in table testdb_id_idx_tb
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: index_test_db@testtb
-POSTHOOK: query: create index id_index on table testtb (id) as 'COMPACT' WITH 
DEFERRED REBUILD  in table testdb_id_idx_tb
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: index_test_db@testtb
-POSTHOOK: Output: index_test_db@testdb_id_idx_tb
-PREHOOK: query: use default
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:default
-POSTHOOK: query: use default
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:default
-PREHOOK: query: select * from index_test_db.testtb where id>2
-PREHOOK: type: QUERY
-PREHOOK: Input: index_test_db@testtb
-#### A masked pattern was here ####
-POSTHOOK: query: select * from index_test_db.testtb where id>2
-POSTHOOK: type: QUERY
-POSTHOOK: Input: index_test_db@testtb
-#### A masked pattern was here ####
-PREHOOK: query: use index_test_db
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:index_test_db
-POSTHOOK: query: use index_test_db
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:index_test_db
-PREHOOK: query: drop index id_index on testtb
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: index_test_db@testtb
-POSTHOOK: query: drop index id_index on testtb
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: index_test_db@testtb

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/index_serde.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_serde.q.out 
b/ql/src/test/results/clientpositive/index_serde.q.out
deleted file mode 100644
index b5c81e9..0000000
--- a/ql/src/test/results/clientpositive/index_serde.q.out
+++ /dev/null
@@ -1,242 +0,0 @@
-PREHOOK: query: CREATE TABLE doctors 
-ROW FORMAT
-SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
-STORED AS
-INPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat'
-OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat'
-TBLPROPERTIES ('avro.schema.literal'='{
-  "namespace": "testing.hive.avro.serde",
-  "name": "doctors",
-  "type": "record",
-  "fields": [
-    {
-      "name":"number",
-      "type":"int",
-      "doc":"Order of playing the role"
-    },
-    {
-      "name":"first_name",
-      "type":"string",
-      "doc":"first name of actor playing role"
-    },
-    {
-      "name":"last_name",
-      "type":"string",
-      "doc":"last name of actor playing role"
-    }
-  ]
-}')
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@doctors
-POSTHOOK: query: CREATE TABLE doctors 
-ROW FORMAT
-SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
-STORED AS
-INPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat'
-OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat'
-TBLPROPERTIES ('avro.schema.literal'='{
-  "namespace": "testing.hive.avro.serde",
-  "name": "doctors",
-  "type": "record",
-  "fields": [
-    {
-      "name":"number",
-      "type":"int",
-      "doc":"Order of playing the role"
-    },
-    {
-      "name":"first_name",
-      "type":"string",
-      "doc":"first name of actor playing role"
-    },
-    {
-      "name":"last_name",
-      "type":"string",
-      "doc":"last name of actor playing role"
-    }
-  ]
-}')
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@doctors
-PREHOOK: query: DESCRIBE doctors
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@doctors
-POSTHOOK: query: DESCRIBE doctors
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@doctors
-number                 int                     Order of playing the role
-first_name             string                  first name of actor playing role
-last_name              string                  last name of actor playing role
-PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO 
TABLE doctors
-PREHOOK: type: LOAD
-#### A masked pattern was here ####
-PREHOOK: Output: default@doctors
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO 
TABLE doctors
-POSTHOOK: type: LOAD
-#### A masked pattern was here ####
-POSTHOOK: Output: default@doctors
-PREHOOK: query: CREATE INDEX doctors_index ON TABLE doctors(number) AS 
'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@doctors
-POSTHOOK: query: CREATE INDEX doctors_index ON TABLE doctors(number) AS 
'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@doctors
-POSTHOOK: Output: default@default__doctors_doctors_index__
-PREHOOK: query: DESCRIBE EXTENDED default__doctors_doctors_index__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__doctors_doctors_index__
-POSTHOOK: query: DESCRIBE EXTENDED default__doctors_doctors_index__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__doctors_doctors_index__
-number                 int                     Order of playing the role
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-#### A masked pattern was here ####
-PREHOOK: query: ALTER INDEX doctors_index ON doctors REBUILD
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@doctors
-PREHOOK: Output: default@default__doctors_doctors_index__
-POSTHOOK: query: ALTER INDEX doctors_index ON doctors REBUILD
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@doctors
-POSTHOOK: Output: default@default__doctors_doctors_index__
-POSTHOOK: Lineage: default__doctors_doctors_index__._bucketname SIMPLE 
[(doctors)doctors.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__doctors_doctors_index__._offsets EXPRESSION 
[(doctors)doctors.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, 
comment:), ]
-POSTHOOK: Lineage: default__doctors_doctors_index__.number SIMPLE 
[(doctors)doctors.FieldSchema(name:number, type:int, comment:Order of playing 
the role), ]
-PREHOOK: query: EXPLAIN SELECT * FROM doctors WHERE number > 6
-PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT * FROM doctors WHERE number > 6
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-3 is a root stage
-  Stage-8 depends on stages: Stage-3 , consists of Stage-5, Stage-4, Stage-6
-  Stage-5
-  Stage-2 depends on stages: Stage-5, Stage-4, Stage-7
-  Stage-1 depends on stages: Stage-2
-  Stage-4
-  Stage-6
-  Stage-7 depends on stages: Stage-6
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-3
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__doctors_doctors_index__
-            filterExpr: (number > 6) (type: boolean)
-            Filter Operator
-              predicate: (number > 6) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-8
-    Conditional Operator
-
-  Stage: Stage-5
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-2
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: doctors
-            filterExpr: (number > 6) (type: boolean)
-            Statistics: Num rows: 1 Data size: 5210 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: (number > 6) (type: boolean)
-              Statistics: Num rows: 1 Data size: 5210 Basic stats: COMPLETE 
Column stats: NONE
-              Select Operator
-                expressions: number (type: int), first_name (type: string), 
last_name (type: string)
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 1 Data size: 5210 Basic stats: COMPLETE 
Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 1 Data size: 5210 Basic stats: 
COMPLETE Column stats: NONE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-6
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-7
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: SELECT * FROM doctors WHERE number > 6
-PREHOOK: type: QUERY
-PREHOOK: Input: default@default__doctors_doctors_index__
-PREHOOK: Input: default@doctors
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM doctors WHERE number > 6
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__doctors_doctors_index__
-POSTHOOK: Input: default@doctors
-#### A masked pattern was here ####
-10     David   Tennant
-11     Matt    Smith
-7      Sylvester       McCoy
-8      Paul    McGann
-9      Christopher     Eccleston
-PREHOOK: query: DROP INDEX doctors_index ON doctors
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@doctors
-POSTHOOK: query: DROP INDEX doctors_index ON doctors
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@doctors
-PREHOOK: query: DROP TABLE doctors
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@doctors
-PREHOOK: Output: default@doctors
-POSTHOOK: query: DROP TABLE doctors
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@doctors
-POSTHOOK: Output: default@doctors

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/index_skewtable.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_skewtable.q.out 
b/ql/src/test/results/clientpositive/index_skewtable.q.out
deleted file mode 100644
index c513a2a..0000000
--- a/ql/src/test/results/clientpositive/index_skewtable.q.out
+++ /dev/null
@@ -1,204 +0,0 @@
-PREHOOK: query: CREATE TABLE kv(key STRING, value STRING) SKEWED BY (key) ON 
((3), (8)) STORED AS TEXTFILE
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@kv
-POSTHOOK: query: CREATE TABLE kv(key STRING, value STRING) SKEWED BY (key) ON 
((3), (8)) STORED AS TEXTFILE
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@kv
-PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE kv
-PREHOOK: type: LOAD
-#### A masked pattern was here ####
-PREHOOK: Output: default@kv
-POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE kv
-POSTHOOK: type: LOAD
-#### A masked pattern was here ####
-POSTHOOK: Output: default@kv
-PREHOOK: query: CREATE INDEX kv_index ON TABLE kv(value) AS 'COMPACT' WITH 
DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@kv
-POSTHOOK: query: CREATE INDEX kv_index ON TABLE kv(value) AS 'COMPACT' WITH 
DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@kv
-POSTHOOK: Output: default@default__kv_kv_index__
-PREHOOK: query: DESCRIBE FORMATTED default__kv_kv_index__
-PREHOOK: type: DESCTABLE
-PREHOOK: Input: default@default__kv_kv_index__
-POSTHOOK: query: DESCRIBE FORMATTED default__kv_kv_index__
-POSTHOOK: type: DESCTABLE
-POSTHOOK: Input: default@default__kv_kv_index__
-# col_name             data_type               comment             
-value                  string                                      
-_bucketname            string                                      
-_offsets               array<bigint>                               
-                
-# Detailed Table Information            
-Database:              default                  
-#### A masked pattern was here ####
-Retention:             0                        
-#### A masked pattern was here ####
-Table Type:            INDEX_TABLE              
-Table Parameters:               
-#### A masked pattern was here ####
-                
-# Storage Information           
-SerDe Library:         org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe      
 
-InputFormat:           org.apache.hadoop.mapred.TextInputFormat         
-OutputFormat:          org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat  
 
-Compressed:            No                       
-Num Buckets:           -1                       
-Bucket Columns:        []                       
-Sort Columns:          [Order(col:value, order:1)]      
-PREHOOK: query: ALTER INDEX kv_index ON kv REBUILD
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@kv
-PREHOOK: Output: default@default__kv_kv_index__
-POSTHOOK: query: ALTER INDEX kv_index ON kv REBUILD
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@kv
-POSTHOOK: Output: default@default__kv_kv_index__
-POSTHOOK: Lineage: default__kv_kv_index__._bucketname SIMPLE 
[(kv)kv.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__kv_kv_index__._offsets EXPRESSION 
[(kv)kv.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__kv_kv_index__.value SIMPLE 
[(kv)kv.FieldSchema(name:value, type:string, comment:null), ]
-PREHOOK: query: EXPLAIN SELECT * FROM kv WHERE value > '15' ORDER BY value
-PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT * FROM kv WHERE value > '15' ORDER BY value
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-3 is a root stage
-  Stage-8 depends on stages: Stage-3 , consists of Stage-5, Stage-4, Stage-6
-  Stage-5
-  Stage-2 depends on stages: Stage-5, Stage-4, Stage-7
-  Stage-1 depends on stages: Stage-2
-  Stage-4
-  Stage-6
-  Stage-7 depends on stages: Stage-6
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-3
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__kv_kv_index__
-            filterExpr: (value > '15') (type: boolean)
-            Filter Operator
-              predicate: (value > '15') (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-8
-    Conditional Operator
-
-  Stage: Stage-5
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-2
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: kv
-            filterExpr: (value > '15') (type: boolean)
-            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: (value > '15') (type: boolean)
-              Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
-              Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
-                Reduce Output Operator
-                  key expressions: _col1 (type: string)
-                  sort order: +
-                  Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
-                  value expressions: _col0 (type: string)
-      Reduce Operator Tree:
-        Select Operator
-          expressions: VALUE._col0 (type: string), KEY.reducesinkkey0 (type: 
string)
-          outputColumnNames: _col0, _col1
-          Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE Column 
stats: NONE
-          File Output Operator
-            compressed: false
-            Statistics: Num rows: 1 Data size: 300 Basic stats: COMPLETE 
Column stats: NONE
-            table:
-                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-6
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-7
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: SELECT * FROM kv WHERE value > '15' ORDER BY value
-PREHOOK: type: QUERY
-PREHOOK: Input: default@default__kv_kv_index__
-PREHOOK: Input: default@kv
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM kv WHERE value > '15' ORDER BY value
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__kv_kv_index__
-POSTHOOK: Input: default@kv
-#### A masked pattern was here ####
-8      18
-8      18
-2      22
-PREHOOK: query: DROP INDEX kv_index ON kv
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@kv
-POSTHOOK: query: DROP INDEX kv_index ON kv
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@kv
-PREHOOK: query: DROP TABLE kv
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@kv
-PREHOOK: Output: default@kv
-POSTHOOK: query: DROP TABLE kv
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@kv
-POSTHOOK: Output: default@kv

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/index_stale.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_stale.q.out 
b/ql/src/test/results/clientpositive/index_stale.q.out
deleted file mode 100644
index 7883fcc..0000000
--- a/ql/src/test/results/clientpositive/index_stale.q.out
+++ /dev/null
@@ -1,106 +0,0 @@
-PREHOOK: query: CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@temp
-POSTHOOK: query: CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@temp
-PREHOOK: query: INSERT OVERWRITE TABLE temp SELECT * FROM src WHERE key < 50
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@temp
-POSTHOOK: query: INSERT OVERWRITE TABLE temp SELECT * FROM src WHERE key < 50
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@temp
-POSTHOOK: Lineage: temp.key SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
-POSTHOOK: Lineage: temp.val SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-PREHOOK: query: CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH 
DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@temp
-POSTHOOK: query: CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH 
DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@temp
-POSTHOOK: Output: default@default__temp_temp_index__
-PREHOOK: query: ALTER INDEX temp_index ON temp REBUILD
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@temp
-PREHOOK: Output: default@default__temp_temp_index__
-POSTHOOK: query: ALTER INDEX temp_index ON temp REBUILD
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@temp
-POSTHOOK: Output: default@default__temp_temp_index__
-POSTHOOK: Lineage: default__temp_temp_index__._bucketname SIMPLE 
[(temp)temp.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__temp_temp_index__._offsets EXPRESSION 
[(temp)temp.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, 
comment:), ]
-POSTHOOK: Lineage: default__temp_temp_index__.key SIMPLE 
[(temp)temp.FieldSchema(name:key, type:string, comment:null), ]
-PREHOOK: query: INSERT OVERWRITE TABLE temp SELECT * FROM src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@temp
-POSTHOOK: query: INSERT OVERWRITE TABLE temp SELECT * FROM src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@temp
-POSTHOOK: Lineage: temp.key SIMPLE [(src)src.FieldSchema(name:key, 
type:string, comment:default), ]
-POSTHOOK: Lineage: temp.val SIMPLE [(src)src.FieldSchema(name:value, 
type:string, comment:default), ]
-PREHOOK: query: EXPLAIN SELECT * FROM temp WHERE key  = 86
-PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT * FROM temp WHERE key  = 86
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-1 is a root stage
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: temp
-            filterExpr: (UDFToDouble(key) = 86.0) (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: (UDFToDouble(key) = 86.0) (type: boolean)
-              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
-              Select Operator
-                expressions: key (type: string), val (type: string)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: SELECT * FROM temp WHERE key  = 86
-PREHOOK: type: QUERY
-PREHOOK: Input: default@temp
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM temp WHERE key  = 86
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@temp
-#### A masked pattern was here ####
-86     val_86
-PREHOOK: query: DROP index temp_index on temp
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@temp
-POSTHOOK: query: DROP index temp_index on temp
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@temp
-PREHOOK: query: DROP table temp
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@temp
-PREHOOK: Output: default@temp
-POSTHOOK: query: DROP table temp
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@temp
-POSTHOOK: Output: default@temp

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_stale_partitioned.q.out 
b/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
deleted file mode 100644
index 2138c33..0000000
--- a/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
+++ /dev/null
@@ -1,115 +0,0 @@
-PREHOOK: query: CREATE TABLE temp(key STRING, val STRING) PARTITIONED BY (foo 
string) STORED AS TEXTFILE
-PREHOOK: type: CREATETABLE
-PREHOOK: Output: database:default
-PREHOOK: Output: default@temp
-POSTHOOK: query: CREATE TABLE temp(key STRING, val STRING) PARTITIONED BY (foo 
string) STORED AS TEXTFILE
-POSTHOOK: type: CREATETABLE
-POSTHOOK: Output: database:default
-POSTHOOK: Output: default@temp
-PREHOOK: query: ALTER TABLE temp ADD PARTITION (foo = 'bar')
-PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Output: default@temp
-POSTHOOK: query: ALTER TABLE temp ADD PARTITION (foo = 'bar')
-POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Output: default@temp
-POSTHOOK: Output: default@temp@foo=bar
-PREHOOK: query: INSERT OVERWRITE TABLE temp PARTITION (foo = 'bar') SELECT * 
FROM src WHERE key < 50
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@temp@foo=bar
-POSTHOOK: query: INSERT OVERWRITE TABLE temp PARTITION (foo = 'bar') SELECT * 
FROM src WHERE key < 50
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@temp@foo=bar
-POSTHOOK: Lineage: temp PARTITION(foo=bar).key SIMPLE 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: temp PARTITION(foo=bar).val SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH 
DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@temp
-POSTHOOK: query: CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH 
DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@temp
-POSTHOOK: Output: default@default__temp_temp_index__
-PREHOOK: query: ALTER INDEX temp_index ON temp PARTITION (foo = 'bar') REBUILD
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@temp
-PREHOOK: Input: default@temp@foo=bar
-PREHOOK: Output: default@default__temp_temp_index__@foo=bar
-POSTHOOK: query: ALTER INDEX temp_index ON temp PARTITION (foo = 'bar') REBUILD
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@temp
-POSTHOOK: Input: default@temp@foo=bar
-POSTHOOK: Output: default@default__temp_temp_index__@foo=bar
-POSTHOOK: Lineage: default__temp_temp_index__ PARTITION(foo=bar)._bucketname 
SIMPLE [(temp)temp.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__temp_temp_index__ PARTITION(foo=bar)._offsets 
EXPRESSION [(temp)temp.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, 
type:bigint, comment:), ]
-POSTHOOK: Lineage: default__temp_temp_index__ PARTITION(foo=bar).key SIMPLE 
[(temp)temp.FieldSchema(name:key, type:string, comment:null), ]
-PREHOOK: query: INSERT OVERWRITE TABLE temp PARTITION (foo = 'bar') SELECT * 
FROM src
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-PREHOOK: Output: default@temp@foo=bar
-POSTHOOK: query: INSERT OVERWRITE TABLE temp PARTITION (foo = 'bar') SELECT * 
FROM src
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@temp@foo=bar
-POSTHOOK: Lineage: temp PARTITION(foo=bar).key SIMPLE 
[(src)src.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: temp PARTITION(foo=bar).val SIMPLE 
[(src)src.FieldSchema(name:value, type:string, comment:default), ]
-PREHOOK: query: SELECT * FROM default__temp_temp_index__ WHERE key = 86 AND 
foo='bar'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@default__temp_temp_index__
-PREHOOK: Input: default@default__temp_temp_index__@foo=bar
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM default__temp_temp_index__ WHERE key = 86 AND 
foo='bar'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__temp_temp_index__
-POSTHOOK: Input: default@default__temp_temp_index__@foo=bar
-#### A masked pattern was here ####
-PREHOOK: query: EXPLAIN SELECT * FROM temp WHERE key  = 86 AND foo = 'bar'
-PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT * FROM temp WHERE key  = 86 AND foo = 'bar'
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-0 is a root stage
-
-STAGE PLANS:
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        TableScan
-          alias: temp
-          filterExpr: ((UDFToDouble(key) = 86.0) and (foo = 'bar')) (type: 
boolean)
-          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-          Filter Operator
-            predicate: (UDFToDouble(key) = 86.0) (type: boolean)
-            Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: key (type: string), val (type: string), 'bar' 
(type: string)
-              outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
-              ListSink
-
-PREHOOK: query: SELECT * FROM temp WHERE key  = 86 AND foo = 'bar'
-PREHOOK: type: QUERY
-PREHOOK: Input: default@temp
-PREHOOK: Input: default@temp@foo=bar
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT * FROM temp WHERE key  = 86 AND foo = 'bar'
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@temp
-POSTHOOK: Input: default@temp@foo=bar
-#### A masked pattern was here ####
-86     val_86  bar
-PREHOOK: query: DROP index temp_index on temp
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@temp
-POSTHOOK: query: DROP index temp_index on temp
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@temp
-PREHOOK: query: DROP table temp
-PREHOOK: type: DROPTABLE
-PREHOOK: Input: default@temp
-PREHOOK: Output: default@temp
-POSTHOOK: query: DROP table temp
-POSTHOOK: type: DROPTABLE
-POSTHOOK: Input: default@temp
-POSTHOOK: Output: default@temp

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/show_functions.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/show_functions.q.out 
b/ql/src/test/results/clientpositive/show_functions.q.out
index fcbf2c5..4e8ceaf 100644
--- a/ql/src/test/results/clientpositive/show_functions.q.out
+++ b/ql/src/test/results/clientpositive/show_functions.q.out
@@ -82,10 +82,6 @@ e
 elt
 encode
 enforce_constraint
-ewah_bitmap
-ewah_bitmap_and
-ewah_bitmap_empty
-ewah_bitmap_or
 exp
 explode
 extract_union

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/spark/union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_view.q.out 
b/ql/src/test/results/clientpositive/spark/union_view.q.out
index 1b73ddb..d960a30 100644
--- a/ql/src/test/results/clientpositive/spark/union_view.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_view.q.out
@@ -6,13 +6,6 @@ POSTHOOK: query: CREATE TABLE src_union_1 (key int, value 
string) PARTITIONED BY
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_union_1
-PREHOOK: query: CREATE INDEX src_union_1_key_idx ON TABLE src_union_1(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src_union_1
-POSTHOOK: query: CREATE INDEX src_union_1_key_idx ON TABLE src_union_1(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src_union_1
-POSTHOOK: Output: default@default__src_union_1_src_union_1_key_idx__
 PREHOOK: query: CREATE TABLE src_union_2 (key int, value string) PARTITIONED 
BY (ds string, part_1 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -21,13 +14,6 @@ POSTHOOK: query: CREATE TABLE src_union_2 (key int, value 
string) PARTITIONED BY
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_union_2
-PREHOOK: query: CREATE INDEX src_union_2_key_idx ON TABLE src_union_2(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src_union_2
-POSTHOOK: query: CREATE INDEX src_union_2_key_idx ON TABLE src_union_2(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src_union_2
-POSTHOOK: Output: default@default__src_union_2_src_union_2_key_idx__
 PREHOOK: query: CREATE TABLE src_union_3(key int, value string) PARTITIONED BY 
(ds string, part_1 string, part_2 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -36,13 +22,6 @@ POSTHOOK: query: CREATE TABLE src_union_3(key int, value 
string) PARTITIONED BY
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_union_3
-PREHOOK: query: CREATE INDEX src_union_3_key_idx ON TABLE src_union_3(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src_union_3
-POSTHOOK: query: CREATE INDEX src_union_3_key_idx ON TABLE src_union_3(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src_union_3
-POSTHOOK: Output: default@default__src_union_3_src_union_3_key_idx__
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -494,9 +473,9 @@ STAGE PLANS:
 86     val_86  3
 86     val_86  3
 86     val_86  3
-86     val_86  1
 86     val_86  2
 86     val_86  2
+86     val_86  1
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out 
b/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out
index 8f463e8..55db575 100644
--- a/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out
+++ b/ql/src/test/results/clientpositive/special_character_in_tabnames_2.q.out
@@ -63,31 +63,6 @@ POSTHOOK: Input: default@s/c
 97     val_97
 98     val_98
 98     val_98
-PREHOOK: query: CREATE INDEX src_index ON TABLE `s/c`(key) as 'COMPACT' WITH 
DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@s/c
-POSTHOOK: query: CREATE INDEX src_index ON TABLE `s/c`(key) as 'COMPACT' WITH 
DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@s/c
-POSTHOOK: Output: default@default__s/c_src_index__
-PREHOOK: query: ALTER INDEX src_index ON `s/c` REBUILD
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@s/c
-PREHOOK: Output: default@default__s/c_src_index__
-POSTHOOK: query: ALTER INDEX src_index ON `s/c` REBUILD
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@s/c
-POSTHOOK: Output: default@default__s/c_src_index__
-POSTHOOK: Lineage: default__s/c_src_index__._bucketname SIMPLE 
[(s/c)s/c.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__s/c_src_index__._offsets EXPRESSION 
[(s/c)s/c.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), 
]
-POSTHOOK: Lineage: default__s/c_src_index__.key SIMPLE 
[(s/c)s/c.FieldSchema(name:key, type:string, comment:default), ]
-#### A masked pattern was here ####
-PREHOOK: type: QUERY
-PREHOOK: Input: default@default__s/c_src_index__
-#### A masked pattern was here ####
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__s/c_src_index__
-#### A masked pattern was here ####
 PREHOOK: query: EXPLAIN SELECT key, value FROM `s/c` WHERE key > 80 AND key < 
100
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT key, value FROM `s/c` WHERE key > 80 AND key < 
100
@@ -151,143 +126,3 @@ POSTHOOK: Input: default@s/c
 97     val_97
 98     val_98
 98     val_98
-PREHOOK: query: EXPLAIN SELECT key, value FROM `s/c` WHERE key > 80 AND key < 
100
-PREHOOK: type: QUERY
-POSTHOOK: query: EXPLAIN SELECT key, value FROM `s/c` WHERE key > 80 AND key < 
100
-POSTHOOK: type: QUERY
-STAGE DEPENDENCIES:
-  Stage-3 is a root stage
-  Stage-8 depends on stages: Stage-3 , consists of Stage-5, Stage-4, Stage-6
-  Stage-5
-  Stage-2 depends on stages: Stage-5, Stage-4, Stage-7
-  Stage-1 depends on stages: Stage-2
-  Stage-4
-  Stage-6
-  Stage-7 depends on stages: Stage-6
-  Stage-0 depends on stages: Stage-1
-
-STAGE PLANS:
-  Stage: Stage-3
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__s/c_src_index__
-            filterExpr: ((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 
100.0)) (type: boolean)
-            Filter Operator
-              predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) > 
80.0)) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-8
-    Conditional Operator
-
-  Stage: Stage-5
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-2
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-1
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: s/c
-            filterExpr: ((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 
100.0)) (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: ((UDFToDouble(key) < 100.0) and (UDFToDouble(key) > 
80.0)) (type: boolean)
-              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
-              Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
-                File Output Operator
-                  compressed: false
-                  Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
-                  table:
-                      input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-6
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            File Output Operator
-              compressed: false
-              table:
-                  input format: org.apache.hadoop.mapred.TextInputFormat
-                  output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-7
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-0
-    Fetch Operator
-      limit: -1
-      Processor Tree:
-        ListSink
-
-PREHOOK: query: SELECT key, value FROM `s/c` WHERE key > 80 AND key < 100
-PREHOOK: type: QUERY
-PREHOOK: Input: default@default__s/c_src_index__
-PREHOOK: Input: default@s/c
-#### A masked pattern was here ####
-POSTHOOK: query: SELECT key, value FROM `s/c` WHERE key > 80 AND key < 100
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__s/c_src_index__
-POSTHOOK: Input: default@s/c
-#### A masked pattern was here ####
-82     val_82
-83     val_83
-83     val_83
-84     val_84
-84     val_84
-85     val_85
-86     val_86
-87     val_87
-90     val_90
-90     val_90
-90     val_90
-92     val_92
-95     val_95
-95     val_95
-96     val_96
-97     val_97
-97     val_97
-98     val_98
-98     val_98
-PREHOOK: query: DROP INDEX src_index on `s/c`
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@s/c
-POSTHOOK: query: DROP INDEX src_index on `s/c`
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@s/c

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/unicode_comments.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/unicode_comments.q.out 
b/ql/src/test/results/clientpositive/unicode_comments.q.out
index 9a12c55..ae8c3e5 100644
--- a/ql/src/test/results/clientpositive/unicode_comments.q.out
+++ b/ql/src/test/results/clientpositive/unicode_comments.q.out
@@ -35,13 +35,6 @@ POSTHOOK: Input: unicode_comments_db@unicode_comments_tbl1
 POSTHOOK: Output: database:unicode_comments_db
 POSTHOOK: Output: unicode_comments_db@unicode_comments_view1
 POSTHOOK: Lineage: unicode_comments_view1.col1 SIMPLE 
[(unicode_comments_tbl1)unicode_comments_tbl1.FieldSchema(name:col1, 
type:string, comment:第一列), ]
-PREHOOK: query: create index index2 on table unicode_comments_tbl1(col1) as 
'COMPACT' with deferred rebuild comment '索引'
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: unicode_comments_db@unicode_comments_tbl1
-POSTHOOK: query: create index index2 on table unicode_comments_tbl1(col1) as 
'COMPACT' with deferred rebuild comment '索引'
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: unicode_comments_db@unicode_comments_tbl1
-POSTHOOK: Output: 
unicode_comments_db@unicode_comments_db__unicode_comments_tbl1_index2__
 PREHOOK: query: describe database extended unicode_comments_db
 PREHOOK: type: DESCDATABASE
 PREHOOK: Input: database:unicode_comments_db
@@ -147,23 +140,15 @@ Sort Columns:             []
 View Original Text:    select col1 from unicode_comments_tbl1   
 View Expanded Text:    SELECT `col1` AS `col1` FROM (select 
`unicode_comments_tbl1`.`col1` from 
`unicode_comments_db`.`unicode_comments_tbl1`) 
`unicode_comments_db.unicode_comments_view1`     
 View Rewrite Enabled:  No                       
-PREHOOK: query: show formatted index on unicode_comments_tbl1
-PREHOOK: type: SHOWINDEXES
-POSTHOOK: query: show formatted index on unicode_comments_tbl1
-POSTHOOK: type: SHOWINDEXES
-idx_name               tab_name                col_names               
idx_tab_name            idx_type                comment             
-index2                 unicode_comments_tbl1   col1                    
unicode_comments_db__unicode_comments_tbl1_index2__     compact                 
索引                  
 PREHOOK: query: drop database unicode_comments_db cascade
 PREHOOK: type: DROPDATABASE
 PREHOOK: Input: database:unicode_comments_db
 PREHOOK: Output: database:unicode_comments_db
-PREHOOK: Output: 
unicode_comments_db@unicode_comments_db__unicode_comments_tbl1_index2__
 PREHOOK: Output: unicode_comments_db@unicode_comments_tbl1
 PREHOOK: Output: unicode_comments_db@unicode_comments_view1
 POSTHOOK: query: drop database unicode_comments_db cascade
 POSTHOOK: type: DROPDATABASE
 POSTHOOK: Input: database:unicode_comments_db
 POSTHOOK: Output: database:unicode_comments_db
-POSTHOOK: Output: 
unicode_comments_db@unicode_comments_db__unicode_comments_tbl1_index2__
 POSTHOOK: Output: unicode_comments_db@unicode_comments_tbl1
 POSTHOOK: Output: unicode_comments_db@unicode_comments_view1

http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientpositive/union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/union_view.q.out 
b/ql/src/test/results/clientpositive/union_view.q.out
index 301f521..becad2c 100644
--- a/ql/src/test/results/clientpositive/union_view.q.out
+++ b/ql/src/test/results/clientpositive/union_view.q.out
@@ -6,13 +6,6 @@ POSTHOOK: query: CREATE TABLE src_union_1 (key int, value 
string) PARTITIONED BY
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_union_1
-PREHOOK: query: CREATE INDEX src_union_1_key_idx ON TABLE src_union_1(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src_union_1
-POSTHOOK: query: CREATE INDEX src_union_1_key_idx ON TABLE src_union_1(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src_union_1
-POSTHOOK: Output: default@default__src_union_1_src_union_1_key_idx__
 PREHOOK: query: CREATE TABLE src_union_2 (key int, value string) PARTITIONED 
BY (ds string, part_1 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -21,13 +14,6 @@ POSTHOOK: query: CREATE TABLE src_union_2 (key int, value 
string) PARTITIONED BY
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_union_2
-PREHOOK: query: CREATE INDEX src_union_2_key_idx ON TABLE src_union_2(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src_union_2
-POSTHOOK: query: CREATE INDEX src_union_2_key_idx ON TABLE src_union_2(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src_union_2
-POSTHOOK: Output: default@default__src_union_2_src_union_2_key_idx__
 PREHOOK: query: CREATE TABLE src_union_3(key int, value string) PARTITIONED BY 
(ds string, part_1 string, part_2 string)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -36,13 +22,6 @@ POSTHOOK: query: CREATE TABLE src_union_3(key int, value 
string) PARTITIONED BY
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@src_union_3
-PREHOOK: query: CREATE INDEX src_union_3_key_idx ON TABLE src_union_3(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src_union_3
-POSTHOOK: query: CREATE INDEX src_union_3_key_idx ON TABLE src_union_3(key) AS 
'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src_union_3
-POSTHOOK: Output: default@default__src_union_3_src_union_3_key_idx__
 STAGE DEPENDENCIES:
   Stage-0 is a root stage
 
@@ -145,36 +124,10 @@ STAGE PLANS:
 1000
 1000
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr: ((key = 86) and (ds = '1')) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -264,36 +217,10 @@ STAGE PLANS:
         ListSink
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr: ((key = 86) and (ds = '2')) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -383,36 +310,10 @@ STAGE PLANS:
         ListSink
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr: ((key = 86) and (ds = '3')) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -502,40 +403,10 @@ STAGE PLANS:
         ListSink
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4, Stage-6, Stage-8
-  Stage-7 is a root stage
-  Stage-6 depends on stages: Stage-7
-  Stage-9 is a root stage
-  Stage-8 depends on stages: Stage-9
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr: (key = 86) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -618,54 +489,6 @@ STAGE PLANS:
                           output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                           serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
-  Stage: Stage-7
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr: (key = 86) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-6
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
-  Stage: Stage-9
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr: (key = 86) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-8
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-0
     Fetch Operator
       limit: -1
@@ -683,34 +506,10 @@ STAGE PLANS:
 86     val_86  3
 86     val_86  3
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_1_src_union_1_key_idx__
-            filterExpr: (ds = '1') (type: boolean)
-            Select Operator
-              expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -804,34 +603,10 @@ STAGE PLANS:
         ListSink
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_2_src_union_2_key_idx__
-            filterExpr: (ds = '2') (type: boolean)
-            Select Operator
-              expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -925,34 +700,10 @@ STAGE PLANS:
         ListSink
 
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr: (ds = '3') (type: boolean)
-            Select Operator
-              expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -1049,36 +800,10 @@ STAGE PLANS:
 1000
 1000
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr: ((key = 86) and (ds = '4')) (type: boolean)
-            Filter Operator
-              predicate: (key = 86) (type: boolean)
-              Select Operator
-                expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-                outputColumnNames: _col0, _col1
-                File Output Operator
-                  compressed: false
-                  table:
-                      input format: org.apache.hadoop.mapred.TextInputFormat
-                      output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                      serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:
@@ -1169,34 +894,10 @@ STAGE PLANS:
 
 86     val_86  4
 STAGE DEPENDENCIES:
-  Stage-5 is a root stage
-  Stage-4 depends on stages: Stage-5
-  Stage-1 depends on stages: Stage-4
+  Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
 
 STAGE PLANS:
-  Stage: Stage-5
-    Map Reduce
-      Map Operator Tree:
-          TableScan
-            alias: default__src_union_3_src_union_3_key_idx__
-            filterExpr: (ds = '4') (type: boolean)
-            Select Operator
-              expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
-              outputColumnNames: _col0, _col1
-              File Output Operator
-                compressed: false
-                table:
-                    input format: org.apache.hadoop.mapred.TextInputFormat
-                    output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
-                    serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
-
-  Stage: Stage-4
-    Move Operator
-      files:
-          hdfs directory: true
-#### A masked pattern was here ####
-
   Stage: Stage-1
     Map Reduce
       Map Operator Tree:

Reply via email to