You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/12/07 19:35:05 UTC

hive git commit: HIVE-12600 : Make index tests more robust (Ashutosh Chauhan via Gunther Hagleitner)

Repository: hive
Updated Branches:
  refs/heads/master 84d747a2e -> cd46746ae


HIVE-12600 : Make index tests more robust (Ashutosh Chauhan via Gunther Hagleitner)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/cd46746a
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/cd46746a
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/cd46746a

Branch: refs/heads/master
Commit: cd46746ae2c21ed301570c89adf58dcaea95cc12
Parents: 84d747a
Author: Ashutosh Chauhan <ha...@apache.org>
Authored: Mon Dec 7 10:34:25 2015 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Mon Dec 7 10:34:25 2015 -0800

----------------------------------------------------------------------
 .../clientpositive/index_auto_mult_tables.q     |  12 +-
 .../index_auto_mult_tables_compact.q            |  12 +-
 .../queries/clientpositive/index_auto_update.q  |   2 +
 .../test/queries/clientpositive/index_in_db.q   |   3 +
 .../test/queries/clientpositive/index_stale.q   |   1 +
 .../clientpositive/index_stale_partitioned.q    |   1 +
 .../clientpositive/index_auto_mult_tables.q.out | 116 +++++++++----------
 .../index_auto_mult_tables_compact.q.out        | 106 ++++++++---------
 .../clientpositive/index_auto_update.q.out      |   6 +
 .../results/clientpositive/index_in_db.q.out    |  12 ++
 .../results/clientpositive/index_stale.q.out    |   6 +
 .../index_stale_partitioned.q.out               |   6 +
 12 files changed, 160 insertions(+), 123 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_mult_tables.q b/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
index 8bc3fdd..823e373 100644
--- a/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
+++ b/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
@@ -8,11 +8,11 @@ SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key >
 
 set hive.stats.dbclass=fs;
 
-CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
+CREATE INDEX src_index_bitmap ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
+ALTER INDEX src_index_bitmap ON src REBUILD;
 
-CREATE INDEX srcpart_index ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index ON srcpart REBUILD;
+CREATE INDEX srcpart_index_bitmap ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
+ALTER INDEX srcpart_index_bitmap ON srcpart REBUILD;
 
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.index.filter=true;
@@ -21,5 +21,5 @@ SET hive.optimize.index.filter.compact.minsize=0;
 EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
 SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
 
-DROP INDEX src_index on src;
-DROP INDEX srcpart_index on src;
+DROP INDEX src_index_bitmap on src;
+DROP INDEX srcpart_index_bitmap on src;

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q b/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
index 44ee92c..fbb8720 100644
--- a/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
+++ b/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
@@ -8,11 +8,11 @@ SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key >
 
 set hive.stats.dbclass=fs;
 
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
+CREATE INDEX src_index_compact ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
+ALTER INDEX src_index_compact ON src REBUILD;
 
-CREATE INDEX srcpart_index ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index ON srcpart REBUILD;
+CREATE INDEX srcpart_index_compact ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
+ALTER INDEX srcpart_index_compact ON srcpart REBUILD;
 
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.index.filter=true;
@@ -22,5 +22,5 @@ SET hive.optimize.index.filter.compact.minsize=0;
 EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
 SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
 
-DROP INDEX src_index on src;
-DROP INDEX srcpart_index on src;
+DROP INDEX src_index_compact on src;
+DROP INDEX srcpart_index_compact on src;

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/queries/clientpositive/index_auto_update.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_update.q b/ql/src/test/queries/clientpositive/index_auto_update.q
index a5454e2..b184080 100644
--- a/ql/src/test/queries/clientpositive/index_auto_update.q
+++ b/ql/src/test/queries/clientpositive/index_auto_update.q
@@ -24,4 +24,6 @@ SELECT * FROM temp WHERE key  = 86;
 
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.index.filter=false;
+drop index temp_index on temp;
 DROP table temp;
+

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/queries/clientpositive/index_in_db.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_in_db.q b/ql/src/test/queries/clientpositive/index_in_db.q
index 253870c..1c34781 100644
--- a/ql/src/test/queries/clientpositive/index_in_db.q
+++ b/ql/src/test/queries/clientpositive/index_in_db.q
@@ -11,3 +11,6 @@ create index id_index on table testtb (id) as 'COMPACT' WITH DEFERRED REBUILD  i
 
 use default;
 select * from index_test_db.testtb where id>2;
+
+use index_test_db;
+drop index id_index on testtb;

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/queries/clientpositive/index_stale.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_stale.q b/ql/src/test/queries/clientpositive/index_stale.q
index 488413c..6daba83 100644
--- a/ql/src/test/queries/clientpositive/index_stale.q
+++ b/ql/src/test/queries/clientpositive/index_stale.q
@@ -19,4 +19,5 @@ INSERT OVERWRITE TABLE temp SELECT * FROM src;
 -- should return correct results bypassing index
 EXPLAIN SELECT * FROM temp WHERE key  = 86;
 SELECT * FROM temp WHERE key  = 86;
+DROP index temp_index on temp;
 DROP table temp;

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/queries/clientpositive/index_stale_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_stale_partitioned.q b/ql/src/test/queries/clientpositive/index_stale_partitioned.q
index 74411b0..630b415 100644
--- a/ql/src/test/queries/clientpositive/index_stale_partitioned.q
+++ b/ql/src/test/queries/clientpositive/index_stale_partitioned.q
@@ -25,4 +25,5 @@ SELECT * FROM temp WHERE key  = 86 AND foo = 'bar';
 
 SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
 SET hive.optimize.index.filter=false;
+DROP index temp_index on temp;
 DROP table temp;

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out b/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
index 14e2505..d86998e 100644
--- a/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
+++ b/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
@@ -138,70 +138,70 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 87	val_87
 87	val_87
 87	val_87
-PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
+PREHOOK: query: CREATE INDEX src_index_bitmap ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
+POSTHOOK: query: CREATE INDEX src_index_bitmap ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-PREHOOK: query: ALTER INDEX src_index ON src REBUILD
+POSTHOOK: Output: default@default__src_src_index_bitmap__
+PREHOOK: query: ALTER INDEX src_index_bitmap ON src REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
 PREHOOK: Input: default@src
-PREHOOK: Output: default@default__src_src_index__
-POSTHOOK: query: ALTER INDEX src_index ON src REBUILD
+PREHOOK: Output: default@default__src_src_index_bitmap__
+POSTHOOK: query: ALTER INDEX src_index_bitmap ON src REBUILD
 POSTHOOK: type: ALTERINDEX_REBUILD
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-POSTHOOK: Lineage: default__src_src_index__._bitmaps EXPRESSION [(src)src.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: CREATE INDEX srcpart_index ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD
+POSTHOOK: Output: default@default__src_src_index_bitmap__
+POSTHOOK: Lineage: default__src_src_index_bitmap__._bitmaps EXPRESSION [(src)src.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__src_src_index_bitmap__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__src_src_index_bitmap__._offset SIMPLE [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__src_src_index_bitmap__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+PREHOOK: query: CREATE INDEX srcpart_index_bitmap ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
 PREHOOK: Input: default@srcpart
-POSTHOOK: query: CREATE INDEX srcpart_index ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD
+POSTHOOK: query: CREATE INDEX srcpart_index_bitmap ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Input: default@srcpart
-POSTHOOK: Output: default@default__srcpart_srcpart_index__
-PREHOOK: query: ALTER INDEX srcpart_index ON srcpart REBUILD
+POSTHOOK: Output: default@default__srcpart_srcpart_index_bitmap__
+PREHOOK: query: ALTER INDEX srcpart_index_bitmap ON srcpart REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
-POSTHOOK: query: ALTER INDEX srcpart_index ON srcpart REBUILD
+PREHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=11
+PREHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=12
+PREHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=11
+PREHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=12
+POSTHOOK: query: ALTER INDEX srcpart_index_bitmap ON srcpart REBUILD
 POSTHOOK: type: ALTERINDEX_REBUILD
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=11)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=11)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=12)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=12)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=11)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=11)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=12)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=12)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=12
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=11)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=11)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=12)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=12)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=11)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=11)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=12)._bitmaps EXPRESSION [(srcpart)srcpart.FieldSchema(name:ROW__OFFSET__INSIDE__BLOCK, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=12)._offset SIMPLE [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_bitmap__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
@@ -219,7 +219,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default__src_src_index__
+            alias: default__src_src_index_bitmap__
             filterExpr: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) > 70.0)) and (UDFToDouble(key) < 90.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
             Filter Operator
               predicate: (((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) > 70.0)) and (UDFToDouble(key) < 90.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
@@ -312,7 +312,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default__srcpart_srcpart_index__
+            alias: default__srcpart_srcpart_index_bitmap__
             filterExpr: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
             Filter Operator
               predicate: (((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
@@ -356,12 +356,12 @@ STAGE PLANS:
 
 PREHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
-PREHOOK: Input: default@default__src_src_index__
-PREHOOK: Input: default@default__srcpart_srcpart_index__
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
+PREHOOK: Input: default@default__src_src_index_bitmap__
+PREHOOK: Input: default@default__srcpart_srcpart_index_bitmap__
+PREHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=11
+PREHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=12
+PREHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=11
+PREHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=12
 PREHOOK: Input: default@src
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -371,12 +371,12 @@ PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__src_src_index__
-POSTHOOK: Input: default@default__srcpart_srcpart_index__
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
+POSTHOOK: Input: default@default__src_src_index_bitmap__
+POSTHOOK: Input: default@default__srcpart_srcpart_index_bitmap__
+POSTHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@default__srcpart_srcpart_index_bitmap__@ds=2008-04-09/hr=12
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -432,15 +432,15 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 87	val_87
 87	val_87
 87	val_87
-PREHOOK: query: DROP INDEX src_index on src
+PREHOOK: query: DROP INDEX src_index_bitmap on src
 PREHOOK: type: DROPINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: DROP INDEX src_index on src
+POSTHOOK: query: DROP INDEX src_index_bitmap on src
 POSTHOOK: type: DROPINDEX
 POSTHOOK: Input: default@src
-PREHOOK: query: DROP INDEX srcpart_index on src
+PREHOOK: query: DROP INDEX srcpart_index_bitmap on src
 PREHOOK: type: DROPINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: DROP INDEX srcpart_index on src
+POSTHOOK: query: DROP INDEX srcpart_index_bitmap on src
 POSTHOOK: type: DROPINDEX
 POSTHOOK: Input: default@src

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out b/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
index c39c272..409fa46 100644
--- a/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
+++ b/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
@@ -138,65 +138,65 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 87	val_87
 87	val_87
 87	val_87
-PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
+PREHOOK: query: CREATE INDEX src_index_compact ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
+POSTHOOK: query: CREATE INDEX src_index_compact ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-PREHOOK: query: ALTER INDEX src_index ON src REBUILD
+POSTHOOK: Output: default@default__src_src_index_compact__
+PREHOOK: query: ALTER INDEX src_index_compact ON src REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
 PREHOOK: Input: default@src
-PREHOOK: Output: default@default__src_src_index__
-POSTHOOK: query: ALTER INDEX src_index ON src REBUILD
+PREHOOK: Output: default@default__src_src_index_compact__
+POSTHOOK: query: ALTER INDEX src_index_compact ON src REBUILD
 POSTHOOK: type: ALTERINDEX_REBUILD
 POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-POSTHOOK: Lineage: default__src_src_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-PREHOOK: query: CREATE INDEX srcpart_index ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD
+POSTHOOK: Output: default@default__src_src_index_compact__
+POSTHOOK: Lineage: default__src_src_index_compact__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__src_src_index_compact__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__src_src_index_compact__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
+PREHOOK: query: CREATE INDEX srcpart_index_compact ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD
 PREHOOK: type: CREATEINDEX
 PREHOOK: Input: default@srcpart
-POSTHOOK: query: CREATE INDEX srcpart_index ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD
+POSTHOOK: query: CREATE INDEX srcpart_index_compact ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD
 POSTHOOK: type: CREATEINDEX
 POSTHOOK: Input: default@srcpart
-POSTHOOK: Output: default@default__srcpart_srcpart_index__
-PREHOOK: query: ALTER INDEX srcpart_index ON srcpart REBUILD
+POSTHOOK: Output: default@default__srcpart_srcpart_index_compact__
+PREHOOK: query: ALTER INDEX srcpart_index_compact ON srcpart REBUILD
 PREHOOK: type: ALTERINDEX_REBUILD
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-PREHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
-POSTHOOK: query: ALTER INDEX srcpart_index ON srcpart REBUILD
+PREHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=11
+PREHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=12
+PREHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=11
+PREHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=12
+POSTHOOK: query: ALTER INDEX srcpart_index_compact ON srcpart REBUILD
 POSTHOOK: type: ALTERINDEX_REBUILD
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-POSTHOOK: Output: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=11)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=12)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=11)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=12)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__srcpart_srcpart_index__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=11
+POSTHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=12
+POSTHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=11
+POSTHOOK: Output: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=12
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-08,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-08,hr=11)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-08,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-08,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-08,hr=12)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-08,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-09,hr=11)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-09,hr=11)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-09,hr=11).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-09,hr=12)._bucketname SIMPLE [(srcpart)srcpart.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-09,hr=12)._offsets EXPRESSION [(srcpart)srcpart.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
+POSTHOOK: Lineage: default__srcpart_srcpart_index_compact__ PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 PREHOOK: query: -- automatic indexing
 EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
@@ -226,7 +226,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default__src_src_index__
+            alias: default__src_src_index_compact__
             filterExpr: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) > 70.0)) and (UDFToDouble(key) < 90.0)) (type: boolean)
             Filter Operator
               predicate: ((((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (UDFToDouble(key) > 70.0)) and (UDFToDouble(key) < 90.0)) (type: boolean)
@@ -340,7 +340,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default__srcpart_srcpart_index__
+            alias: default__srcpart_srcpart_index_compact__
             filterExpr: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
             Filter Operator
               predicate: ((((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (UDFToDouble(key) > 80.0)) and (UDFToDouble(key) < 100.0)) (type: boolean)
@@ -405,12 +405,12 @@ STAGE PLANS:
 
 PREHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 PREHOOK: type: QUERY
-PREHOOK: Input: default@default__src_src_index__
-PREHOOK: Input: default@default__srcpart_srcpart_index__
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-PREHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
+PREHOOK: Input: default@default__src_src_index_compact__
+PREHOOK: Input: default@default__srcpart_srcpart_index_compact__
+PREHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=11
+PREHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=12
+PREHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=11
+PREHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=12
 PREHOOK: Input: default@src
 PREHOOK: Input: default@srcpart
 PREHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -420,12 +420,12 @@ PREHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__src_src_index__
-POSTHOOK: Input: default@default__srcpart_srcpart_index__
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=11
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-08/hr=12
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=11
-POSTHOOK: Input: default@default__srcpart_srcpart_index__@ds=2008-04-09/hr=12
+POSTHOOK: Input: default@default__src_src_index_compact__
+POSTHOOK: Input: default@default__srcpart_srcpart_index_compact__
+POSTHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=11
+POSTHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-08/hr=12
+POSTHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=11
+POSTHOOK: Input: default@default__srcpart_srcpart_index_compact__@ds=2008-04-09/hr=12
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@srcpart
 POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=11
@@ -481,15 +481,15 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 87	val_87
 87	val_87
 87	val_87
-PREHOOK: query: DROP INDEX src_index on src
+PREHOOK: query: DROP INDEX src_index_compact on src
 PREHOOK: type: DROPINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: DROP INDEX src_index on src
+POSTHOOK: query: DROP INDEX src_index_compact on src
 POSTHOOK: type: DROPINDEX
 POSTHOOK: Input: default@src
-PREHOOK: query: DROP INDEX srcpart_index on src
+PREHOOK: query: DROP INDEX srcpart_index_compact on src
 PREHOOK: type: DROPINDEX
 PREHOOK: Input: default@src
-POSTHOOK: query: DROP INDEX srcpart_index on src
+POSTHOOK: query: DROP INDEX srcpart_index_compact on src
 POSTHOOK: type: DROPINDEX
 POSTHOOK: Input: default@src

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/ql/src/test/results/clientpositive/index_auto_update.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/index_auto_update.q.out b/ql/src/test/results/clientpositive/index_auto_update.q.out
index c85c80f..ba27691 100644
--- a/ql/src/test/results/clientpositive/index_auto_update.q.out
+++ b/ql/src/test/results/clientpositive/index_auto_update.q.out
@@ -317,6 +317,12 @@ POSTHOOK: Input: default@default__temp_temp_index__
 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

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/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
index 91af7ba..5fb8c5b 100644
--- a/ql/src/test/results/clientpositive/index_in_db.q.out
+++ b/ql/src/test/results/clientpositive/index_in_db.q.out
@@ -49,3 +49,15 @@ 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/cd46746a/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
index b8bcfd7..9733930 100644
--- a/ql/src/test/results/clientpositive/index_stale.q.out
+++ b/ql/src/test/results/clientpositive/index_stale.q.out
@@ -100,6 +100,12 @@ 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

http://git-wip-us.apache.org/repos/asf/hive/blob/cd46746a/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
index c9ecdb2..f55cf9d 100644
--- a/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
@@ -111,6 +111,12 @@ 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