Author: jxiang Date: Fri Apr 3 15:20:37 2015 New Revision: 1671087 URL: http://svn.apache.org/r1671087 Log: HIVE-10108: Index#getIndexTableName() returns db.index_table_name
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java hive/trunk/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out hive/trunk/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out hive/trunk/ql/src/test/results/clientpositive/index_auth.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out hive/trunk/ql/src/test/results/clientpositive/index_auto_update.q.out hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out hive/trunk/ql/src/test/results/clientpositive/index_serde.q.out hive/trunk/ql/src/test/results/clientpositive/index_skewtable.q.out hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out hive/trunk/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out hive/trunk/ql/src/test/results/clientpositive/show_indexes_syntax.q.out hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx.q.out hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx_cbo_1.q.out hive/trunk/ql/src/test/results/clientpositive/union_view.q.out Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (original) +++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java Fri Apr 3 15:20:37 2015 @@ -3121,10 +3121,6 @@ public class ObjectStore implements RawS MTable origTable = mIndex.getOrigTable(); MTable indexTable = mIndex.getIndexTable(); - String[] qualified = MetaStoreUtils.getQualifiedName( - origTable.getDatabase().getName(), indexTable.getTableName()); - String indexTableName = qualified[0] + "." + qualified[1]; - return new Index( mIndex.getIndexName(), mIndex.getIndexHandlerClass(), @@ -3132,7 +3128,7 @@ public class ObjectStore implements RawS origTable.getTableName(), mIndex.getCreateTime(), mIndex.getLastAccessTime(), - indexTableName, + indexTable.getTableName(), convertToStorageDescriptor(mIndex.getSd()), mIndex.getParameters(), mIndex.getDeferredRebuild()); Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java Fri Apr 3 15:20:37 2015 @@ -132,6 +132,7 @@ import com.google.common.collect.Sets; * get methods in this class. */ +@SuppressWarnings({"deprecation", "rawtypes"}) public class Hive { static final private Log LOG = LogFactory.getLog("hive.ql.metadata.Hive"); @@ -759,6 +760,13 @@ public class Hive { throws HiveException { try { + String tdname = Utilities.getDatabaseName(tableName); + String idname = Utilities.getDatabaseName(indexTblName); + if (!idname.equals(tdname)) { + throw new HiveException("Index on different database (" + idname + + ") from base table (" + tdname + ") is not supported."); + } + Index old_index = null; try { old_index = getIndex(tableName, indexName); @@ -849,9 +857,8 @@ public class Hive { org.apache.hadoop.hive.metastore.api.Table tt = null; HiveIndexHandler indexHandler = HiveUtils.getIndexHandler(this.getConf(), indexHandlerClass); + String itname = Utilities.getTableName(indexTblName); if (indexHandler.usesIndexTable()) { - String idname = Utilities.getDatabaseName(indexTblName); - String itname = Utilities.getTableName(indexTblName); tt = new org.apache.hadoop.hive.ql.metadata.Table(idname, itname).getTTable(); List<FieldSchema> partKeys = baseTbl.getPartitionKeys(); tt.setPartitionKeys(partKeys); @@ -876,9 +883,6 @@ public class Hive { throw new RuntimeException("Please specify deferred rebuild using \" WITH DEFERRED REBUILD \"."); } - String tdname = Utilities.getDatabaseName(tableName); - String ttname = Utilities.getTableName(tableName); - StorageDescriptor indexSd = new StorageDescriptor( indexTblCols, location, @@ -891,7 +895,8 @@ public class Hive { sortCols, null/*parameters*/); - Index indexDesc = new Index(indexName, indexHandlerClass, tdname, ttname, time, time, indexTblName, + String ttname = Utilities.getTableName(tableName); + Index indexDesc = new Index(indexName, indexHandlerClass, tdname, ttname, time, time, itname, indexSd, new HashMap<String,String>(), deferredRebuild); if (indexComment != null) { indexDesc.getParameters().put("comment", indexComment); @@ -2813,7 +2818,6 @@ private void constructOneLBLocationMap(F List<List<Path[]>> result = checkPaths(conf, destFs, srcs, srcFs, destf, true); - HadoopShims shims = ShimLoader.getHadoopShims(); if (oldPath != null) { try { FileSystem fs2 = oldPath.getFileSystem(conf); Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java (original) +++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java Fri Apr 3 15:20:37 2015 @@ -704,7 +704,7 @@ public class TestHive extends TestCase { index.getIndexName()); assertEquals("Table names don't match for index: " + indexName, tableName, index.getOrigTableName()); - assertEquals("Index table names didn't match for index: " + indexName, qIndexTableName, + assertEquals("Index table names didn't match for index: " + indexName, indexTableName, index.getIndexTableName()); assertEquals("Index handler classes didn't match for index: " + indexName, indexHandlerClass, index.getIndexHandlerClass()); Modified: hive/trunk/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out (original) +++ hive/trunk/ql/src/test/results/clientnegative/alter_concatenate_indexed_table.q.out Fri Apr 3 15:20:37 2015 @@ -76,5 +76,5 @@ PREHOOK: query: show indexes on src_rc_c PREHOOK: type: SHOWINDEXES POSTHOOK: query: show indexes on src_rc_concatenate_test POSTHOOK: type: SHOWINDEXES -src_rc_concatenate_test_index src_rc_concatenate_test key default.default__src_rc_concatenate_test_src_rc_concatenate_test_index__ compact +src_rc_concatenate_test_index src_rc_concatenate_test key default__src_rc_concatenate_test_src_rc_concatenate_test_index__ compact FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: can not do merge because source table default.src_rc_concatenate_test is indexed. Modified: hive/trunk/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/alter_concatenate_indexed_table.q.out Fri Apr 3 15:20:37 2015 @@ -76,7 +76,7 @@ PREHOOK: query: show indexes on src_rc_c PREHOOK: type: SHOWINDEXES POSTHOOK: query: show indexes on src_rc_concatenate_test POSTHOOK: type: SHOWINDEXES -src_rc_concatenate_test_index src_rc_concatenate_test key default.default__src_rc_concatenate_test_src_rc_concatenate_test_index__ compact +src_rc_concatenate_test_index src_rc_concatenate_test key default__src_rc_concatenate_test_src_rc_concatenate_test_index__ compact PREHOOK: query: alter table src_rc_concatenate_test concatenate PREHOOK: type: ALTER_TABLE_MERGE PREHOOK: Input: default@src_rc_concatenate_test @@ -215,7 +215,7 @@ PREHOOK: query: show indexes on src_rc_c PREHOOK: type: SHOWINDEXES POSTHOOK: query: show indexes on src_rc_concatenate_test_part POSTHOOK: type: SHOWINDEXES -src_rc_concatenate_test_part_index src_rc_concatenate_test_part key default.default__src_rc_concatenate_test_part_src_rc_concatenate_test_part_index__ compact +src_rc_concatenate_test_part_index src_rc_concatenate_test_part key default__src_rc_concatenate_test_part_src_rc_concatenate_test_part_index__ compact PREHOOK: query: alter table src_rc_concatenate_test_part partition (ds='2011') concatenate PREHOOK: type: ALTER_PARTITION_MERGE PREHOOK: Input: default@src_rc_concatenate_test_part Modified: hive/trunk/ql/src/test/results/clientpositive/index_auth.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auth.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auth.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auth.q.out Fri Apr 3 15:20:37 2015 @@ -24,7 +24,7 @@ PREHOOK: query: SHOW INDEXES ON foobar PREHOOK: type: SHOWINDEXES POSTHOOK: query: SHOW INDEXES ON foobar POSTHOOK: type: SHOWINDEXES -srcpart_auth_index foobar key default.default__foobar_srcpart_auth_index__ bitmap +srcpart_auth_index foobar key default__foobar_srcpart_auth_index__ bitmap PREHOOK: query: grant select on table foobar to user hive_test_user PREHOOK: type: GRANT_PRIVILEGE PREHOOK: Output: default@foobar Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out Fri Apr 3 15:20:37 2015 @@ -146,7 +146,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ filterExpr: ((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean) Filter Operator predicate: ((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out Fri Apr 3 15:20:37 2015 @@ -40,7 +40,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ filterExpr: (UDFToDouble(key) = 86.0) (type: boolean) Filter Operator predicate: (UDFToDouble(key) = 86.0) (type: boolean) @@ -156,7 +156,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ filterExpr: (UDFToDouble(key) = 86.0) (type: boolean) Filter Operator predicate: (UDFToDouble(key) = 86.0) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out Fri Apr 3 15:20:37 2015 @@ -211,7 +211,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__srcpart_srcpart_index__ + alias: default__srcpart_srcpart_index__ 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) @@ -308,7 +308,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ 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) Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out Fri Apr 3 15:20:37 2015 @@ -221,7 +221,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__srcpart_srcpart_index__ + alias: default__srcpart_srcpart_index__ 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) @@ -339,7 +339,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ 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) Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out Fri Apr 3 15:20:37 2015 @@ -60,7 +60,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_key_index__ + alias: default__src_src_key_index__ filterExpr: (UDFToDouble(key) = 86.0) (type: boolean) Filter Operator predicate: (UDFToDouble(key) = 86.0) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out Fri Apr 3 15:20:37 2015 @@ -54,7 +54,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__srcpart_src_part_index__ + alias: default__srcpart_src_part_index__ filterExpr: ((UDFToDouble(key) = 86.0) and (ds = '2008-04-09')) (type: boolean) Filter Operator predicate: (UDFToDouble(key) = 86.0) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out Fri Apr 3 15:20:37 2015 @@ -131,7 +131,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ filterExpr: (((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) @@ -229,7 +229,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ filterExpr: (((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((UDFToDouble(key) > 70.0) and (UDFToDouble(key) < 90.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_auto_update.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_update.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_auto_update.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_auto_update.q.out Fri Apr 3 15:20:37 2015 @@ -219,7 +219,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__temp_temp_index__ + alias: default__temp_temp_index__ filterExpr: (UDFToDouble(key) = 86.0) (type: boolean) Filter Operator predicate: (UDFToDouble(key) = 86.0) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out Fri Apr 3 15:20:37 2015 @@ -52,7 +52,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__srcpart_src_part_index__ + alias: default__srcpart_src_part_index__ filterExpr: ((UDFToDouble(key) = 86.0) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: ((UDFToDouble(key) = 86.0) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out Fri Apr 3 15:20:37 2015 @@ -38,7 +38,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ filterExpr: (((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Filter Operator predicate: (((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out Fri Apr 3 15:20:37 2015 @@ -42,7 +42,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_src_index__ + alias: default__src_src_index__ filterExpr: ((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean) Filter Operator predicate: ((UDFToDouble(key) > 80.0) and (UDFToDouble(key) < 100.0)) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_serde.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_serde.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_serde.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_serde.q.out Fri Apr 3 15:20:37 2015 @@ -134,7 +134,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__doctors_doctors_index__ + alias: default__doctors_doctors_index__ filterExpr: (number > 6) (type: boolean) Filter Operator predicate: (number > 6) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/index_skewtable.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_skewtable.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/index_skewtable.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/index_skewtable.q.out Fri Apr 3 15:20:37 2015 @@ -92,7 +92,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__kv_kv_index__ + alias: default__kv_kv_index__ filterExpr: (value > '15') (type: boolean) Filter Operator predicate: (value > '15') (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out Fri Apr 3 15:20:37 2015 @@ -253,7 +253,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -572,7 +572,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -746,7 +746,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: lastyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: lastyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1997) (type: boolean) @@ -830,7 +830,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: thisyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: thisyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1998) (type: boolean) @@ -900,7 +900,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: null-subquery1:dummy-subquery1:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: null-subquery1:dummy-subquery1:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -1063,7 +1063,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -1161,7 +1161,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -2252,7 +2252,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__tblpart_tbl_part_index__ + alias: default__tblpart_tbl_part_index__ Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key < 10) (type: boolean) @@ -2445,7 +2445,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 6 Data size: 430 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) Modified: hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_1.q.out Fri Apr 3 15:20:37 2015 @@ -253,7 +253,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: $hdt$_0:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -572,7 +572,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: $hdt$_0:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: year(l_shipdate) (type: int), month(l_shipdate) (type: int), l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -746,7 +746,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: lastyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: lastyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1997) (type: boolean) @@ -830,7 +830,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: thisyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: thisyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1998) (type: boolean) @@ -900,7 +900,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: null-subquery1:$hdt$_0-subquery1:$hdt$_0:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: null-subquery1:$hdt$_0-subquery1:$hdt$_0:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -1063,7 +1063,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__tbl_tbl_key_idx__ + alias: $hdt$_0:default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -1161,7 +1161,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__tbl_tbl_key_idx__ + alias: $hdt$_0:default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -2260,7 +2260,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__tblpart_tbl_part_index__ + alias: $hdt$_0:default__tblpart_tbl_part_index__ Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key < 10) (type: boolean) @@ -2453,7 +2453,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__tbl_tbl_key_idx__ + alias: $hdt$_0:default__tbl_tbl_key_idx__ Statistics: Num rows: 6 Data size: 430 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) Modified: hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx_cbo_2.q.out Fri Apr 3 15:20:37 2015 @@ -176,7 +176,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), _count_of_l_orderkey (type: bigint) @@ -1223,7 +1223,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), _count_of_l_orderkey (type: bigint) @@ -1907,7 +1907,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:$hdt$_0:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_orderkey < 7) (type: boolean) @@ -2072,7 +2072,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: taba:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: taba:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_orderkey < 7) (type: boolean) @@ -2148,7 +2148,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: tabb:default.default__src_src_key_idx__ + alias: tabb:default__src_src_key_idx__ Statistics: Num rows: 309 Data size: 23663 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: string), _count_of_key (type: bigint) @@ -2814,7 +2814,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: taba:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: taba:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_orderkey < 7) (type: boolean) @@ -2890,7 +2890,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: tabb:default.default__src_src_key_idx__ + alias: tabb:default__src_src_key_idx__ Statistics: Num rows: 309 Data size: 23663 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key < '2') (type: boolean) @@ -3192,7 +3192,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_orderkey (type: int), (l_orderkey + 1) (type: int), _count_of_l_orderkey (type: bigint) @@ -3282,7 +3282,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: (l_orderkey + 2) (type: int), l_orderkey (type: int), _count_of_l_orderkey (type: bigint) @@ -3404,7 +3404,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_orderkey_idx__ + alias: $hdt$_0-subquery1:$hdt$_0-subquery1:$hdt$_0:default__lineitem_ix_lineitem_ix_l_orderkey_idx__ Statistics: Num rows: 26 Data size: 2604 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_orderkey < 7) (type: boolean) @@ -3495,7 +3495,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: $hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:default.default__lineitem_ix_lineitem_ix_l_partkey_idx__ + alias: $hdt$_0-subquery2:$hdt$_0-subquery2:$hdt$_0:default__lineitem_ix_lineitem_ix_l_partkey_idx__ Statistics: Num rows: 100 Data size: 8937 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (l_partkey < 10) (type: boolean) Modified: hive/trunk/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/show_indexes_edge_cases.q.out Fri Apr 3 15:20:37 2015 @@ -118,10 +118,10 @@ PREHOOK: query: SHOW INDEXES ON show_idx PREHOOK: type: SHOWINDEXES POSTHOOK: query: SHOW INDEXES ON show_idx_full POSTHOOK: type: SHOWINDEXES -idx_1 show_idx_full key default.default__show_idx_full_idx_1__ compact -idx_2 show_idx_full value1 default.default__show_idx_full_idx_2__ compact -idx_comment show_idx_full value2 default.default__show_idx_full_idx_comment__ compact index comment -idx_compound show_idx_full key, value1 default.default__show_idx_full_idx_compound__ compact +idx_1 show_idx_full key default__show_idx_full_idx_1__ compact +idx_2 show_idx_full value1 default__show_idx_full_idx_2__ compact +idx_comment show_idx_full value2 default__show_idx_full_idx_comment__ compact index comment +idx_compound show_idx_full key, value1 default__show_idx_full_idx_compound__ compact PREHOOK: query: EXPLAIN SHOW INDEXES ON show_idx_empty PREHOOK: type: SHOWINDEXES POSTHOOK: query: EXPLAIN SHOW INDEXES ON show_idx_empty Modified: hive/trunk/ql/src/test/results/clientpositive/show_indexes_syntax.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/show_indexes_syntax.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/show_indexes_syntax.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/show_indexes_syntax.q.out Fri Apr 3 15:20:37 2015 @@ -53,7 +53,7 @@ PREHOOK: query: SHOW INDEX ON show_idx_t PREHOOK: type: SHOWINDEXES POSTHOOK: query: SHOW INDEX ON show_idx_t1 POSTHOOK: type: SHOWINDEXES -idx_t1 show_idx_t1 key default.default__show_idx_t1_idx_t1__ compact +idx_t1 show_idx_t1 key default__show_idx_t1_idx_t1__ compact PREHOOK: query: EXPLAIN SHOW INDEXES ON show_idx_t1 PREHOOK: type: SHOWINDEXES @@ -79,7 +79,7 @@ PREHOOK: query: SHOW INDEXES ON show_idx PREHOOK: type: SHOWINDEXES POSTHOOK: query: SHOW INDEXES ON show_idx_t1 POSTHOOK: type: SHOWINDEXES -idx_t1 show_idx_t1 key default.default__show_idx_t1_idx_t1__ compact +idx_t1 show_idx_t1 key default__show_idx_t1_idx_t1__ compact PREHOOK: query: EXPLAIN SHOW FORMATTED INDEXES ON show_idx_t1 PREHOOK: type: SHOWINDEXES @@ -108,7 +108,7 @@ POSTHOOK: type: SHOWINDEXES idx_name tab_name col_names idx_tab_name idx_type comment -idx_t1 show_idx_t1 key default.default__show_idx_t1_idx_t1__ compact +idx_t1 show_idx_t1 key default__show_idx_t1_idx_t1__ compact PREHOOK: query: DROP TABLE show_idx_t1 PREHOOK: type: DROPTABLE PREHOOK: Input: default@show_idx_t1 Modified: hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx.q.out Fri Apr 3 15:20:37 2015 @@ -264,7 +264,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -585,7 +585,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -755,7 +755,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: lastyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: lastyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1997) (type: boolean) @@ -782,7 +782,7 @@ STAGE PLANS: Map 4 Map Operator Tree: TableScan - alias: thisyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: thisyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1998) (type: boolean) @@ -909,7 +909,7 @@ STAGE PLANS: Map 2 Map Operator Tree: TableScan - alias: null-subquery1:dummy-subquery1:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: null-subquery1:dummy-subquery1:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -1053,7 +1053,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -1163,7 +1163,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -2368,7 +2368,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tblpart_tbl_part_index__ + alias: default__tblpart_tbl_part_index__ Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key < 10) (type: boolean) @@ -2563,7 +2563,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 6 Data size: 430 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) Modified: hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx_cbo_1.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx_cbo_1.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx_cbo_1.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/spark/ql_rewrite_gbtoidx_cbo_1.q.out Fri Apr 3 15:20:37 2015 @@ -264,7 +264,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -585,7 +585,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -755,7 +755,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: lastyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: lastyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1997) (type: boolean) @@ -782,7 +782,7 @@ STAGE PLANS: Map 4 Map Operator Tree: TableScan - alias: thisyear:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: thisyear:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (year(l_shipdate) = 1998) (type: boolean) @@ -909,7 +909,7 @@ STAGE PLANS: Map 2 Map Operator Tree: TableScan - alias: null-subquery1:dummy-subquery1:default.default__lineitem_ix_lineitem_ix_lshipdate_idx__ + alias: null-subquery1:dummy-subquery1:default__lineitem_ix_lineitem_ix_lshipdate_idx__ Statistics: Num rows: 95 Data size: 8960 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: l_shipdate (type: string), _count_of_l_shipdate (type: bigint) @@ -1053,7 +1053,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -1163,7 +1163,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) @@ -2368,7 +2368,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tblpart_tbl_part_index__ + alias: default__tblpart_tbl_part_index__ Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key < 10) (type: boolean) @@ -2563,7 +2563,7 @@ STAGE PLANS: Map 1 Map Operator Tree: TableScan - alias: default.default__tbl_tbl_key_idx__ + alias: default__tbl_tbl_key_idx__ Statistics: Num rows: 6 Data size: 430 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: key (type: int), _count_of_key (type: bigint) Modified: hive/trunk/ql/src/test/results/clientpositive/union_view.q.out URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union_view.q.out?rev=1671087&r1=1671086&r2=1671087&view=diff ============================================================================== --- hive/trunk/ql/src/test/results/clientpositive/union_view.q.out (original) +++ hive/trunk/ql/src/test/results/clientpositive/union_view.q.out Fri Apr 3 15:20:37 2015 @@ -54,7 +54,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_1_src_union_1_key_idx__ + 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) @@ -113,7 +113,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_2_src_union_2_key_idx__ + 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) @@ -172,7 +172,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_3_src_union_3_key_idx__ + 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) @@ -236,7 +236,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_1_src_union_1_key_idx__ + 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>) @@ -303,7 +303,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_2_src_union_2_key_idx__ + 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>) @@ -370,7 +370,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_3_src_union_3_key_idx__ + 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>) @@ -440,7 +440,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_1_src_union_1_key_idx__ + 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) @@ -505,7 +505,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_2_src_union_2_key_idx__ + 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) @@ -570,7 +570,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_3_src_union_3_key_idx__ + 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) @@ -639,7 +639,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_1_src_union_1_key_idx__ + alias: default__src_union_1_src_union_1_key_idx__ filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) @@ -745,7 +745,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_2_src_union_2_key_idx__ + alias: default__src_union_2_src_union_2_key_idx__ filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) @@ -769,7 +769,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_3_src_union_3_key_idx__ + alias: default__src_union_3_src_union_3_key_idx__ filterExpr: (key = 86) (type: boolean) Filter Operator predicate: (key = 86) (type: boolean) @@ -816,7 +816,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_1_src_union_1_key_idx__ + 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>) @@ -887,7 +887,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_2_src_union_2_key_idx__ + 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>) @@ -958,7 +958,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_3_src_union_3_key_idx__ + 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>) @@ -1032,7 +1032,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_3_src_union_3_key_idx__ + 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) @@ -1098,7 +1098,7 @@ STAGE PLANS: Map Reduce Map Operator Tree: TableScan - alias: default.default__src_union_3_src_union_3_key_idx__ + 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>)