diff --git a/hbase-handler/src/test/results/positive/external_table_ppd.q.out b/hbase-handler/src/test/results/positive/external_table_ppd.q.out index cdc43ee560..b59dfd7cd7 100644 --- a/hbase-handler/src/test/results/positive/external_table_ppd.q.out +++ b/hbase-handler/src/test/results/positive/external_table_ppd.q.out @@ -56,6 +56,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"bigint_col\":\"true\",\"boolean_col\":\"true\",\"double_col\":\"true\",\"float_col\":\"true\",\"int_col\":\"true\",\"key\":\"true\",\"smallint_col\":\"true\",\"tinyint_col\":\"true\"}} + bucketing_version 2 hbase.table.default.storage.type binary hbase.table.name t_hive numFiles 0 diff --git a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out index 153613e6d0..172db75438 100644 --- a/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out +++ b/hbase-handler/src/test/results/positive/hbase_binary_storage_queries.q.out @@ -56,6 +56,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"bigint_col\":\"true\",\"boolean_col\":\"true\",\"double_col\":\"true\",\"float_col\":\"true\",\"int_col\":\"true\",\"key\":\"true\",\"smallint_col\":\"true\",\"tinyint_col\":\"true\"}} + bucketing_version 2 hbase.table.default.storage.type binary hbase.table.name t_hive numFiles 0 @@ -236,6 +237,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"bigint_col\":\"true\",\"boolean_col\":\"true\",\"double_col\":\"true\",\"float_col\":\"true\",\"int_col\":\"true\",\"key\":\"true\",\"smallint_col\":\"true\",\"tinyint_col\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 hbase.table.name t_hive numFiles 0 numRows 0 diff --git a/hbase-handler/src/test/results/positive/hbase_ddl.q.out b/hbase-handler/src/test/results/positive/hbase_ddl.q.out index ef3f5f704e..598582c9e1 100644 --- a/hbase-handler/src/test/results/positive/hbase_ddl.q.out +++ b/hbase-handler/src/test/results/positive/hbase_ddl.q.out @@ -116,6 +116,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 hbase.mapred.output.outputtable kkk hbase.table.name hbase_table_0 #### A masked pattern was here #### @@ -162,6 +163,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 hbase.table.name hbase_table_0 #### A masked pattern was here #### numFiles 0 diff --git a/hbase-handler/src/test/results/positive/hbasestats.q.out b/hbase-handler/src/test/results/positive/hbasestats.q.out index 5d000d2f4f..8a7edc26ca 100644 --- a/hbase-handler/src/test/results/positive/hbasestats.q.out +++ b/hbase-handler/src/test/results/positive/hbasestats.q.out @@ -38,6 +38,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"country\":\"true\",\"country_id\":\"true\",\"key\":\"true\",\"state\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -129,6 +130,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -193,6 +195,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -249,6 +252,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 2 @@ -318,6 +322,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 2 diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java index 924e233293..93b927ee58 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/AbstractRecordWriter.java @@ -27,6 +27,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.IMetaStoreClient; import org.apache.hadoop.hive.metastore.api.FieldSchema; +import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.NoSuchObjectException; import org.apache.hadoop.hive.metastore.api.Table; @@ -185,7 +186,19 @@ protected int getBucket(Object row) throws SerializationError { } ObjectInspector[] inspectors = getBucketObjectInspectors(); Object[] bucketFields = getBucketFields(row); - return ObjectInspectorUtils.getBucketNumber(bucketFields, inspectors, totalBuckets); + String versionStr = tbl.getParameters().get(hive_metastoreConstants.TABLE_BUCKETING_VERSION); + int bucketingVersion = 1; + if (versionStr != null) { + try { + bucketingVersion = Integer.parseInt(versionStr); + } catch (NumberFormatException e) { + // Do nothing, should not happen. + } + } + + return bucketingVersion == 2 ? + ObjectInspectorUtils.getBucketNumber(bucketFields, inspectors, totalBuckets) : + ObjectInspectorUtils.getBucketNumberOld(bucketFields, inspectors, totalBuckets); } @Override diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolver.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolver.java index 5dd0b8ea5b..ca1cfed2f8 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolver.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolver.java @@ -17,12 +17,14 @@ */ package org.apache.hive.hcatalog.streaming.mutate.worker; +import org.apache.hadoop.hive.serde2.SerDeException; + /** Computes and appends bucket ids to records that are due to be inserted. */ public interface BucketIdResolver { - Object attachBucketIdToRecord(Object record); + Object attachBucketIdToRecord(Object record) throws SerDeException; /** See: {@link org.apache.hadoop.hive.ql.exec.ReduceSinkOperator#computeBucketNumber(Object, int)}. */ - int computeBucketId(Object record); + int computeBucketId(Object record) throws SerDeException; } diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolverImpl.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolverImpl.java index 7c2cadefa7..e9c7f7a9bf 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolverImpl.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/BucketIdResolverImpl.java @@ -22,6 +22,7 @@ import org.apache.hadoop.hive.ql.io.AcidOutputFormat; import org.apache.hadoop.hive.ql.io.BucketCodec; import org.apache.hadoop.hive.ql.io.RecordIdentifier; +import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.SettableStructObjectInspector; diff --git a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MutatorCoordinator.java b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MutatorCoordinator.java index ad14c7265f..3867d934bd 100644 --- a/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MutatorCoordinator.java +++ b/hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/mutate/worker/MutatorCoordinator.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hive.ql.io.BucketCodec; import org.apache.hadoop.hive.ql.io.RecordIdentifier; import org.apache.hadoop.hive.ql.io.RecordUpdater; +import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.util.ReflectionUtils; import org.apache.hive.hcatalog.streaming.mutate.client.AcidTable; import org.slf4j.Logger; @@ -212,7 +213,12 @@ private RecordIdentifier extractRecordIdentifier(OperationType operationType, Li RecordIdentifier recordIdentifier = recordInspector.extractRecordIdentifier(record); int bucketIdFromRecord = BucketCodec.determineVersion( recordIdentifier.getBucketProperty()).decodeWriterId(recordIdentifier.getBucketProperty()); - int computedBucketId = bucketIdResolver.computeBucketId(record); + int computedBucketId = -1; + try { + computedBucketId = bucketIdResolver.computeBucketId(record); + } catch (SerDeException e) { + throw new BucketIdException("SerDeException in fetching bucket Id"); + } if (operationType != OperationType.DELETE && bucketIdFromRecord != computedBucketId) { throw new BucketIdException("RecordIdentifier.bucketId != computed bucketId (" + computedBucketId + ") for record " + recordIdentifier + " in partition " + newPartitionValues + "."); diff --git a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestBucketIdResolverImpl.java b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestBucketIdResolverImpl.java index 03c28a33c8..5ad6372e94 100644 --- a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestBucketIdResolverImpl.java +++ b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/mutate/worker/TestBucketIdResolverImpl.java @@ -23,6 +23,7 @@ import org.apache.hadoop.hive.ql.io.AcidOutputFormat; import org.apache.hadoop.hive.ql.io.BucketCodec; import org.apache.hadoop.hive.ql.io.RecordIdentifier; +import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hive.hcatalog.streaming.mutate.MutableRecord; import org.junit.Test; @@ -41,7 +42,11 @@ @Test public void testAttachBucketIdToRecord() { MutableRecord record = new MutableRecord(1, "hello"); - capturingBucketIdResolver.attachBucketIdToRecord(record); + try { + capturingBucketIdResolver.attachBucketIdToRecord(record); + } catch (SerDeException e) { + assert false; + } assertThat(record.rowId, is(new RecordIdentifier(-1L, BucketCodec.V1.encode(new AcidOutputFormat.Options(null).bucket(1)), -1L))); diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out index caa00292b8..a0ebed7009 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_dynamic_partitions.q.out @@ -122,6 +122,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -137,6 +138,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -171,6 +173,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name id + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -203,6 +206,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name id + bucketing_version 2 column.name.delimiter , columns id columns.comments diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out index ab8ad77074..f6b6fee37c 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_into_table.q.out @@ -87,6 +87,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -133,6 +134,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -148,6 +150,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -206,6 +209,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -250,6 +254,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -281,6 +286,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -303,6 +309,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -335,6 +342,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -369,6 +377,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -400,6 +409,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -422,6 +432,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out index 2b28a6677e..61d84509f8 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_directory.q.out @@ -113,6 +113,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id,key columns.comments @@ -135,6 +136,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id,key columns.comments @@ -364,6 +366,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id,key columns.comments @@ -386,6 +389,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id,key columns.comments diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out index cdb67dd786..6dba301882 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_dynamic_partitions.q.out @@ -140,6 +140,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -155,6 +156,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -189,6 +191,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name id + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -221,6 +224,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name id + bucketing_version 2 column.name.delimiter , columns id columns.comments diff --git a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out index 2c23a7e94f..fdfe44c02b 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/insert_overwrite_table.q.out @@ -95,6 +95,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -141,6 +142,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -156,6 +158,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -214,6 +217,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -258,6 +262,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -289,6 +294,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -311,6 +317,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -343,6 +350,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -377,6 +385,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -408,6 +417,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments @@ -430,6 +440,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"id":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns id columns.comments diff --git a/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out b/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out index a1be085ea5..1cd023bc83 100644 --- a/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out +++ b/itests/hive-blobstore/src/test/results/clientpositive/write_final_output_blobstore.q.out @@ -70,6 +70,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments @@ -91,6 +92,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments @@ -194,6 +196,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments @@ -261,6 +264,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments @@ -335,6 +339,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments @@ -356,6 +361,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments @@ -459,6 +465,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments @@ -526,6 +533,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key columns.comments diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java index c084fa054c..5eb05bc0c0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FileSinkOperator.java @@ -66,10 +66,7 @@ import org.apache.hadoop.hive.ql.plan.api.OperatorType; import org.apache.hadoop.hive.ql.stats.StatsCollectionContext; import org.apache.hadoop.hive.ql.stats.StatsPublisher; -import org.apache.hadoop.hive.serde2.ColumnProjectionUtils; -import org.apache.hadoop.hive.serde2.SerDeException; -import org.apache.hadoop.hive.serde2.SerDeStats; -import org.apache.hadoop.hive.serde2.Serializer; +import org.apache.hadoop.hive.serde2.*; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils.ObjectInspectorCopyOption; @@ -86,6 +83,7 @@ import org.apache.hadoop.mapred.Reporter; import org.apache.hadoop.util.ReflectionUtils; import org.apache.hive.common.util.HiveStringUtils; +import org.apache.hive.common.util.Murmur3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1050,7 +1048,9 @@ assert getConf().getWriteType() != AcidUtils.Operation.DELETE && for(int i = 0; i < partitionEval.length; i++) { bucketFieldValues[i] = partitionEval[i].evaluate(row); } - int keyHashCode = ObjectInspectorUtils.getBucketHashCode(bucketFieldValues, partitionObjectInspectors); + int keyHashCode = conf.getTableInfo().getBucketingVersion() == 2 ? + ObjectInspectorUtils.getBucketHashCode(bucketFieldValues, partitionObjectInspectors) : + ObjectInspectorUtils.getBucketHashCodeOld(bucketFieldValues, partitionObjectInspectors); key.setHashCode(keyHashCode); int bucketNum = prtner.getBucket(key, null, totalFiles); return bucketMap.get(bucketNum); @@ -1578,4 +1578,5 @@ private Configuration unsetNestedColumnPaths(Configuration conf) { private boolean isNativeTable() { return !conf.getTableInfo().isNonNative(); } + } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java index d59bf1fb6e..bb91eeae4b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java @@ -478,6 +478,7 @@ system.registerGenericUDF("when", GenericUDFWhen.class); system.registerGenericUDF("nullif", GenericUDFNullif.class); system.registerGenericUDF("hash", GenericUDFHash.class); + system.registerGenericUDF("murmur_hash", GenericUDFMurmurHash.class); system.registerGenericUDF("coalesce", GenericUDFCoalesce.class); system.registerGenericUDF("index", GenericUDFIndex.class); system.registerGenericUDF("in_file", GenericUDFInFile.class); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java index d4363fdf91..0c8d649c54 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ReduceSinkOperator.java @@ -31,6 +31,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.CompilationOpContext; +import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.io.HiveKey; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc; @@ -39,20 +40,19 @@ import org.apache.hadoop.hive.ql.plan.ReduceSinkDesc; import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.ql.plan.api.OperatorType; +import org.apache.hadoop.hive.serde2.ByteStream; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.Serializer; +import org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; import org.apache.hadoop.hive.serde2.objectinspector.StandardUnionObjectInspector.StandardUnion; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.UnionObjectInspector; -import org.apache.hadoop.io.BinaryComparable; -import org.apache.hadoop.io.BytesWritable; -import org.apache.hadoop.io.Text; -import org.apache.hadoop.io.Writable; +import org.apache.hadoop.io.*; import org.apache.hadoop.mapred.OutputCollector; -import org.apache.hadoop.util.hash.MurmurHash; +import org.apache.hive.common.util.Murmur3; /** * Reduce Sink Operator sends output to the reduce stage. @@ -61,7 +61,6 @@ implements Serializable, TopNHash.BinaryCollector { private static final long serialVersionUID = 1L; - private static final MurmurHash hash = (MurmurHash) MurmurHash.getInstance(); private transient ObjectInspector[] partitionObjectInspectors; private transient ObjectInspector[] bucketObjectInspectors; @@ -114,11 +113,13 @@ protected transient List> distinctColIndices; protected transient Random random; + protected transient boolean acidOp; + /** * This two dimensional array holds key data and a corresponding Union object * which contains the tag identifying the aggregate expression for distinct columns. * - * If there is no distict expression, cachedKeys is simply like this. + * If there is no distinct expression, cachedKeys is simply like this. * cachedKeys[0] = [col0][col1] * * with two distict expression, union(tag:key) is attatched for each distinct expression @@ -134,6 +135,8 @@ protected transient long cntr = 1; protected transient long logEveryNRows = 0; + private int bucketingVersion; + /** Kryo ctor. */ protected ReduceSinkOperator() { super(); @@ -228,6 +231,8 @@ protected void initializeOp(Configuration hconf) throws HiveException { useUniformHash = conf.getReducerTraits().contains(UNIFORM); firstRow = true; + acidOp = conf.getWriteType() == AcidUtils.Operation.UPDATE || + conf.getWriteType() == AcidUtils.Operation.DELETE; } catch (Exception e) { String msg = "Error initializing ReduceSinkOperator: " + e.getMessage(); LOG.error(msg, e); @@ -308,7 +313,7 @@ public void process(Object row, int tag) throws HiveException { } // Determine distKeyLength (w/o distincts), and then add the first if present. - populateCachedDistributionKeys(row, 0); + populateCachedDistributionKeys(row); // replace bucketing columns with hashcode % numBuckets int bucketNumber = -1; @@ -330,12 +335,18 @@ public void process(Object row, int tag) throws HiveException { final int hashCode; // distKeyLength doesn't include tag, but includes buckNum in cachedKeys[0] - if (useUniformHash && partitionEval.length > 0) { - hashCode = computeMurmurHash(firstKey); + LOG.info("UniformHash = " + useUniformHash + " bucketing version = " + bucketingVersion); + /*if (useUniformHash && partitionEval.length > 0) { + //hashCode = computeMurmurHash(firstKey.getBytes()); + hashCode = computeMurmurHashForBucketing(row); } else { - hashCode = computeHashCode(row, bucketNumber); - } - + if (partitionEval.length > 0 && bucketingVersion == 2) { + hashCode = computeMurmurHashForBucketing(row); + } else { + hashCode = computeHashCode(row, bucketNumber); + } + }*/ + hashCode = computeHashCode(row, bucketNumber); firstKey.setHashCode(hashCode); /* @@ -379,20 +390,25 @@ public void process(Object row, int tag) throws HiveException { } } - private int computeBucketNumber(Object row, int numBuckets) throws HiveException { + private int computeBucketNumber(Object row, int numBuckets) + throws HiveException, SerDeException { Object[] bucketFieldValues = new Object[bucketEval.length]; for (int i = 0; i < bucketEval.length; i++) { bucketFieldValues[i] = bucketEval[i].evaluate(row); } - return ObjectInspectorUtils.getBucketNumber(bucketFieldValues, bucketObjectInspectors, numBuckets); + if (bucketingVersion == 2) { + return ObjectInspectorUtils.getBucketNumber(bucketFieldValues, bucketObjectInspectors, numBuckets); + } else { + return ObjectInspectorUtils.getBucketNumberOld(bucketFieldValues, bucketObjectInspectors, numBuckets); + } } - private void populateCachedDistributionKeys(Object row, int index) throws HiveException { + private void populateCachedDistributionKeys(Object row) throws HiveException { for (int i = 0; i < numDistributionKeys; i++) { - cachedKeys[index][i] = keyEval[i].evaluate(row); + cachedKeys[0][i] = keyEval[i].evaluate(row); } if (cachedKeys[0].length > numDistributionKeys) { - cachedKeys[index][numDistributionKeys] = null; + cachedKeys[0][numDistributionKeys] = null; } } @@ -413,10 +429,6 @@ private void populateCachedDistinctKeys(Object row, int index) throws HiveExcept union.setTag((byte) index); } - protected final int computeMurmurHash(HiveKey firstKey) { - return hash.hash(firstKey.getBytes(), firstKey.getDistKeyLength(), 0); - } - /** * For Acid Update/Delete case, we expect a single partitionEval of the form * UDFToInteger(ROW__ID) and buckNum == -1 so that the result of this method @@ -439,7 +451,11 @@ private int computeHashCode(Object row, int buckNum) throws HiveException { for(int i = 0; i < partitionEval.length; i++) { bucketFieldValues[i] = partitionEval[i].evaluate(row); } - keyHashCode = ObjectInspectorUtils.getBucketHashCode(bucketFieldValues, partitionObjectInspectors); + if (bucketingVersion == 2 && !acidOp) { + keyHashCode = ObjectInspectorUtils.getBucketHashCode(bucketFieldValues, partitionObjectInspectors); + } else { + keyHashCode = ObjectInspectorUtils.getBucketHashCodeOld(bucketFieldValues, partitionObjectInspectors); + } } int hashCode = buckNum < 0 ? keyHashCode : keyHashCode * 31 + buckNum; if (LOG.isTraceEnabled()) { @@ -586,4 +602,12 @@ public String getReduceOutputName() { public void setOutputCollector(OutputCollector _out) { this.out = _out; } + + public void setBucketingVersion(int bucketingVersion) { + this.bucketingVersion = bucketingVersion; + } + + public int getBucketingVersion() { + return bucketingVersion; + } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSerializedImpl.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSerializedImpl.java index 86f466fc4e..a3b076fa0a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSerializedImpl.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/keyseries/VectorKeySeriesSerializedImpl.java @@ -24,6 +24,7 @@ import org.apache.hive.common.util.HashCodeUtil; import com.google.common.base.Preconditions; +import org.apache.hive.common.util.Murmur3; /** * Implementation of base serialization interface. @@ -103,7 +104,7 @@ protected void computeSerializedHashCodes() { byte[] bytes = output.getData(); for (int i = 0; i < nonNullKeyCount; i++) { keyLength = serializedKeyLengths[i]; - hashCodes[i] = HashCodeUtil.murmurHash(bytes, offset, keyLength); + hashCodes[i] = Murmur3.hash32(bytes, offset, keyLength, 0); offset += keyLength; } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java index cc876d54c1..75cc4610f1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java @@ -139,6 +139,9 @@ // Debug display. protected transient long batchCounter; + // Bucketing version + protected int bucketingVersion; + //--------------------------------------------------------------------------- /** Kryo ctor. */ @@ -448,4 +451,8 @@ public VectorizationContext getInputVectorizationContext() { public VectorDesc getVectorDesc() { return vectorDesc; } + + public void setBucketingVersion(int bucketingVersion) { + this.bucketingVersion = bucketingVersion; + } } \ No newline at end of file diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java index 1bc3fdabac..42b77840c8 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkObjectHashOperator.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.plan.OperatorDesc; import org.apache.hadoop.hive.ql.plan.VectorDesc; +import org.apache.hadoop.hive.serde2.ByteStream; import org.apache.hadoop.hive.serde2.ByteStream.Output; import org.apache.hadoop.hive.serde2.binarysortable.fast.BinarySortableSerializeWrite; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; @@ -40,6 +41,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import com.google.common.base.Preconditions; +import org.apache.hive.common.util.Murmur3; /** * This class is the object hash (not Uniform Hash) operator class for native vectorized reduce sink. @@ -226,61 +228,110 @@ public void process(Object row, int tag) throws HiveException { int[] selected = batch.selected; final int size = batch.size; - for (int logical = 0; logical < size; logical++) { - final int batchIndex = (selectedInUse ? selected[logical] : logical); - - final int hashCode; - if (isEmptyBuckets) { - if (isEmptyPartitions) { - hashCode = nonPartitionRandom.nextInt(); - } else { + + // EmptyBuckets = true + if (isEmptyBuckets) { + if (isEmptyPartitions) { + for (int logical = 0; logical< size; logical++) { + final int batchIndex = (selectedInUse ? selected[logical] : logical); + final int hashCode = nonPartitionRandom.nextInt(); + postProcess(batch, batchIndex, tag, hashCode); + } + } else { // isEmptyPartition = false + for (int logical = 0; logical< size; logical++) { + final int batchIndex = (selectedInUse ? selected[logical] : logical); partitionVectorExtractRow.extractRow(batch, batchIndex, partitionFieldValues); - hashCode = + final int hashCode = bucketingVersion == 2 && !vectorDesc.getIsAcidChange() ? ObjectInspectorUtils.getBucketHashCode( + partitionFieldValues, partitionObjectInspectors) : + ObjectInspectorUtils.getBucketHashCodeOld( partitionFieldValues, partitionObjectInspectors); + postProcess(batch, batchIndex, tag, hashCode); } - } else { - bucketVectorExtractRow.extractRow(batch, batchIndex, bucketFieldValues); - final int bucketNum = - ObjectInspectorUtils.getBucketNumber( + } + } else { // EmptyBuckets = false + if (isEmptyPartitions) { + for (int logical = 0; logical< size; logical++) { + final int batchIndex = (selectedInUse ? selected[logical] : logical); + bucketVectorExtractRow.extractRow(batch, batchIndex, bucketFieldValues); + final int bucketNum = bucketingVersion == 2 ? + ObjectInspectorUtils.getBucketNumber(bucketFieldValues, + bucketObjectInspectors, numBuckets) : + ObjectInspectorUtils.getBucketNumberOld( bucketFieldValues, bucketObjectInspectors, numBuckets); - if (isEmptyPartitions) { - hashCode = nonPartitionRandom.nextInt() * 31 + bucketNum; - } else { + final int hashCode = nonPartitionRandom.nextInt() * 31 + bucketNum; + postProcess(batch, batchIndex, tag, hashCode); + } + } else { // isEmptyPartition = false + for (int logical = 0; logical< size; logical++) { + final int batchIndex = (selectedInUse ? selected[logical] : logical); partitionVectorExtractRow.extractRow(batch, batchIndex, partitionFieldValues); - hashCode = - ObjectInspectorUtils.getBucketHashCode( - partitionFieldValues, partitionObjectInspectors) * 31 + bucketNum; + bucketVectorExtractRow.extractRow(batch, batchIndex, bucketFieldValues); + final int hashCode, bucketNum; + if (bucketingVersion == 2 && !vectorDesc.getIsAcidChange()) { + bucketNum = + ObjectInspectorUtils.getBucketNumber( + bucketFieldValues, bucketObjectInspectors, numBuckets); + hashCode = ObjectInspectorUtils.getBucketHashCode( + partitionFieldValues, partitionObjectInspectors) * 31 + bucketNum; + } else { // old bucketing logic + bucketNum = + ObjectInspectorUtils.getBucketNumberOld( + bucketFieldValues, bucketObjectInspectors, numBuckets); + hashCode = ObjectInspectorUtils.getBucketHashCodeOld( + partitionFieldValues, partitionObjectInspectors) * 31 + bucketNum; + } + postProcess(batch, batchIndex, tag, hashCode); } } + } + } catch (Exception e) { + throw new HiveException(e); + } + } - if (!isEmptyKey) { - keyBinarySortableSerializeWrite.reset(); - keyVectorSerializeRow.serializeWrite(batch, batchIndex); - - // One serialized key for 1 or more rows for the duplicate keys. - final int keyLength = keyOutput.getLength(); - if (tag == -1 || reduceSkipTag) { - keyWritable.set(keyOutput.getData(), 0, keyLength); - } else { - keyWritable.setSize(keyLength + 1); - System.arraycopy(keyOutput.getData(), 0, keyWritable.get(), 0, keyLength); - keyWritable.get()[keyLength] = reduceTagByte; - } - keyWritable.setDistKeyLength(keyLength); - } + private void processKey(VectorizedRowBatch batch, int batchIndex, int tag) + throws HiveException{ + if (isEmptyKey) return; - keyWritable.setHashCode(hashCode); + try { + keyBinarySortableSerializeWrite.reset(); + keyVectorSerializeRow.serializeWrite(batch, batchIndex); + + // One serialized key for 1 or more rows for the duplicate keys. + final int keyLength = keyOutput.getLength(); + if (tag == -1 || reduceSkipTag) { + keyWritable.set(keyOutput.getData(), 0, keyLength); + } else { + keyWritable.setSize(keyLength + 1); + System.arraycopy(keyOutput.getData(), 0, keyWritable.get(), 0, keyLength); + keyWritable.get()[keyLength] = reduceTagByte; + } + keyWritable.setDistKeyLength(keyLength); + } catch (Exception e) { + throw new HiveException(e); + } + } - if (!isEmptyValue) { - valueLazyBinarySerializeWrite.reset(); - valueVectorSerializeRow.serializeWrite(batch, batchIndex); + private void processValue(VectorizedRowBatch batch, int batchIndex) throws HiveException { + if (isEmptyValue) return; - valueBytesWritable.set(valueOutput.getData(), 0, valueOutput.getLength()); - } + try { + valueLazyBinarySerializeWrite.reset(); + valueVectorSerializeRow.serializeWrite(batch, batchIndex); - collect(keyWritable, valueBytesWritable); - } + valueBytesWritable.set(valueOutput.getData(), 0, valueOutput.getLength()); + } catch (Exception e) { + throw new HiveException(e); + } + } + + private void postProcess(VectorizedRowBatch batch, int batchIndex, int tag, int hashCode) throws HiveException { + try { + processKey(batch, batchIndex, tag); + keyWritable.setHashCode(hashCode); + processValue(batch, batchIndex); + collect(keyWritable, valueBytesWritable); } catch (Exception e) { throw new HiveException(e); } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java index a51fdd322f..694ec9504b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java @@ -188,6 +188,9 @@ public void setTTable(org.apache.hadoop.hive.metastore.api.Table tTable) { // set create time t.setCreateTime((int) (System.currentTimeMillis() / 1000)); } + // Explictly set the bucketing version + t.getParameters().put(hive_metastoreConstants.TABLE_BUCKETING_VERSION, + "2"); return t; } @@ -450,6 +453,19 @@ public StructField getField(String fld) { } } + public int getBucketingVersion() { + String versionStr = getProperty(hive_metastoreConstants.TABLE_BUCKETING_VERSION); + int bucketingVersion = 1; + if (versionStr != null) { + try { + bucketingVersion = Integer.parseInt(versionStr); + } catch (NumberFormatException e) { + // Do nothing + } + } + return bucketingVersion; + } + @Override public String toString() { return tTable.getTableName(); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java index a235f3fbf4..3b7a410e82 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/ConvertJoinMapJoin.java @@ -26,6 +26,7 @@ import java.util.Set; import java.util.Stack; +import com.google.common.base.Preconditions; import org.apache.hadoop.hive.common.JavaUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; @@ -180,7 +181,8 @@ MapJoinOperator mapJoinOp = convertJoinMapJoin(joinOp, context, mapJoinConversionPos, true); // map join operator by default has no bucket cols and num of reduce sinks // reduced by 1 - mapJoinOp.setOpTraits(new OpTraits(null, -1, null, joinOp.getOpTraits().getNumReduceSinks())); + mapJoinOp.setOpTraits(new OpTraits(null, -1, null, joinOp.getOpTraits().getNumReduceSinks(), + joinOp.getOpTraits().getBucketingVersion())); mapJoinOp.setStatistics(joinOp.getStatistics()); // propagate this change till the next RS for (Operator childOp : mapJoinOp.getChildOperators()) { @@ -378,7 +380,7 @@ private void convertJoinSMBJoin(JoinOperator joinOp, OptimizeTezProcContext cont joinOp.getSchema()); int numReduceSinks = joinOp.getOpTraits().getNumReduceSinks(); OpTraits opTraits = new OpTraits(joinOp.getOpTraits().getBucketColNames(), numBuckets, - joinOp.getOpTraits().getSortCols(), numReduceSinks); + joinOp.getOpTraits().getSortCols(), numReduceSinks, joinOp.getOpTraits().getBucketingVersion()); mergeJoinOp.setOpTraits(opTraits); mergeJoinOp.setStatistics(joinOp.getStatistics()); @@ -445,7 +447,8 @@ private void setAllChildrenTraits(Operator currentOp, Op return; } currentOp.setOpTraits(new OpTraits(opTraits.getBucketColNames(), - opTraits.getNumBuckets(), opTraits.getSortCols(), opTraits.getNumReduceSinks())); + opTraits.getNumBuckets(), opTraits.getSortCols(), opTraits.getNumReduceSinks(), + opTraits.getBucketingVersion())); for (Operator childOp : currentOp.getChildOperators()) { if ((childOp instanceof ReduceSinkOperator) || (childOp instanceof GroupByOperator)) { break; @@ -498,7 +501,8 @@ private boolean convertJoinBucketMapJoin(JoinOperator joinOp, OptimizeTezProcCon // we can set the traits for this join operator opTraits = new OpTraits(joinOp.getOpTraits().getBucketColNames(), - tezBucketJoinProcCtx.getNumBuckets(), null, joinOp.getOpTraits().getNumReduceSinks()); + tezBucketJoinProcCtx.getNumBuckets(), null, joinOp.getOpTraits().getNumReduceSinks(), + joinOp.getOpTraits().getBucketingVersion()); mapJoinOp.setOpTraits(opTraits); mapJoinOp.setStatistics(joinOp.getStatistics()); setNumberOfBucketsOnChildren(mapJoinOp); @@ -594,6 +598,38 @@ private boolean checkConvertJoinSMBJoin(JoinOperator joinOp, OptimizeTezProcCont numBuckets = bigTableRS.getConf().getNumReducers(); } tezBucketJoinProcCtx.setNumBuckets(numBuckets); + + // With bucketing using two different versions. Version 1 for exiting + // tables and version 2 for new tables. All the inputs to the SMB must be + // from same version. This only applies to tables read directly and not + // intermediate outputs of joins/groupbys + int bucketingVersion = -1; + for (Operator parentOp : joinOp.getParentOperators()) { + // Check if the parent is coming from a table scan, if so, what is the version of it. + assert parentOp.getParentOperators() != null && parentOp.getParentOperators().size() == 1; + Operator op = parentOp.getParentOperators().get(0); + while(op != null && !(op instanceof TableScanOperator + || op instanceof ReduceSinkOperator + || op instanceof CommonJoinOperator)) { + // If op has parents it is guaranteed to be 1. + List> parents = op.getParentOperators(); + Preconditions.checkState(parents.size() == 0 || parents.size() == 1); + op = parents.size() == 1 ? parents.get(0) : null; + } + + if (op instanceof TableScanOperator) { + int localVersion = ((TableScanOperator)op).getConf(). + getTableMetadata().getBucketingVersion(); + if (bucketingVersion == -1) { + bucketingVersion = localVersion; + } else if (bucketingVersion != localVersion) { + // versions dont match, return false. + LOG.debug("SMB Join can't be performed due to bucketing version mismatch"); + return false; + } + } + } + LOG.info("We can convert the join to an SMB join."); return true; } @@ -1169,7 +1205,8 @@ private boolean convertJoinDynamicPartitionedHashJoin(JoinOperator joinOp, Optim joinOp.getOpTraits().getBucketColNames(), numReducers, null, - joinOp.getOpTraits().getNumReduceSinks()); + joinOp.getOpTraits().getNumReduceSinks(), + joinOp.getOpTraits().getBucketingVersion()); mapJoinOp.setOpTraits(opTraits); mapJoinOp.setStatistics(joinOp.getStatistics()); // propagate this change till the next RS diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java index 5f65f638ca..d1672b229e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/FixedBucketPruningOptimizer.java @@ -46,6 +46,7 @@ import org.apache.hadoop.hive.ql.parse.PrunedPartitionList; import org.apache.hadoop.hive.ql.parse.SemanticException; import org.apache.hadoop.hive.ql.plan.ExprNodeGenericFuncDesc; +import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters.Converter; @@ -84,8 +85,7 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, @Override protected void generatePredicate(NodeProcessorCtx procCtx, - FilterOperator fop, TableScanOperator top) throws SemanticException, - UDFArgumentException { + FilterOperator fop, TableScanOperator top) throws SemanticException { FixedBucketPruningOptimizerCtxt ctxt = ((FixedBucketPruningOptimizerCtxt) procCtx); Table tbl = top.getConf().getTableMetadata(); if (tbl.getNumBuckets() > 0) { @@ -122,8 +122,7 @@ protected void generatePredicate(NodeProcessorCtx procCtx, @Override protected void generatePredicate(NodeProcessorCtx procCtx, - FilterOperator fop, TableScanOperator top) throws SemanticException, - UDFArgumentException { + FilterOperator fop, TableScanOperator top) throws SemanticException { FixedBucketPruningOptimizerCtxt ctxt = ((FixedBucketPruningOptimizerCtxt) procCtx); if (ctxt.getNumBuckets() <= 0 || ctxt.getBucketCols().size() != 1) { // bucketing isn't consistent or there are >1 bucket columns @@ -225,6 +224,9 @@ protected void generatePredicate(NodeProcessorCtx procCtx, bs.clear(); PrimitiveObjectInspector bucketOI = (PrimitiveObjectInspector)bucketField.getFieldObjectInspector(); PrimitiveObjectInspector constOI = PrimitiveObjectInspectorFactory.getPrimitiveWritableObjectInspector(bucketOI.getPrimitiveCategory()); + // Fetch the bucketing version from table scan operator + int bucketingVersion = top.getConf().getTableMetadata().getBucketingVersion(); + for (Object literal: literals) { PrimitiveObjectInspector origOI = PrimitiveObjectInspectorFactory.getPrimitiveObjectInspectorFromClass(literal.getClass()); Converter conv = ObjectInspectorConverters.getConverter(origOI, constOI); @@ -233,10 +235,12 @@ protected void generatePredicate(NodeProcessorCtx procCtx, return; } Object convCols[] = new Object[] {conv.convert(literal)}; - int n = ObjectInspectorUtils.getBucketNumber(convCols, new ObjectInspector[]{constOI}, ctxt.getNumBuckets()); + int n = bucketingVersion == 2 ? + ObjectInspectorUtils.getBucketNumber(convCols, new ObjectInspector[]{constOI}, ctxt.getNumBuckets()) : + ObjectInspectorUtils.getBucketNumberOld(convCols, new ObjectInspector[]{constOI}, ctxt.getNumBuckets()); bs.set(n); - if (ctxt.isCompat()) { - int h = ObjectInspectorUtils.getBucketHashCode(convCols, new ObjectInspector[]{constOI}); + if (bucketingVersion == 1 && ctxt.isCompat()) { + int h = ObjectInspectorUtils.getBucketHashCodeOld(convCols, new ObjectInspector[]{constOI}); // -ve hashcodes had conversion to positive done in different ways in the past // abs() is now obsolete and all inserts now use & Integer.MAX_VALUE // the compat mode assumes that old data could've been loaded using the other conversion diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PrunerOperatorFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PrunerOperatorFactory.java index 2be3c9b9a2..1626e26782 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PrunerOperatorFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/PrunerOperatorFactory.java @@ -31,6 +31,7 @@ import org.apache.hadoop.hive.ql.parse.SemanticException; import org.apache.hadoop.hive.ql.parse.TypeCheckProcFactory; import org.apache.hadoop.hive.ql.plan.ExprNodeDesc; +import org.apache.hadoop.hive.serde2.SerDeException; /** * Operator factory for pruning processing of operator graph We find @@ -101,7 +102,7 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, * @throws UDFArgumentException */ protected abstract void generatePredicate(NodeProcessorCtx procCtx, FilterOperator fop, - TableScanOperator top) throws SemanticException, UDFArgumentException; + TableScanOperator top) throws SemanticException; /** * Add pruning predicate. * diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java index 1c5656267d..51010aac85 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionOptimizer.java @@ -245,7 +245,7 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, // Create ReduceSink operator ReduceSinkOperator rsOp = getReduceSinkOp(partitionPositions, sortPositions, sortOrder, sortNullOrder, - allRSCols, bucketColumns, numBuckets, fsParent); + allRSCols, bucketColumns, numBuckets, fsParent, fsOp.getConf().getWriteType()); List descs = new ArrayList(allRSCols.size()); List colNames = new ArrayList(); @@ -442,7 +442,7 @@ private void inferSortPositions(Operator fsParent, public ReduceSinkOperator getReduceSinkOp(List partitionPositions, List sortPositions, List sortOrder, List sortNullOrder, ArrayList allCols, ArrayList bucketColumns, int numBuckets, - Operator parent) throws SemanticException { + Operator parent, AcidUtils.Operation writeType) throws SemanticException { // Order of KEY columns // 1) Partition columns @@ -577,7 +577,7 @@ public ReduceSinkOperator getReduceSinkOp(List partitionPositions, // Number of reducers is set to default (-1) ReduceSinkDesc rsConf = new ReduceSinkDesc(keyCols, keyCols.size(), valCols, keyColNames, distinctColumnIndices, valColNames, -1, partCols, -1, keyTable, - valueTable); + valueTable, writeType); rsConf.setBucketCols(bucketColumns); rsConf.setNumBuckets(numBuckets); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionTimeGranularityOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionTimeGranularityOptimizer.java index 0e995d79d2..0ce359f4a2 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionTimeGranularityOptimizer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SortedDynPartitionTimeGranularityOptimizer.java @@ -31,6 +31,7 @@ import org.apache.hadoop.hive.ql.exec.UDF; import org.apache.hadoop.hive.ql.exec.Utilities; import org.apache.hadoop.hive.ql.exec.Utilities.ReduceField; +import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.lib.DefaultGraphWalker; import org.apache.hadoop.hive.ql.lib.DefaultRuleDispatcher; import org.apache.hadoop.hive.ql.lib.Dispatcher; @@ -209,7 +210,7 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, sortNullOrder = Lists.newArrayList(0); // nulls first } ReduceSinkOperator rsOp = getReduceSinkOp(keyPositions, sortOrder, - sortNullOrder, allRSCols, granularitySelOp); + sortNullOrder, allRSCols, granularitySelOp, fsOp.getConf().getWriteType()); // Create backtrack SelectOp final List descs = new ArrayList<>(allRSCols.size()); @@ -393,8 +394,8 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, } private ReduceSinkOperator getReduceSinkOp(List keyPositions, List sortOrder, - List sortNullOrder, ArrayList allCols, Operator parent - ) { + List sortNullOrder, ArrayList allCols, Operator parent, + AcidUtils.Operation writeType) { // we will clone here as RS will update bucket column key with its // corresponding with bucket number and hence their OIs final ArrayList keyCols = keyPositions.stream() @@ -452,7 +453,7 @@ private ReduceSinkOperator getReduceSinkOp(List keyPositions, List signature = parent.getSchema().getSignature() diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/AnnotateWithOpTraits.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/AnnotateWithOpTraits.java index 3c8e61d47b..e6c5b9d9ce 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/AnnotateWithOpTraits.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/AnnotateWithOpTraits.java @@ -22,16 +22,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.apache.hadoop.hive.ql.exec.DemuxOperator; -import org.apache.hadoop.hive.ql.exec.GroupByOperator; -import org.apache.hadoop.hive.ql.exec.JoinOperator; -import org.apache.hadoop.hive.ql.exec.MapJoinOperator; -import org.apache.hadoop.hive.ql.exec.MuxOperator; -import org.apache.hadoop.hive.ql.exec.ReduceSinkOperator; -import org.apache.hadoop.hive.ql.exec.SMBMapJoinOperator; -import org.apache.hadoop.hive.ql.exec.SelectOperator; -import org.apache.hadoop.hive.ql.exec.TableScanOperator; -import org.apache.hadoop.hive.ql.exec.UnionOperator; +import org.apache.hadoop.hive.ql.exec.*; import org.apache.hadoop.hive.ql.lib.DefaultRuleDispatcher; import org.apache.hadoop.hive.ql.lib.Dispatcher; import org.apache.hadoop.hive.ql.lib.GraphWalker; @@ -78,6 +69,8 @@ public ParseContext transform(ParseContext pctx) throws SemanticException { OpTraitsRulesProcFactory.getGroupByRule()); opRules.put(new RuleRegExp("SEL", SelectOperator.getOperatorName() + "%"), OpTraitsRulesProcFactory.getSelectRule()); + /*opRules.put(new RuleRegExp("FS", FileSinkOperator.getOperatorName() + "%"), + OpTraitsRulesProcFactory.getFileSinkRule());*/ // The dispatcher fires the processor corresponding to the closest matching // rule and passes the context along diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/OpTraitsRulesProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/OpTraitsRulesProcFactory.java index 69d9f3125a..614511238d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/OpTraitsRulesProcFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/metainfo/annotation/OpTraitsRulesProcFactory.java @@ -23,12 +23,7 @@ import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.Order; -import org.apache.hadoop.hive.ql.exec.GroupByOperator; -import org.apache.hadoop.hive.ql.exec.JoinOperator; -import org.apache.hadoop.hive.ql.exec.Operator; -import org.apache.hadoop.hive.ql.exec.ReduceSinkOperator; -import org.apache.hadoop.hive.ql.exec.SelectOperator; -import org.apache.hadoop.hive.ql.exec.TableScanOperator; +import org.apache.hadoop.hive.ql.exec.*; import org.apache.hadoop.hive.ql.lib.Node; import org.apache.hadoop.hive.ql.lib.NodeProcessor; import org.apache.hadoop.hive.ql.lib.NodeProcessorCtx; @@ -92,10 +87,12 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, List> listBucketCols = new ArrayList>(); int numBuckets = -1; int numReduceSinks = 1; + int bucketingVersion = -1; OpTraits parentOpTraits = rs.getParentOperators().get(0).getOpTraits(); if (parentOpTraits != null) { numBuckets = parentOpTraits.getNumBuckets(); numReduceSinks += parentOpTraits.getNumReduceSinks(); + bucketingVersion = parentOpTraits.getBucketingVersion(); } List bucketCols = new ArrayList<>(); @@ -134,8 +131,10 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, } listBucketCols.add(bucketCols); - OpTraits opTraits = new OpTraits(listBucketCols, numBuckets, listBucketCols, numReduceSinks); + OpTraits opTraits = new OpTraits(listBucketCols, numBuckets, + listBucketCols, numReduceSinks, bucketingVersion); rs.setOpTraits(opTraits); + rs.setBucketingVersion(bucketingVersion); return null; } } @@ -213,7 +212,8 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, sortedColsList.add(sortCols); } // num reduce sinks hardcoded to 0 because TS has no parents - OpTraits opTraits = new OpTraits(bucketColsList, numBuckets, sortedColsList, 0); + OpTraits opTraits = new OpTraits(bucketColsList, numBuckets, + sortedColsList, 0, table.getBucketingVersion()); ts.setOpTraits(opTraits); return null; } @@ -239,12 +239,15 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, List> listBucketCols = new ArrayList>(); int numReduceSinks = 0; + int bucketingVersion = -1; OpTraits parentOpTraits = gbyOp.getParentOperators().get(0).getOpTraits(); if (parentOpTraits != null) { numReduceSinks = parentOpTraits.getNumReduceSinks(); + bucketingVersion = parentOpTraits.getBucketingVersion(); } listBucketCols.add(gbyKeys); - OpTraits opTraits = new OpTraits(listBucketCols, -1, listBucketCols, numReduceSinks); + OpTraits opTraits = new OpTraits(listBucketCols, -1, listBucketCols, + numReduceSinks, bucketingVersion); gbyOp.setOpTraits(opTraits); return null; } @@ -298,12 +301,15 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, int numBuckets = -1; int numReduceSinks = 0; + int bucketingVersion = -1; OpTraits parentOpTraits = selOp.getParentOperators().get(0).getOpTraits(); if (parentOpTraits != null) { numBuckets = parentOpTraits.getNumBuckets(); numReduceSinks = parentOpTraits.getNumReduceSinks(); + bucketingVersion = parentOpTraits.getBucketingVersion(); } - OpTraits opTraits = new OpTraits(listBucketCols, numBuckets, listSortCols, numReduceSinks); + OpTraits opTraits = new OpTraits(listBucketCols, numBuckets, listSortCols, + numReduceSinks, bucketingVersion); selOp.setOpTraits(opTraits); return null; } @@ -338,7 +344,7 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, pos++; } - joinOp.setOpTraits(new OpTraits(bucketColsList, -1, bucketColsList, numReduceSinks)); + joinOp.setOpTraits(new OpTraits(bucketColsList, -1, bucketColsList, numReduceSinks, 2)); return null; } @@ -392,6 +398,8 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, Operator operator = (Operator) nd; int numReduceSinks = 0; + int bucketingVersion = -1; + boolean bucketingVersionSeen = false; for (Operator parentOp : operator.getParentOperators()) { if (parentOp.getOpTraits() == null) { continue; @@ -399,8 +407,17 @@ public Object process(Node nd, Stack stack, NodeProcessorCtx procCtx, if (parentOp.getOpTraits().getNumReduceSinks() > numReduceSinks) { numReduceSinks = parentOp.getOpTraits().getNumReduceSinks(); } + // If there is mismatch in bucketingVersion, then it should be set to + // -1, that way SMB will be disabled. + if (bucketingVersion == -1 && !bucketingVersionSeen) { + bucketingVersion = parentOp.getOpTraits().getBucketingVersion(); + bucketingVersionSeen = true; + } else if (bucketingVersion != parentOp.getOpTraits().getBucketingVersion()) { + bucketingVersion = -1; + } } - OpTraits opTraits = new OpTraits(null, -1, null, numReduceSinks); + OpTraits opTraits = new OpTraits(null, -1, + null, numReduceSinks, bucketingVersion); operator.setOpTraits(opTraits); return null; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java index 13a2fc478f..28ebbe4def 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java @@ -40,6 +40,8 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.hadoop.hive.ql.exec.vector.reducesink.*; +import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.parse.spark.SparkPartitionPruningSinkOperator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,11 +70,6 @@ import org.apache.hadoop.hive.ql.exec.vector.mapjoin.VectorMapJoinOuterMultiKeyOperator; import org.apache.hadoop.hive.ql.exec.vector.mapjoin.VectorMapJoinOuterStringOperator; import org.apache.hadoop.hive.ql.exec.vector.ptf.VectorPTFOperator; -import org.apache.hadoop.hive.ql.exec.vector.reducesink.VectorReduceSinkEmptyKeyOperator; -import org.apache.hadoop.hive.ql.exec.vector.reducesink.VectorReduceSinkLongOperator; -import org.apache.hadoop.hive.ql.exec.vector.reducesink.VectorReduceSinkMultiKeyOperator; -import org.apache.hadoop.hive.ql.exec.vector.reducesink.VectorReduceSinkObjectHashOperator; -import org.apache.hadoop.hive.ql.exec.vector.reducesink.VectorReduceSinkStringOperator; import org.apache.hadoop.hive.ql.exec.vector.udf.VectorUDFAdaptor; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector; import org.apache.hadoop.hive.ql.exec.vector.ColumnVector.Type; @@ -3566,6 +3563,9 @@ private boolean canSpecializeMapJoin(Operator op, MapJoi LOG.info("Vectorizer vectorizeOperator reduce sink class " + opClass.getSimpleName()); + // Get the bucketing version + int bucketingVersion = ((ReduceSinkOperator)op).getBucketingVersion(); + Operator vectorOp = null; try { vectorOp = OperatorFactory.getVectorOperator( @@ -3577,6 +3577,10 @@ private boolean canSpecializeMapJoin(Operator op, MapJoi throw new HiveException(e); } + // Set the bucketing version + Preconditions.checkArgument(vectorOp instanceof VectorReduceSinkCommonOperator); + ((VectorReduceSinkCommonOperator)vectorOp).setBucketingVersion(bucketingVersion); + return vectorOp; } @@ -3784,6 +3788,8 @@ private boolean canSpecializeReduceSink(ReduceSinkDesc desc, vectorDesc.setHasDistinctColumns(hasDistinctColumns); vectorDesc.setIsKeyBinarySortable(isKeyBinarySortable); vectorDesc.setIsValueLazyBinary(isValueLazyBinary); + vectorDesc.setIsAcidChange(desc.getWriteType() == AcidUtils.Operation.DELETE || + desc.getWriteType() == AcidUtils.Operation.UPDATE); // This indicates we logged an inconsistency (from our point-of-view) and will not make this // operator native... diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkMapJoinOptimizer.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkMapJoinOptimizer.java index 7b1fd5f206..8e75db9e08 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkMapJoinOptimizer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/spark/SparkMapJoinOptimizer.java @@ -121,7 +121,8 @@ } // we can set the traits for this join operator - OpTraits opTraits = new OpTraits(bucketColNames, numBuckets, null, joinOp.getOpTraits().getNumReduceSinks()); + OpTraits opTraits = new OpTraits(bucketColNames, numBuckets, null, + joinOp.getOpTraits().getNumReduceSinks(), joinOp.getOpTraits().getBucketingVersion()); mapJoinOp.setOpTraits(opTraits); mapJoinOp.setStatistics(joinOp.getStatistics()); setNumberOfBucketsOnChildren(mapJoinOp); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index 36f6bcd069..5d0a86c33a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -220,12 +220,8 @@ import org.apache.hadoop.hive.ql.security.authorization.plugin.HivePrivilegeObject; import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.session.SessionState.ResourceType; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator; +import org.apache.hadoop.hive.ql.udf.generic.*; import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator.Mode; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDFCardinalityViolation; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDFHash; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDFOPOr; -import org.apache.hadoop.hive.ql.udf.generic.GenericUDTF; import org.apache.hadoop.hive.ql.util.ResourceDownloader; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.Deserializer; @@ -8088,9 +8084,15 @@ private Operator genReduceSinkPlan(String dest, QB qb, Operator input, sortCols.add(exprNode); } } + + Table dest_tab = qb.getMetaData().getDestTableForAlias(dest); + AcidUtils.Operation acidOp = Operation.NOT_ACID; + if (AcidUtils.isFullAcidTable(dest_tab)) { + acidOp = getAcidType(Utilities.getTableDesc(dest_tab).getOutputFileFormatClass(), dest); + } Operator result = genReduceSinkPlan( input, partCols, sortCols, order.toString(), nullOrder.toString(), - numReducers, Operation.NOT_ACID, true); + numReducers, acidOp, true); if (result.getParentOperators().size() == 1 && result.getParentOperators().get(0) instanceof ReduceSinkOperator) { ((ReduceSinkOperator) result.getParentOperators().get(0)) @@ -10483,7 +10485,8 @@ private Operator genUnionPlan(String unionalias, String leftalias, */ private ExprNodeDesc genSamplePredicate(TableSample ts, List bucketCols, boolean useBucketCols, String alias, - RowResolver rwsch, QBMetaData qbm, ExprNodeDesc planExpr) + RowResolver rwsch, QBMetaData qbm, ExprNodeDesc planExpr, + int bucketingVersion) throws SemanticException { ExprNodeDesc numeratorExpr = new ExprNodeConstantDesc( @@ -10513,22 +10516,19 @@ private ExprNodeDesc genSamplePredicate(TableSample ts, ExprNodeDesc equalsExpr = null; { ExprNodeDesc hashfnExpr = new ExprNodeGenericFuncDesc( - TypeInfoFactory.intTypeInfo, new GenericUDFHash(), args); - assert (hashfnExpr != null); + TypeInfoFactory.intTypeInfo, + bucketingVersion == 2 ? new GenericUDFMurmurHash() : new GenericUDFHash(), args); LOG.info("hashfnExpr = " + hashfnExpr); ExprNodeDesc andExpr = TypeCheckProcFactory.DefaultExprProcessor .getFuncExprNodeDesc("&", hashfnExpr, intMaxExpr); - assert (andExpr != null); LOG.info("andExpr = " + andExpr); ExprNodeDesc modExpr = TypeCheckProcFactory.DefaultExprProcessor .getFuncExprNodeDesc("%", andExpr, denominatorExpr); - assert (modExpr != null); LOG.info("modExpr = " + modExpr); LOG.info("numeratorExpr = " + numeratorExpr); equalsExpr = TypeCheckProcFactory.DefaultExprProcessor .getFuncExprNodeDesc("==", modExpr, numeratorExpr); LOG.info("equalsExpr = " + equalsExpr); - assert (equalsExpr != null); } return equalsExpr; } @@ -10697,7 +10697,8 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException { // later LOG.info("No need for sample filter"); ExprNodeDesc samplePredicate = genSamplePredicate(ts, tabBucketCols, - colsEqual, alias, rwsch, qb.getMetaData(), null); + colsEqual, alias, rwsch, qb.getMetaData(), null, + tab.getBucketingVersion()); FilterDesc filterDesc = new FilterDesc( samplePredicate, true, new SampleDesc(ts.getNumerator(), ts.getDenominator(), tabBucketCols, true)); @@ -10709,7 +10710,8 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException { // create tableOp to be filterDesc and set as child to 'top' LOG.info("Need sample filter"); ExprNodeDesc samplePredicate = genSamplePredicate(ts, tabBucketCols, - colsEqual, alias, rwsch, qb.getMetaData(), null); + colsEqual, alias, rwsch, qb.getMetaData(), null, + tab.getBucketingVersion()); FilterDesc filterDesc = new FilterDesc(samplePredicate, true); filterDesc.setGenerated(true); op = OperatorFactory.getAndMakeChild(filterDesc, @@ -10740,7 +10742,8 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException { tsSample.setInputPruning(true); qb.getParseInfo().setTabSample(alias, tsSample); ExprNodeDesc samplePred = genSamplePredicate(tsSample, tab - .getBucketCols(), true, alias, rwsch, qb.getMetaData(), null); + .getBucketCols(), true, alias, rwsch, qb.getMetaData(), null, + tab.getBucketingVersion()); FilterDesc filterDesc = new FilterDesc(samplePred, true, new SampleDesc(tsSample.getNumerator(), tsSample .getDenominator(), tab.getBucketCols(), true)); @@ -10759,7 +10762,7 @@ private Operator genTablePlan(String alias, QB qb) throws SemanticException { .getFuncExprNodeDesc("rand", new ExprNodeConstantDesc(Integer .valueOf(460476415))); ExprNodeDesc samplePred = genSamplePredicate(tsSample, null, false, - alias, rwsch, qb.getMetaData(), randFunc); + alias, rwsch, qb.getMetaData(), randFunc, tab.getBucketingVersion()); FilterDesc filterDesc = new FilterDesc(samplePred, true); filterDesc.setGenerated(true); op = OperatorFactory.getAndMakeChild(filterDesc, diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/OpTraits.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/OpTraits.java index 9621c3be53..d3b62ce799 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/OpTraits.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/OpTraits.java @@ -22,17 +22,20 @@ public class OpTraits { - List> bucketColNames; - List> sortColNames; - int numBuckets; - int numReduceSinks; + private List> bucketColNames; + private List> sortColNames; + private int numBuckets; + private int numReduceSinks; + private int bucketingVersion; public OpTraits(List> bucketColNames, int numBuckets, - List> sortColNames, int numReduceSinks) { + List> sortColNames, int numReduceSinks, + int bucketingVersion) { this.bucketColNames = bucketColNames; this.numBuckets = numBuckets; this.sortColNames = sortColNames; this.numReduceSinks = numReduceSinks; + this.bucketingVersion = bucketingVersion; } public List> getBucketColNames() { @@ -68,10 +71,17 @@ public int getNumReduceSinks() { return this.numReduceSinks; } - + public void setBucketingVersion(int bucketingVersion) { + this.bucketingVersion = bucketingVersion; + } + + public int getBucketingVersion() { + return bucketingVersion; + } + @Override public String toString() { return "{ bucket column names: " + bucketColNames + "; sort column names: " - + sortColNames + "; bucket count: " + numBuckets + " }"; + + sortColNames + "; bucket count: " + numBuckets + "; bucketing version: " + bucketingVersion + " }"; } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java index dde20ed56e..c410853e16 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java @@ -787,7 +787,7 @@ public static ReduceSinkDesc getReduceSinkDesc( return new ReduceSinkDesc(keyCols, numKeys, valueCols, outputKeyCols, distinctColIndices, outputValCols, tag, partitionCols, numReducers, keyTable, - valueTable); + valueTable, writeType); } /** diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java index f2955af25e..18635fcd2d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ReduceSinkDesc.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.optimizer.signature.Signature; import org.apache.hadoop.hive.ql.plan.Explain.Level; import org.apache.hadoop.hive.ql.plan.Explain.Vectorization; @@ -127,6 +128,8 @@ private ReducerTraits(int trait) { private static transient Logger LOG = LoggerFactory.getLogger(ReduceSinkDesc.class); + private AcidUtils.Operation writeType; + public ReduceSinkDesc() { } @@ -137,7 +140,8 @@ public ReduceSinkDesc(ArrayList keyCols, List> distinctColumnIndices, ArrayList outputValueColumnNames, int tag, ArrayList partitionCols, int numReducers, - final TableDesc keySerializeInfo, final TableDesc valueSerializeInfo) { + final TableDesc keySerializeInfo, final TableDesc valueSerializeInfo, + AcidUtils.Operation writeType) { this.keyCols = keyCols; this.numDistributionKeys = numDistributionKeys; this.valueCols = valueCols; @@ -151,6 +155,7 @@ public ReduceSinkDesc(ArrayList keyCols, this.distinctColumnIndices = distinctColumnIndices; this.setNumBuckets(-1); this.setBucketCols(null); + this.writeType = writeType; } @Override @@ -670,4 +675,7 @@ public boolean isSame(OperatorDesc other) { return false; } + public AcidUtils.Operation getWriteType() { + return writeType; + } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java index 25b91899de..64a8d32988 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/TableDesc.java @@ -184,6 +184,20 @@ public boolean isNonNative() { return (properties.getProperty(hive_metastoreConstants.META_TABLE_STORAGE) != null); } + // This code exact copy of getBucketingVersion defined in metadata Table. + public int getBucketingVersion() { + String versionStr = properties.getProperty(hive_metastoreConstants.TABLE_BUCKETING_VERSION); + int bucketingVersion = 1; + if (versionStr != null) { + try { + bucketingVersion = Integer.parseInt(versionStr); + } catch (NumberFormatException e) { + // Do nothing + } + } + return bucketingVersion; + } + @Override public Object clone() { TableDesc ret = new TableDesc(); diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java index adea3b53a9..97e428408f 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorReduceSinkDesc.java @@ -73,6 +73,7 @@ public VectorReduceSinkInfo getVectorReduceSinkInfo() { private boolean isKeyBinarySortable; private boolean isValueLazyBinary; private boolean isUnexpectedCondition; + private boolean isAcidChange; /* * The following conditions are for native Vector ReduceSink. @@ -143,4 +144,12 @@ public void setIsUnexpectedCondition(boolean isUnexpectedCondition) { public boolean getIsUnexpectedCondition() { return isUnexpectedCondition; } + + public void setIsAcidChange(boolean isAcidChange) { + this.isAcidChange = isAcidChange; + } + + public boolean getIsAcidChange() { + return isAcidChange; + } } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java index 7cd571815d..1a758436fa 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFHash.java @@ -29,6 +29,7 @@ /** * GenericUDF Class for computing hash values. */ +@Deprecated @Description(name = "hash", value = "_FUNC_(a1, a2, ...) - Returns a hash value of the arguments") public class GenericUDFHash extends GenericUDF { private transient ObjectInspector[] argumentOIs; @@ -48,7 +49,7 @@ public Object evaluate(DeferredObject[] arguments) throws HiveException { for(int i = 0; i < arguments.length; i++) { fieldValues[i] = arguments[i].get(); } - int r = ObjectInspectorUtils.getBucketHashCode(fieldValues, argumentOIs); + int r = ObjectInspectorUtils.getBucketHashCodeOld(fieldValues, argumentOIs); result.set(r); return result; } diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMurmurHash.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMurmurHash.java new file mode 100644 index 0000000000..a101795892 --- /dev/null +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFMurmurHash.java @@ -0,0 +1,46 @@ +package org.apache.hadoop.hive.ql.udf.generic; + +import org.apache.hadoop.hive.ql.exec.Description; +import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException; +import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.serde2.ByteStream; +import org.apache.hadoop.hive.serde2.SerDeException; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; +import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; +import org.apache.hadoop.io.IntWritable; +import org.apache.hive.common.util.Murmur3; + +/** + * GenericUDF Class for computing murmurhash values. + */ +@Description(name = "hash", value = "_FUNC_(a1, a2, ...) - Returns a hash value of the arguments") +public class GenericUDFMurmurHash extends GenericUDF { + private transient ObjectInspector[] argumentOIs; + + @Override + public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentTypeException { + + argumentOIs = arguments; + return PrimitiveObjectInspectorFactory.writableIntObjectInspector; + } + + private final IntWritable result = new IntWritable(); + + @Override + public Object evaluate(DeferredObject[] arguments) throws HiveException { + Object[] fieldValues = new Object[arguments.length]; + for(int i = 0; i < arguments.length; i++) { + fieldValues[i] = arguments[i].get(); + } + int r = ObjectInspectorUtils.getBucketHashCode(fieldValues, argumentOIs); + result.set(r); + return result; + } + + @Override + public String getDisplayString(String[] children) { + return getStandardDisplayString("hash", children, ","); + } + +} diff --git a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q index e9616418d8..b2286b542f 100644 --- a/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q +++ b/ql/src/test/queries/clientpositive/archive_excludeHadoop20.q @@ -45,7 +45,7 @@ CREATE TABLE harbucket(key INT) PARTITIONED by (ds STRING) CLUSTERED BY (key) INTO 10 BUCKETS; -INSERT OVERWRITE TABLE harbucket PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key < 50; +INSERT OVERWRITE TABLE harbucket PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key > 50; SELECT key FROM harbucket TABLESAMPLE(BUCKET 1 OUT OF 10) SORT BY key; ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12'); @@ -57,7 +57,7 @@ SELECT key FROM harbucket TABLESAMPLE(BUCKET 1 OUT OF 10) SORT BY key; CREATE TABLE old_name(key INT) PARTITIONED by (ds STRING); -INSERT OVERWRITE TABLE old_name PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key < 50; +INSERT OVERWRITE TABLE old_name PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key > 50; ALTER TABLE old_name ARCHIVE PARTITION (ds='1'); SELECT SUM(hash(col)) FROM (SELECT transform(*) using 'tr "\t" "_"' AS col FROM (SELECT * FROM old_name WHERE ds='1') subq1) subq2; diff --git a/ql/src/test/queries/clientpositive/insert_update_delete.q b/ql/src/test/queries/clientpositive/insert_update_delete.q index fb00346a69..0346ec98c2 100644 --- a/ql/src/test/queries/clientpositive/insert_update_delete.q +++ b/ql/src/test/queries/clientpositive/insert_update_delete.q @@ -2,7 +2,6 @@ set hive.mapred.mode=nonstrict; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_iud select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint < 0 order by cint limit 10; diff --git a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q index ff4cde2c30..3db1563f88 100644 --- a/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q +++ b/ql/src/test/queries/clientpositive/tez_dynpart_hashjoin_3.q @@ -14,8 +14,8 @@ limit 1; set hive.auto.convert.join=true; set hive.optimize.dynamic.partition.hashjoin=true; -set hive.auto.convert.join.noconditionaltask.size=200000; -set hive.exec.reducers.bytes.per.reducer=200000; +set hive.auto.convert.join.noconditionaltask.size=20000; +set hive.exec.reducers.bytes.per.reducer=2000; explain select a.* diff --git a/ql/src/test/results/clientpositive/acid_nullscan.q.out b/ql/src/test/results/clientpositive/acid_nullscan.q.out index d15e2f1bce..c55d789687 100644 --- a/ql/src/test/results/clientpositive/acid_nullscan.q.out +++ b/ql/src/test/results/clientpositive/acid_nullscan.q.out @@ -71,6 +71,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name a + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -92,6 +93,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name a + bucketing_version 2 column.name.delimiter , columns a,b columns.comments diff --git a/ql/src/test/results/clientpositive/alterColumnStats.q.out b/ql/src/test/results/clientpositive/alterColumnStats.q.out index 5b388287f0..0be7ca497f 100644 --- a/ql/src/test/results/clientpositive/alterColumnStats.q.out +++ b/ql/src/test/results/clientpositive/alterColumnStats.q.out @@ -29,6 +29,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -75,6 +76,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 8 @@ -118,6 +120,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"insert_num\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 1 diff --git a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out index 01dd242a3d..c50bbf0b18 100644 --- a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out +++ b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out @@ -32,6 +32,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/alter_file_format.q.out b/ql/src/test/results/clientpositive/alter_file_format.q.out index d134bc1146..e1a75a0889 100644 --- a/ql/src/test/results/clientpositive/alter_file_format.q.out +++ b/ql/src/test/results/clientpositive/alter_file_format.q.out @@ -24,6 +24,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -66,6 +67,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -109,6 +111,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -152,6 +155,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -195,6 +199,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -238,6 +243,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -281,6 +287,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out index 2d6aca5f7a..58d803fd0b 100644 --- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out +++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2_h23.q.out @@ -28,6 +28,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -122,6 +123,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numPartitions 1 @@ -217,6 +219,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 8 numPartitions 1 @@ -312,6 +315,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 8 numPartitions 1 @@ -407,6 +411,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 8 numPartitions 1 @@ -502,6 +507,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 4 numPartitions 1 @@ -597,6 +603,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 4 numPartitions 1 @@ -692,6 +699,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 4 numPartitions 1 @@ -787,6 +795,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 4 numPartitions 1 diff --git a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out index 60d3eba81b..c0861e553b 100644 --- a/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out +++ b/ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table_h23.q.out @@ -36,6 +36,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numPartitions 0 @@ -178,6 +179,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 12 numPartitions 1 @@ -225,6 +227,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 12 numPartitions 1 @@ -310,6 +313,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 12 numPartitions 1 @@ -396,6 +400,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 12 numPartitions 1 @@ -444,6 +449,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 12 numPartitions 1 @@ -492,6 +498,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 12 numPartitions 1 @@ -540,6 +547,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 12 numPartitions 1 diff --git a/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out b/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out index 758dd23b7f..96f6c2ad4b 100644 --- a/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out +++ b/ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out @@ -177,6 +177,7 @@ Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} SORTBUCKETCOLSPREFIX TRUE + bucketing_version 2 numFiles 0 numPartitions 1 numRows 0 diff --git a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out index 361b196fbd..186c3031b8 100644 --- a/ql/src/test/results/clientpositive/alter_partition_coltype.q.out +++ b/ql/src/test/results/clientpositive/alter_partition_coltype.q.out @@ -255,6 +255,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -301,6 +302,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -489,6 +491,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns intcol columns.comments @@ -558,6 +561,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns intcol columns.comments diff --git a/ql/src/test/results/clientpositive/alter_skewed_table.q.out b/ql/src/test/results/clientpositive/alter_skewed_table.q.out index ce4b5093bb..e6a53a97ff 100644 --- a/ql/src/test/results/clientpositive/alter_skewed_table.q.out +++ b/ql/src/test/results/clientpositive/alter_skewed_table.q.out @@ -24,6 +24,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -66,6 +67,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -125,6 +127,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -167,6 +170,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -220,6 +224,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -264,6 +269,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/alter_table_add_partition.q.out b/ql/src/test/results/clientpositive/alter_table_add_partition.q.out index a6275cbc11..949588f5c6 100644 --- a/ql/src/test/results/clientpositive/alter_table_add_partition.q.out +++ b/ql/src/test/results/clientpositive/alter_table_add_partition.q.out @@ -27,6 +27,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -72,6 +73,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 1 numRows 0 @@ -155,6 +157,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numPartitions 1 numRows 1 diff --git a/ql/src/test/results/clientpositive/alter_table_column_stats.q.out b/ql/src/test/results/clientpositive/alter_table_column_stats.q.out index a8ef59c0b8..e7d37f1f00 100644 --- a/ql/src/test/results/clientpositive/alter_table_column_stats.q.out +++ b/ql/src/test/results/clientpositive/alter_table_column_stats.q.out @@ -102,6 +102,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 154 @@ -203,6 +204,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -304,6 +306,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -405,6 +408,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -507,6 +511,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -622,6 +627,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 30 @@ -855,6 +861,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -1090,6 +1097,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -1327,6 +1335,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -1544,6 +1553,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -1738,6 +1748,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -1972,6 +1983,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 154 @@ -2073,6 +2085,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -2174,6 +2187,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -2275,6 +2289,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -2377,6 +2392,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col2\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -2492,6 +2508,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 30 @@ -2725,6 +2742,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -2960,6 +2978,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -3197,6 +3216,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -3414,6 +3434,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -3608,6 +3629,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 diff --git a/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out b/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out index dbd4b7f59e..7e04d44e99 100644 --- a/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out +++ b/ql/src/test/results/clientpositive/alter_table_not_sorted.q.out @@ -25,6 +25,7 @@ Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} SORTBUCKETCOLSPREFIX TRUE + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -68,6 +69,7 @@ Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} SORTBUCKETCOLSPREFIX TRUE + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/alter_table_serde2.q.out b/ql/src/test/results/clientpositive/alter_table_serde2.q.out index 81b1f5b28b..fc82acf7d6 100644 --- a/ql/src/test/results/clientpositive/alter_table_serde2.q.out +++ b/ql/src/test/results/clientpositive/alter_table_serde2.q.out @@ -28,6 +28,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -122,6 +123,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numPartitions 1 diff --git a/ql/src/test/results/clientpositive/alter_view_as_select.q.out b/ql/src/test/results/clientpositive/alter_view_as_select.q.out index 494c9b608d..425b5276db 100644 --- a/ql/src/test/results/clientpositive/alter_view_as_select.q.out +++ b/ql/src/test/results/clientpositive/alter_view_as_select.q.out @@ -36,6 +36,7 @@ Database: tv Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -76,6 +77,7 @@ Database: tv Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -125,6 +127,7 @@ Database: tv Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/alter_view_col_type.q.out b/ql/src/test/results/clientpositive/alter_view_col_type.q.out index 539ea7fa24..c829400eb2 100644 --- a/ql/src/test/results/clientpositive/alter_view_col_type.q.out +++ b/ql/src/test/results/clientpositive/alter_view_col_type.q.out @@ -89,6 +89,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -145,6 +146,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out b/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out index e7151b6ab9..6be0ac996e 100644 --- a/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out +++ b/ql/src/test/results/clientpositive/analyze_table_null_partition.q.out @@ -125,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns name columns.comments @@ -170,6 +171,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns name columns.comments @@ -215,6 +217,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns name columns.comments @@ -260,6 +263,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns name columns.comments diff --git a/ql/src/test/results/clientpositive/analyze_tbl_date.q.out b/ql/src/test/results/clientpositive/analyze_tbl_date.q.out index cc74b53039..6f0b9b4bde 100644 --- a/ql/src/test/results/clientpositive/analyze_tbl_date.q.out +++ b/ql/src/test/results/clientpositive/analyze_tbl_date.q.out @@ -42,6 +42,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"d\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 3 rawDataSize 6 diff --git a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out index 52d17b4576..65b0cdcb5b 100644 --- a/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out +++ b/ql/src/test/results/clientpositive/archive_excludeHadoop20.q.out @@ -196,11 +196,11 @@ CLUSTERED BY (key) INTO 10 BUCKETS POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@harbucket -PREHOOK: query: INSERT OVERWRITE TABLE harbucket PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key < 50 +PREHOOK: query: INSERT OVERWRITE TABLE harbucket PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key > 50 PREHOOK: type: QUERY PREHOOK: Input: default@tstsrc PREHOOK: Output: default@harbucket@ds=1 -POSTHOOK: query: INSERT OVERWRITE TABLE harbucket PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key < 50 +POSTHOOK: query: INSERT OVERWRITE TABLE harbucket PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key > 50 POSTHOOK: type: QUERY POSTHOOK: Input: default@tstsrc POSTHOOK: Output: default@harbucket@ds=1 @@ -215,12 +215,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@harbucket POSTHOOK: Input: default@harbucket@ds=1 #### A masked pattern was here #### -0 -0 -0 -10 -20 -30 +260 PREHOOK: query: ALTER TABLE tstsrcpart ARCHIVE PARTITION (ds='2008-04-08', hr='12') PREHOOK: type: ALTERTABLE_ARCHIVE PREHOOK: Input: default@tstsrcpart @@ -239,12 +234,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@harbucket POSTHOOK: Input: default@harbucket@ds=1 #### A masked pattern was here #### -0 -0 -0 -10 -20 -30 +260 PREHOOK: query: ALTER TABLE tstsrcpart UNARCHIVE PARTITION (ds='2008-04-08', hr='12') PREHOOK: type: ALTERTABLE_UNARCHIVE PREHOOK: Input: default@tstsrcpart @@ -263,12 +253,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@harbucket POSTHOOK: Input: default@harbucket@ds=1 #### A masked pattern was here #### -0 -0 -0 -10 -20 -30 +260 PREHOOK: query: CREATE TABLE old_name(key INT) PARTITIONED by (ds STRING) PREHOOK: type: CREATETABLE @@ -279,11 +264,11 @@ PARTITIONED by (ds STRING) POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@old_name -PREHOOK: query: INSERT OVERWRITE TABLE old_name PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key < 50 +PREHOOK: query: INSERT OVERWRITE TABLE old_name PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key > 50 PREHOOK: type: QUERY PREHOOK: Input: default@tstsrc PREHOOK: Output: default@old_name@ds=1 -POSTHOOK: query: INSERT OVERWRITE TABLE old_name PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key < 50 +POSTHOOK: query: INSERT OVERWRITE TABLE old_name PARTITION(ds='1') SELECT CAST(key AS INT) AS a FROM tstsrc WHERE key > 50 POSTHOOK: type: QUERY POSTHOOK: Input: default@tstsrc POSTHOOK: Output: default@old_name@ds=1 @@ -308,7 +293,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@old_name POSTHOOK: Input: default@old_name@ds=1 #### A masked pattern was here #### -48656137 +20158186837 PREHOOK: query: ALTER TABLE old_name RENAME TO new_name PREHOOK: type: ALTERTABLE_RENAME PREHOOK: Input: default@old_name @@ -330,7 +315,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@new_name POSTHOOK: Input: default@new_name@ds=1 #### A masked pattern was here #### -48656137 +20158186837 PREHOOK: query: drop table tstsrc PREHOOK: type: DROPTABLE PREHOOK: Input: default@tstsrc diff --git a/ql/src/test/results/clientpositive/autoColumnStats_1.q.out b/ql/src/test/results/clientpositive/autoColumnStats_1.q.out index 0a36451e5f..d1ff2de5cd 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_1.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_1.q.out @@ -397,6 +397,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -1013,6 +1014,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/autoColumnStats_10.q.out b/ql/src/test/results/clientpositive/autoColumnStats_10.q.out index 9ae59e6943..6634966edf 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_10.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_10.q.out @@ -29,6 +29,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -75,6 +76,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 8 @@ -118,6 +120,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"insert_num\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 1 @@ -203,6 +206,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"insert_num\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numRows 2 @@ -293,6 +297,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -339,6 +344,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 8 @@ -382,6 +388,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 1 @@ -467,6 +474,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numRows 2 diff --git a/ql/src/test/results/clientpositive/autoColumnStats_2.q.out b/ql/src/test/results/clientpositive/autoColumnStats_2.q.out index a4aebdf4e5..060039b366 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_2.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_2.q.out @@ -1137,6 +1137,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/autoColumnStats_3.q.out b/ql/src/test/results/clientpositive/autoColumnStats_3.q.out index b3d8d3e71a..cae5ebf7ac 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_3.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_3.q.out @@ -135,6 +135,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out index 63caa1730b..7509a36737 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_4.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_4.q.out @@ -24,6 +24,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -194,6 +195,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 1862 transactional true @@ -236,6 +238,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 numFiles 4 totalSize 3012 transactional true diff --git a/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out b/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out index 44f4c719b6..c9b7019938 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_5a.q.out @@ -56,6 +56,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -101,6 +102,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -116,6 +118,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -186,6 +189,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -225,6 +229,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -252,6 +257,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -269,6 +275,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -301,6 +308,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -328,6 +336,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -345,6 +354,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -467,6 +477,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -512,6 +523,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -527,6 +539,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns columns.comments @@ -597,6 +610,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -636,6 +650,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -663,6 +678,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -680,6 +696,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -712,6 +729,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -739,6 +757,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -756,6 +775,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -949,6 +969,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 1 numRows 4 diff --git a/ql/src/test/results/clientpositive/autoColumnStats_8.q.out b/ql/src/test/results/clientpositive/autoColumnStats_8.q.out index 1d7e966a31..2162c3acb0 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_8.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_8.q.out @@ -217,6 +217,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -265,6 +266,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -313,6 +315,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -361,6 +364,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out index 0dfcf048f2..35391ea612 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out @@ -224,6 +224,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 137 numRows 855 rawDataSize 9143 diff --git a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out index 97954bf98c..e66e4022ca 100644 --- a/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out +++ b/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out @@ -143,6 +143,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cityid":"true","date":"true","dealid":"true","time":"true","userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -164,6 +165,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cityid":"true","date":"true","dealid":"true","time":"true","userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -279,6 +281,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cityid":"true","date":"true","dealid":"true","time":"true","userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -300,6 +303,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cityid":"true","date":"true","dealid":"true","time":"true","userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -416,6 +420,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cityid":"true","date":"true","dealid":"true","time":"true","userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -437,6 +442,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cityid":"true","date":"true","dealid":"true","time":"true","userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -553,6 +559,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns userid columns.comments @@ -574,6 +581,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"userid":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns userid columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out index 3ccdb19ca5..d9681ee5d1 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out @@ -178,6 +178,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -227,6 +228,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -375,6 +377,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -424,6 +427,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -549,6 +553,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -655,6 +660,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -704,6 +710,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -752,6 +759,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -838,6 +846,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -886,6 +895,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -992,6 +1002,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1041,6 +1052,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1089,6 +1101,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1204,6 +1217,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1253,6 +1267,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out index a065887606..73bc1bab07 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out @@ -155,6 +155,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -203,6 +204,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -323,6 +325,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -372,6 +375,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -421,6 +425,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -548,6 +553,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -668,6 +674,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -717,6 +724,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -766,6 +774,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -865,6 +874,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -914,6 +924,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -963,6 +974,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1117,6 +1129,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1166,6 +1179,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1310,6 +1324,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1359,6 +1374,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1505,6 +1521,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1554,6 +1571,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out index 96b0016c09..45296f3572 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out @@ -203,6 +203,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -255,6 +256,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -392,6 +394,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -441,6 +444,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -490,6 +494,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -539,6 +544,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -601,6 +607,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -727,6 +734,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -931,6 +939,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1031,6 +1040,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1122,6 +1132,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1170,6 +1181,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1222,6 +1234,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1359,6 +1372,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1408,6 +1422,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1457,6 +1472,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1506,6 +1522,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1564,6 +1581,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1612,6 +1630,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1664,6 +1683,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1801,6 +1821,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1850,6 +1871,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1899,6 +1921,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1948,6 +1971,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2066,6 +2090,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2115,6 +2140,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2164,6 +2190,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2213,6 +2240,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out index 5cfc35aa73..86b3fdd80b 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out @@ -160,6 +160,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -209,6 +210,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -334,6 +336,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -440,6 +443,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -489,6 +493,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -537,6 +542,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -623,6 +629,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -671,6 +678,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -777,6 +785,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -826,6 +835,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -874,6 +884,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -989,6 +1000,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1038,6 +1050,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out index 34959b4f4c..cb1cbbc258 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out @@ -160,6 +160,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -307,6 +308,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -431,6 +433,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -478,6 +481,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -584,6 +588,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -632,6 +637,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -680,6 +686,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -765,6 +772,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -871,6 +879,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -919,6 +928,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -967,6 +977,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1083,6 +1094,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out index 0d586fd26b..9548843d16 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out @@ -176,6 +176,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -323,6 +324,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -447,6 +449,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -494,6 +497,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -600,6 +604,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -648,6 +653,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -696,6 +702,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -781,6 +788,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -887,6 +895,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -935,6 +944,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -983,6 +993,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1099,6 +1110,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out index 45704d1253..90d4b07e8a 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out @@ -116,6 +116,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -138,6 +139,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -256,6 +258,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -278,6 +281,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -431,6 +435,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -453,6 +458,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -494,6 +500,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -613,6 +620,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -635,6 +643,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -676,6 +685,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -768,6 +778,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -790,6 +801,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out index 1959075912..c6afdf9ea6 100644 --- a/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out +++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out @@ -193,6 +193,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -242,6 +243,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -392,6 +394,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -441,6 +444,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -568,6 +572,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -615,6 +620,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -721,6 +727,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -770,6 +777,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -818,6 +826,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -866,6 +875,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -952,6 +962,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1000,6 +1011,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1106,6 +1118,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1155,6 +1168,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1203,6 +1217,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1251,6 +1266,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1367,6 +1383,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1416,6 +1433,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out index b8915078b5..1425919324 100644 --- a/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out +++ b/ql/src/test/results/clientpositive/avro_schema_evolution_native.q.out @@ -102,6 +102,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 7 numPartitions 7 numRows 8 @@ -212,6 +213,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 7 numPartitions 7 diff --git a/ql/src/test/results/clientpositive/basicstat_partval.q.out b/ql/src/test/results/clientpositive/basicstat_partval.q.out index ac75365826..bb318ed409 100644 --- a/ql/src/test/results/clientpositive/basicstat_partval.q.out +++ b/ql/src/test/results/clientpositive/basicstat_partval.q.out @@ -45,6 +45,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 3 diff --git a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out index 43b9399335..7890561d2d 100644 --- a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out +++ b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out @@ -70,6 +70,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: describe formatted escape_comments_tbl1 PREHOOK: type: DESCTABLE @@ -93,6 +94,7 @@ Retention: 0 NULL Table Type: MANAGED_TABLE NULL Table Parameters: NULL NULL COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment a\nb numFiles 0 numPartitions 0 @@ -146,6 +148,7 @@ LastAccessTime: UNKNOWN NULL Retention: 0 NULL Table Type: VIRTUAL_VIEW NULL Table Parameters: NULL NULL + bucketing_version 2 comment a\nb #### A masked pattern was here #### NULL NULL diff --git a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out index 3c3fed7bea..939a7ea115 100644 --- a/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out +++ b/ql/src/test/results/clientpositive/beeline/materialized_view_create_rewrite.q.out @@ -65,6 +65,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 408 @@ -97,6 +98,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view2 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out index 0312b218d3..e1cf75d49c 100644 --- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out +++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_11.q.out @@ -121,6 +121,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -156,6 +157,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -213,6 +215,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1959,6 +1962,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2067,6 +2071,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2101,47 +2106,38 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -17 val_17 1 -33 val_33 1 -65 val_65 1 -97 val_97 1 -97 val_97 1 -113 val_113 1 -113 val_113 1 -129 val_129 1 -129 val_129 1 -145 val_145 1 -177 val_177 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -209 val_209 1 -209 val_209 1 -241 val_241 1 -257 val_257 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -289 val_289 1 -305 val_305 1 +8 val_8 1 +26 val_26 1 +26 val_26 1 +82 val_82 1 +103 val_103 1 +103 val_103 1 +118 val_118 1 +118 val_118 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +176 val_176 1 +176 val_176 1 +194 val_194 1 +275 val_275 1 +280 val_280 1 +280 val_280 1 +282 val_282 1 +282 val_282 1 +309 val_309 1 +309 val_309 1 321 val_321 1 321 val_321 1 -353 val_353 1 -353 val_353 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -449 val_449 1 -481 val_481 1 -497 val_497 1 +400 val_400 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +439 val_439 1 +439 val_439 1 +455 val_455 1 +462 val_462 1 +462 val_462 1 PREHOOK: query: SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16) PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -2152,103 +2148,70 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -497 val_497 1 -481 val_481 1 -449 val_449 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -353 val_353 1 -353 val_353 1 -353 val_353 1 -353 val_353 1 +462 val_462 1 +462 val_462 1 +462 val_462 1 +462 val_462 1 +455 val_455 1 +439 val_439 1 +439 val_439 1 +439 val_439 1 +439 val_439 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +400 val_400 1 321 val_321 1 321 val_321 1 321 val_321 1 321 val_321 1 -305 val_305 1 -289 val_289 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -257 val_257 1 -241 val_241 1 -209 val_209 1 -209 val_209 1 -209 val_209 1 -209 val_209 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -177 val_177 1 -145 val_145 1 -129 val_129 1 -129 val_129 1 -129 val_129 1 -129 val_129 1 -113 val_113 1 -113 val_113 1 -113 val_113 1 -113 val_113 1 -97 val_97 1 -97 val_97 1 -97 val_97 1 -97 val_97 1 -65 val_65 1 -33 val_33 1 -17 val_17 1 +309 val_309 1 +309 val_309 1 +309 val_309 1 +309 val_309 1 +282 val_282 1 +282 val_282 1 +282 val_282 1 +282 val_282 1 +280 val_280 1 +280 val_280 1 +280 val_280 1 +280 val_280 1 +275 val_275 1 +194 val_194 1 +176 val_176 1 +176 val_176 1 +176 val_176 1 +176 val_176 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +118 val_118 1 +118 val_118 1 +118 val_118 1 +118 val_118 1 +103 val_103 1 +103 val_103 1 +103 val_103 1 +103 val_103 1 +82 val_82 1 +26 val_26 1 +26 val_26 1 +26 val_26 1 +26 val_26 1 +8 val_8 1 PREHOOK: query: SELECT COUNT(*) FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16) a JOIN test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16) b ON a.key = b.key AND a.ds = '1' AND b.ds='1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table1 @@ -2263,4 +2226,4 @@ POSTHOOK: Input: default@test_table1@ds=1 POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -293 +140 diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out index 3bc00c8973..f85dcafe05 100644 --- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out +++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_13.q.out @@ -116,6 +116,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -139,6 +140,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -296,6 +298,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -319,6 +322,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/binary_output_format.q.out b/ql/src/test/results/clientpositive/binary_output_format.q.out index 2f72ae9769..5c5867bb95 100644 --- a/ql/src/test/results/clientpositive/binary_output_format.q.out +++ b/ql/src/test/results/clientpositive/binary_output_format.q.out @@ -97,6 +97,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments @@ -144,6 +145,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -165,6 +167,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -234,6 +237,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments @@ -278,6 +282,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments @@ -309,6 +314,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments @@ -331,6 +337,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments @@ -368,6 +375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments @@ -399,6 +407,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments @@ -421,6 +430,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"mydata":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns mydata columns.comments diff --git a/ql/src/test/results/clientpositive/bucket1.q.out b/ql/src/test/results/clientpositive/bucket1.q.out index 3266ab0540..bdbaa0bff7 100644 --- a/ql/src/test/results/clientpositive/bucket1.q.out +++ b/ql/src/test/results/clientpositive/bucket1.q.out @@ -51,6 +51,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -72,6 +73,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -111,6 +113,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 100 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -170,6 +173,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 100 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucket2.q.out b/ql/src/test/results/clientpositive/bucket2.q.out index c57769e266..acf6ee1aca 100644 --- a/ql/src/test/results/clientpositive/bucket2.q.out +++ b/ql/src/test/results/clientpositive/bucket2.q.out @@ -50,6 +50,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -71,6 +72,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -110,6 +112,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -177,6 +180,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -262,66 +266,59 @@ POSTHOOK: query: select * from bucket2_1 tablesample (bucket 1 out of 2) s POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket2_1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 10 val_10 -100 val_100 -100 val_100 -104 val_104 -104 val_104 -114 val_114 +105 val_105 +113 val_113 +113 val_113 116 val_116 -118 val_118 -118 val_118 -12 val_12 -12 val_12 -120 val_120 -120 val_120 +119 val_119 +119 val_119 +119 val_119 126 val_126 -128 val_128 -128 val_128 -128 val_128 +133 val_133 134 val_134 134 val_134 -136 val_136 -138 val_138 -138 val_138 -138 val_138 -138 val_138 +137 val_137 +137 val_137 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 +149 val_149 +149 val_149 +153 val_153 156 val_156 +157 val_157 158 val_158 -160 val_160 162 val_162 +163 val_163 164 val_164 164 val_164 -166 val_166 -168 val_168 -170 val_170 -172 val_172 -172 val_172 -174 val_174 -174 val_174 -176 val_176 -176 val_176 +165 val_165 +165 val_165 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +17 val_17 +177 val_177 178 val_178 -18 val_18 -18 val_18 -180 val_180 -186 val_186 +181 val_181 +187 val_187 +187 val_187 +187 val_187 +19 val_19 190 val_190 -192 val_192 -194 val_194 -196 val_196 +191 val_191 +191 val_191 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +199 val_199 +199 val_199 +199 val_199 2 val_2 20 val_20 -200 val_200 -200 val_200 +201 val_201 202 val_202 208 val_208 208 val_208 @@ -329,70 +326,62 @@ POSTHOOK: Input: default@bucket2_1 214 val_214 216 val_216 216 val_216 -218 val_218 -222 val_222 -224 val_224 -224 val_224 +221 val_221 +221 val_221 226 val_226 -228 val_228 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 +229 val_229 +229 val_229 +233 val_233 +233 val_233 +237 val_237 +237 val_237 238 val_238 238 val_238 -24 val_24 -24 val_24 -242 val_242 -242 val_242 +239 val_239 +239 val_239 244 val_244 248 val_248 +249 val_249 252 val_252 +255 val_255 +255 val_255 256 val_256 256 val_256 -258 val_258 -26 val_26 -26 val_26 260 val_260 -262 val_262 266 val_266 +27 val_27 272 val_272 272 val_272 -274 val_274 -278 val_278 -278 val_278 -28 val_28 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 286 val_286 -288 val_288 -288 val_288 +287 val_287 +289 val_289 +291 val_291 292 val_292 -296 val_296 -298 val_298 -298 val_298 -298 val_298 30 val_30 -302 val_302 -306 val_306 +307 val_307 +307 val_307 308 val_308 310 val_310 +311 val_311 +311 val_311 +311 val_311 +315 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -322 val_322 -322 val_322 +317 val_317 +317 val_317 +325 val_325 +325 val_325 +327 val_327 +327 val_327 +327 val_327 332 val_332 336 val_336 338 val_338 -34 val_34 +339 val_339 +341 val_341 342 val_342 342 val_342 344 val_344 @@ -402,110 +391,121 @@ POSTHOOK: Input: default@bucket2_1 348 val_348 348 val_348 348 val_348 -356 val_356 +351 val_351 +353 val_353 +353 val_353 360 val_360 362 val_362 364 val_364 -366 val_366 +365 val_365 368 val_368 -374 val_374 +369 val_369 +369 val_369 +369 val_369 +377 val_377 378 val_378 -382 val_382 -382 val_382 384 val_384 384 val_384 384 val_384 386 val_386 392 val_392 +393 val_393 394 val_394 396 val_396 396 val_396 396 val_396 -4 val_4 -400 val_400 +397 val_397 +397 val_397 +399 val_399 +399 val_399 402 val_402 404 val_404 404 val_404 -406 val_406 -406 val_406 -406 val_406 -406 val_406 +407 val_407 +409 val_409 +409 val_409 +409 val_409 +41 val_41 +411 val_411 414 val_414 414 val_414 -418 val_418 -42 val_42 -42 val_42 -424 val_424 -424 val_424 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +421 val_421 +427 val_427 +43 val_43 430 val_430 430 val_430 430 val_430 432 val_432 -436 val_436 -438 val_438 -438 val_438 -438 val_438 -44 val_44 +435 val_435 +437 val_437 +443 val_443 444 val_444 446 val_446 -448 val_448 +449 val_449 452 val_452 +453 val_453 454 val_454 454 val_454 454 val_454 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 +459 val_459 +459 val_459 +463 val_463 +463 val_463 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -470 val_470 +467 val_467 472 val_472 478 val_478 478 val_478 +479 val_479 480 val_480 480 val_480 480 val_480 482 val_482 +483 val_483 484 val_484 +485 val_485 490 val_490 -492 val_492 -492 val_492 -494 val_494 -496 val_496 +491 val_491 +495 val_495 +497 val_497 498 val_498 498 val_498 498 val_498 +51 val_51 +51 val_51 54 val_54 +57 val_57 58 val_58 58 val_58 64 val_64 -66 val_66 +65 val_65 +67 val_67 +67 val_67 +69 val_69 70 val_70 70 val_70 70 val_70 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -78 val_78 -8 val_8 +77 val_77 80 val_80 -82 val_82 +83 val_83 +83 val_83 84 val_84 84 val_84 +85 val_85 86 val_86 90 val_90 90 val_90 90 val_90 -92 val_92 96 val_96 +97 val_97 +97 val_97 98 val_98 98 val_98 diff --git a/ql/src/test/results/clientpositive/bucket3.q.out b/ql/src/test/results/clientpositive/bucket3.q.out index a2109ee208..c4e90a265f 100644 --- a/ql/src/test/results/clientpositive/bucket3.q.out +++ b/ql/src/test/results/clientpositive/bucket3.q.out @@ -51,6 +51,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -72,6 +73,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -111,6 +113,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -170,6 +173,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -343,66 +347,59 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket3_1 POSTHOOK: Input: default@bucket3_1@ds=1 #### A masked pattern was here #### -0 val_0 1 -0 val_0 1 -0 val_0 1 10 val_10 1 -100 val_100 1 -100 val_100 1 -104 val_104 1 -104 val_104 1 -114 val_114 1 +105 val_105 1 +113 val_113 1 +113 val_113 1 116 val_116 1 -118 val_118 1 -118 val_118 1 -12 val_12 1 -12 val_12 1 -120 val_120 1 -120 val_120 1 +119 val_119 1 +119 val_119 1 +119 val_119 1 126 val_126 1 -128 val_128 1 -128 val_128 1 -128 val_128 1 +133 val_133 1 134 val_134 1 134 val_134 1 -136 val_136 1 -138 val_138 1 -138 val_138 1 -138 val_138 1 -138 val_138 1 +137 val_137 1 +137 val_137 1 146 val_146 1 146 val_146 1 -150 val_150 1 -152 val_152 1 -152 val_152 1 +149 val_149 1 +149 val_149 1 +153 val_153 1 156 val_156 1 +157 val_157 1 158 val_158 1 -160 val_160 1 162 val_162 1 +163 val_163 1 164 val_164 1 164 val_164 1 -166 val_166 1 -168 val_168 1 -170 val_170 1 -172 val_172 1 -172 val_172 1 -174 val_174 1 -174 val_174 1 -176 val_176 1 -176 val_176 1 +165 val_165 1 +165 val_165 1 +169 val_169 1 +169 val_169 1 +169 val_169 1 +169 val_169 1 +17 val_17 1 +177 val_177 1 178 val_178 1 -18 val_18 1 -18 val_18 1 -180 val_180 1 -186 val_186 1 +181 val_181 1 +187 val_187 1 +187 val_187 1 +187 val_187 1 +19 val_19 1 190 val_190 1 -192 val_192 1 -194 val_194 1 -196 val_196 1 +191 val_191 1 +191 val_191 1 +195 val_195 1 +195 val_195 1 +197 val_197 1 +197 val_197 1 +199 val_199 1 +199 val_199 1 +199 val_199 1 2 val_2 1 20 val_20 1 -200 val_200 1 -200 val_200 1 +201 val_201 1 202 val_202 1 208 val_208 1 208 val_208 1 @@ -410,70 +407,62 @@ POSTHOOK: Input: default@bucket3_1@ds=1 214 val_214 1 216 val_216 1 216 val_216 1 -218 val_218 1 -222 val_222 1 -224 val_224 1 -224 val_224 1 +221 val_221 1 +221 val_221 1 226 val_226 1 -228 val_228 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 +229 val_229 1 +229 val_229 1 +233 val_233 1 +233 val_233 1 +237 val_237 1 +237 val_237 1 238 val_238 1 238 val_238 1 -24 val_24 1 -24 val_24 1 -242 val_242 1 -242 val_242 1 +239 val_239 1 +239 val_239 1 244 val_244 1 248 val_248 1 +249 val_249 1 252 val_252 1 +255 val_255 1 +255 val_255 1 256 val_256 1 256 val_256 1 -258 val_258 1 -26 val_26 1 -26 val_26 1 260 val_260 1 -262 val_262 1 266 val_266 1 +27 val_27 1 272 val_272 1 272 val_272 1 -274 val_274 1 -278 val_278 1 -278 val_278 1 -28 val_28 1 -280 val_280 1 -280 val_280 1 -282 val_282 1 -282 val_282 1 284 val_284 1 286 val_286 1 -288 val_288 1 -288 val_288 1 +287 val_287 1 +289 val_289 1 +291 val_291 1 292 val_292 1 -296 val_296 1 -298 val_298 1 -298 val_298 1 -298 val_298 1 30 val_30 1 -302 val_302 1 -306 val_306 1 +307 val_307 1 +307 val_307 1 308 val_308 1 310 val_310 1 +311 val_311 1 +311 val_311 1 +311 val_311 1 +315 val_315 1 316 val_316 1 316 val_316 1 316 val_316 1 -318 val_318 1 -318 val_318 1 -318 val_318 1 -322 val_322 1 -322 val_322 1 +317 val_317 1 +317 val_317 1 +325 val_325 1 +325 val_325 1 +327 val_327 1 +327 val_327 1 +327 val_327 1 332 val_332 1 336 val_336 1 338 val_338 1 -34 val_34 1 +339 val_339 1 +341 val_341 1 342 val_342 1 342 val_342 1 344 val_344 1 @@ -483,110 +472,121 @@ POSTHOOK: Input: default@bucket3_1@ds=1 348 val_348 1 348 val_348 1 348 val_348 1 -356 val_356 1 +351 val_351 1 +353 val_353 1 +353 val_353 1 360 val_360 1 362 val_362 1 364 val_364 1 -366 val_366 1 +365 val_365 1 368 val_368 1 -374 val_374 1 +369 val_369 1 +369 val_369 1 +369 val_369 1 +377 val_377 1 378 val_378 1 -382 val_382 1 -382 val_382 1 384 val_384 1 384 val_384 1 384 val_384 1 386 val_386 1 392 val_392 1 +393 val_393 1 394 val_394 1 396 val_396 1 396 val_396 1 396 val_396 1 -4 val_4 1 -400 val_400 1 +397 val_397 1 +397 val_397 1 +399 val_399 1 +399 val_399 1 402 val_402 1 404 val_404 1 404 val_404 1 -406 val_406 1 -406 val_406 1 -406 val_406 1 -406 val_406 1 +407 val_407 1 +409 val_409 1 +409 val_409 1 +409 val_409 1 +41 val_41 1 +411 val_411 1 414 val_414 1 414 val_414 1 -418 val_418 1 -42 val_42 1 -42 val_42 1 -424 val_424 1 -424 val_424 1 +417 val_417 1 +417 val_417 1 +417 val_417 1 +419 val_419 1 +421 val_421 1 +427 val_427 1 +43 val_43 1 430 val_430 1 430 val_430 1 430 val_430 1 432 val_432 1 -436 val_436 1 -438 val_438 1 -438 val_438 1 -438 val_438 1 -44 val_44 1 +435 val_435 1 +437 val_437 1 +443 val_443 1 444 val_444 1 446 val_446 1 -448 val_448 1 +449 val_449 1 452 val_452 1 +453 val_453 1 454 val_454 1 454 val_454 1 454 val_454 1 458 val_458 1 458 val_458 1 -460 val_460 1 -462 val_462 1 -462 val_462 1 +459 val_459 1 +459 val_459 1 +463 val_463 1 +463 val_463 1 466 val_466 1 466 val_466 1 466 val_466 1 -468 val_468 1 -468 val_468 1 -468 val_468 1 -468 val_468 1 -470 val_470 1 +467 val_467 1 472 val_472 1 478 val_478 1 478 val_478 1 +479 val_479 1 480 val_480 1 480 val_480 1 480 val_480 1 482 val_482 1 +483 val_483 1 484 val_484 1 +485 val_485 1 490 val_490 1 -492 val_492 1 -492 val_492 1 -494 val_494 1 -496 val_496 1 +491 val_491 1 +495 val_495 1 +497 val_497 1 498 val_498 1 498 val_498 1 498 val_498 1 +51 val_51 1 +51 val_51 1 54 val_54 1 +57 val_57 1 58 val_58 1 58 val_58 1 64 val_64 1 -66 val_66 1 +65 val_65 1 +67 val_67 1 +67 val_67 1 +69 val_69 1 70 val_70 1 70 val_70 1 70 val_70 1 -72 val_72 1 -72 val_72 1 -74 val_74 1 -76 val_76 1 -76 val_76 1 -78 val_78 1 -8 val_8 1 +77 val_77 1 80 val_80 1 -82 val_82 1 +83 val_83 1 +83 val_83 1 84 val_84 1 84 val_84 1 +85 val_85 1 86 val_86 1 90 val_90 1 90 val_90 1 90 val_90 1 -92 val_92 1 96 val_96 1 +97 val_97 1 +97 val_97 1 98 val_98 1 98 val_98 1 diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out index b68e1aa95c..f3f70d4df1 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out @@ -121,6 +121,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -143,6 +144,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out index d1cbe3d9d1..d74fd8b7c7 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out @@ -121,6 +121,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -143,6 +144,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out index 3e917fa725..3e711d5bfe 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark1.q.out @@ -163,6 +163,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -239,6 +240,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -323,6 +325,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -371,6 +374,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -400,6 +404,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -600,6 +605,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -676,6 +682,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -760,6 +767,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -808,6 +816,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -837,6 +846,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out index 4027863d83..2084c90f6a 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark2.q.out @@ -147,6 +147,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -223,6 +224,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -307,6 +309,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -355,6 +358,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -384,6 +388,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -584,6 +589,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -660,6 +666,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -744,6 +751,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -792,6 +800,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -821,6 +830,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out index facb47b706..9f601c9e67 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark3.q.out @@ -147,6 +147,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -223,6 +224,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -307,6 +309,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -355,6 +358,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -384,6 +388,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -584,6 +589,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -660,6 +666,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -744,6 +751,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -792,6 +800,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -821,6 +830,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out index 2cdf28e399..01722649ee 100644 --- a/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out +++ b/ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out @@ -193,6 +193,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -216,6 +217,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -243,6 +245,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -266,6 +269,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -293,6 +297,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -316,6 +321,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -549,6 +555,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -572,6 +579,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -599,6 +607,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -622,6 +631,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -649,6 +659,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -672,6 +683,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out b/ql/src/test/results/clientpositive/bucketcontext_1.q.out index fb9a8e136c..7dc0a1f613 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out @@ -146,6 +146,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -255,6 +256,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -304,6 +306,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -450,6 +453,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -499,6 +503,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out b/ql/src/test/results/clientpositive/bucketcontext_2.q.out index f0ebfaab85..f577e19346 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out @@ -130,6 +130,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -239,6 +240,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -288,6 +290,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -434,6 +437,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -483,6 +487,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out b/ql/src/test/results/clientpositive/bucketcontext_3.q.out index a1fde02b61..5eda44bb64 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out @@ -130,6 +130,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -177,6 +178,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -286,6 +288,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -431,6 +434,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out b/ql/src/test/results/clientpositive/bucketcontext_4.q.out index da30743d84..7dd8e70d7f 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out @@ -146,6 +146,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -193,6 +194,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -302,6 +304,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -447,6 +450,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out b/ql/src/test/results/clientpositive/bucketcontext_5.q.out index cf263be397..61501bef84 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out @@ -147,6 +147,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -169,6 +170,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -285,6 +287,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -307,6 +310,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out b/ql/src/test/results/clientpositive/bucketcontext_6.q.out index 889ef9072e..c761efc766 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out @@ -190,6 +190,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -239,6 +240,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -383,6 +385,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -432,6 +435,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out b/ql/src/test/results/clientpositive/bucketcontext_7.q.out index 81811e770b..2c4aeacf39 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out @@ -163,6 +163,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -210,6 +211,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -319,6 +321,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -368,6 +371,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -516,6 +520,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -565,6 +570,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out b/ql/src/test/results/clientpositive/bucketcontext_8.q.out index ae07508dd8..55a794844b 100644 --- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out +++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out @@ -163,6 +163,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -210,6 +211,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -319,6 +321,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -368,6 +371,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -516,6 +520,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -565,6 +570,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out index 381a691dbf..7fee7c297e 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out @@ -180,6 +180,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -226,6 +227,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -326,6 +328,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -374,6 +377,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out index a2c35d834f..206de5923c 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out @@ -188,6 +188,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -234,6 +235,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -342,6 +344,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -390,6 +393,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -521,6 +525,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -567,6 +572,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -675,6 +681,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -723,6 +730,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out index d58e9590f7..64eb6a2e79 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out @@ -148,6 +148,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -256,6 +257,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -381,6 +383,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -481,6 +484,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out index 406cca455a..416e31675d 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out @@ -117,6 +117,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -218,6 +219,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -267,6 +269,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -397,6 +400,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -506,6 +510,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -641,6 +646,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -750,6 +756,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -885,6 +892,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -994,6 +1002,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out index 1ac8451453..5ed02e7a1a 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out @@ -253,6 +253,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -326,6 +327,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -374,6 +376,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -442,6 +445,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -485,6 +489,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -515,6 +520,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -536,6 +542,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -572,6 +579,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -602,6 +610,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -623,6 +632,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -845,6 +855,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -918,6 +929,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -966,6 +978,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1034,6 +1047,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1077,6 +1091,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1107,6 +1122,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1128,6 +1144,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1164,6 +1181,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1194,6 +1212,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1215,6 +1234,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out index 633d830fe9..d0b1dde5dd 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out @@ -114,6 +114,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -222,6 +223,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -356,6 +358,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -464,6 +467,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out index f8ce494c4a..24a24e99d7 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out @@ -122,6 +122,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -222,6 +223,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -389,6 +391,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -489,6 +492,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out index e209dca1cd..7c560d2df8 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out @@ -125,6 +125,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -193,6 +194,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -241,6 +243,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -262,6 +265,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -331,6 +335,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -374,6 +379,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -404,6 +410,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -425,6 +432,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -461,6 +469,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -491,6 +500,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -512,6 +522,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out index eeb4d3da6b..1260a58a3b 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out @@ -134,6 +134,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -180,6 +181,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -256,6 +258,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -304,6 +307,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -325,6 +329,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -394,6 +399,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -437,6 +443,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -467,6 +474,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -488,6 +496,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -524,6 +533,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -554,6 +564,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -575,6 +586,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out index be6525a418..498837c132 100644 --- a/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out +++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out @@ -242,6 +242,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -264,6 +265,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -390,6 +392,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -412,6 +415,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -530,6 +534,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -552,6 +557,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -670,6 +676,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -692,6 +699,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -810,6 +818,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -832,6 +841,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -950,6 +960,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -972,6 +983,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1090,6 +1102,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1112,6 +1125,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1230,6 +1244,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1252,6 +1267,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1370,6 +1386,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1392,6 +1409,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out index b59c4bc90a..49598d1d2a 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_1.q.out @@ -128,7 +128,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -139,7 +139,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1') SELECT * from @@ -238,7 +238,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -249,7 +249,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '1') SELECT x.key, concat(x.value, x.value) from diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out index 52ef3dbb29..d1c11f4b58 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_3.q.out @@ -120,7 +120,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -131,7 +131,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: CREATE TABLE test_table3 (key INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (value) SORTED BY (value) INTO 2 BUCKETS PREHOOK: type: CREATETABLE diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out index eaf85c384e..72e918fa0e 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out @@ -199,18 +199,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 2 2 val_2val_2 1 -4 4 val_4val_4 1 -8 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -221,6 +210,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +4 4 val_4val_4 1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 @@ -230,6 +229,7 @@ POSTHOOK: Input: default@test_table3@ds=1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 +8 8 val_8val_8 1 9 9 val_9val_9 1 PREHOOK: query: DROP TABLE test_table3 PREHOOK: type: DROPTABLE @@ -408,6 +408,7 @@ POSTHOOK: Input: default@test_table3@ds=1 2 val_2 1 4 val_4 1 8 val_8 1 +9 val_9 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -427,7 +428,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5 1 5 val_5 1 5 val_5 1 -9 val_9 1 PREHOOK: query: DROP TABLE test_table3 PREHOOK: type: DROPTABLE PREHOOK: Input: default@test_table3 diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out index 661114d3a6..775cb91a7b 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out @@ -202,18 +202,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -8 val_8val_8 1 -4 val_4val_4 1 2 val_2val_2 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -225,6 +214,7 @@ POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### 9 val_9val_9 1 +8 val_8val_8 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -234,6 +224,16 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 +4 val_4val_4 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') SELECT a.key, concat(a.value, b.value) @@ -396,18 +396,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -8 val_8val_8 1 -4 val_4val_4 1 2 val_2val_2 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -419,6 +408,7 @@ POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### 9 val_9val_9 1 +8 val_8val_8 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -428,3 +418,13 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 +4 val_4val_4 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 diff --git a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out index dae491ac48..639af48f31 100644 --- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out +++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out @@ -203,18 +203,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 2 2 val_2val_2 1 -4 4 val_4val_4 1 -8 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -225,6 +214,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +4 4 val_4val_4 1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 @@ -234,6 +233,7 @@ POSTHOOK: Input: default@test_table3@ds=1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 +8 8 val_8val_8 1 9 9 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -386,18 +386,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 2 2 val_2val_2 1 -4 4 val_4val_4 1 -8 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -408,6 +397,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +4 4 val_4val_4 1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 @@ -417,4 +416,5 @@ POSTHOOK: Input: default@test_table3@ds=1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 +8 8 val_8val_8 1 9 9 val_9val_9 1 diff --git a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out index ec06e0e6c7..f7123b94cc 100644 --- a/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/cbo_rp_outer_join_ppr.q.out @@ -77,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -98,6 +99,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -148,6 +150,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -196,6 +199,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -375,6 +379,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -396,6 +401,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -446,6 +452,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -494,6 +501,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out index 1a4cf73b32..401c70eaae 100644 --- a/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out +++ b/ql/src/test/results/clientpositive/columnStatsUpdateForStatsOptimizer_2.q.out @@ -38,6 +38,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numRows 3 rawDataSize 24 @@ -82,6 +83,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"year\":\"true\"}} + bucketing_version 2 numFiles 2 numRows 3 rawDataSize 24 @@ -170,6 +172,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numRows 3 @@ -291,6 +294,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out index b327bf8e14..e83a370391 100644 --- a/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out +++ b/ql/src/test/results/clientpositive/column_names_with_leading_and_trailing_spaces.q.out @@ -25,6 +25,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out index a347b01981..196a3f3dae 100644 --- a/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out +++ b/ql/src/test/results/clientpositive/column_pruner_multiple_children.q.out @@ -147,6 +147,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 7 diff --git a/ql/src/test/results/clientpositive/columnstats_infinity.q.out b/ql/src/test/results/clientpositive/columnstats_infinity.q.out index 6b31882b4d..e06ff95133 100644 --- a/ql/src/test/results/clientpositive/columnstats_infinity.q.out +++ b/ql/src/test/results/clientpositive/columnstats_infinity.q.out @@ -98,6 +98,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 1250 @@ -157,6 +158,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c1\":\"true\",\"c10\":\"true\",\"c12\":\"true\",\"c13\":\"true\",\"c15\":\"true\",\"c3\":\"true\",\"c4\":\"true\",\"c6\":\"true\",\"c7\":\"true\",\"c9\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 1250 @@ -276,6 +278,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"b\":\"true\",\"c1\":\"true\",\"c10\":\"true\",\"c11\":\"true\",\"c12\":\"true\",\"c13\":\"true\",\"c14\":\"true\",\"c15\":\"true\",\"c2\":\"true\",\"c3\":\"true\",\"c4\":\"true\",\"c5\":\"true\",\"c6\":\"true\",\"c7\":\"true\",\"c8\":\"true\",\"c9\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 1250 diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out index 7d1b433919..602714bc6d 100644 --- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out +++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out @@ -163,6 +163,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns employeeid,employeename columns.comments @@ -411,6 +412,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns employeeid,employeename columns.comments diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out index 9a9223af5b..6cbcab0447 100644 --- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out +++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out @@ -135,6 +135,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments @@ -156,6 +157,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments @@ -607,6 +609,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments @@ -628,6 +631,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments diff --git a/ql/src/test/results/clientpositive/combine3.q.out b/ql/src/test/results/clientpositive/combine3.q.out index c50816626f..8a38fe3916 100644 --- a/ql/src/test/results/clientpositive/combine3.q.out +++ b/ql/src/test/results/clientpositive/combine3.q.out @@ -170,36 +170,36 @@ POSTHOOK: Input: default@combine_3_srcpart_seq_rc_bucket POSTHOOK: Input: default@combine_3_srcpart_seq_rc_bucket@ds=1 POSTHOOK: Input: default@combine_3_srcpart_seq_rc_bucket@ds=11 #### A masked pattern was here #### -0 1 -0 1 -0 1 -0 11 -0 11 -0 11 2 1 2 11 -4 1 -4 11 -8 1 -8 11 10 1 10 11 -12 1 -12 1 -12 11 -12 11 -18 1 -18 1 -18 11 -18 11 +17 1 +17 11 +19 1 +19 11 20 1 20 11 -24 1 -24 1 -24 11 -24 11 -26 1 -26 1 +27 1 +27 11 +30 1 +30 11 +41 1 +41 11 +43 1 +43 11 +51 1 +51 1 +51 11 +51 11 +54 1 +54 11 +57 1 +57 11 +58 1 +58 1 +58 11 +58 11 PREHOOK: query: drop table combine_3_srcpart_seq_rc_bucket PREHOOK: type: DROPTABLE PREHOOK: Input: default@combine_3_srcpart_seq_rc_bucket diff --git a/ql/src/test/results/clientpositive/comments.q.out b/ql/src/test/results/clientpositive/comments.q.out index 6f2fa28cb9..898d61c4ff 100644 --- a/ql/src/test/results/clientpositive/comments.q.out +++ b/ql/src/test/results/clientpositive/comments.q.out @@ -155,6 +155,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -176,6 +177,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out index 3cca8b8ea2..5619f1980a 100644 --- a/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out +++ b/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out @@ -58,6 +58,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -79,6 +80,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -104,6 +106,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -125,6 +128,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out index e74be6221d..593ae83899 100644 --- a/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out +++ b/ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out @@ -27,6 +27,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -73,6 +74,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -119,6 +121,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -172,6 +175,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -218,6 +222,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -263,6 +268,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/create_like.q.out b/ql/src/test/results/clientpositive/create_like.q.out index 7c26a597a5..c672a98119 100644 --- a/ql/src/test/results/clientpositive/create_like.q.out +++ b/ql/src/test/results/clientpositive/create_like.q.out @@ -24,6 +24,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -373,6 +374,7 @@ Table Parameters: } ] } + bucketing_version 2 k1 v1 k2 v2 #### A masked pattern was here #### @@ -534,6 +536,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out index e324749ffe..675f5c29d6 100644 --- a/ql/src/test/results/clientpositive/create_like_tbl_props.q.out +++ b/ql/src/test/results/clientpositive/create_like_tbl_props.q.out @@ -210,6 +210,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 key value key1 value1 numFiles 0 diff --git a/ql/src/test/results/clientpositive/create_like_view.q.out b/ql/src/test/results/clientpositive/create_like_view.q.out index 25b927bbd3..a955c3f964 100644 --- a/ql/src/test/results/clientpositive/create_like_view.q.out +++ b/ql/src/test/results/clientpositive/create_like_view.q.out @@ -48,6 +48,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -110,6 +111,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -169,6 +171,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -291,6 +294,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/create_or_replace_view.q.out b/ql/src/test/results/clientpositive/create_or_replace_view.q.out index 8383951654..58714340ea 100644 --- a/ql/src/test/results/clientpositive/create_or_replace_view.q.out +++ b/ql/src/test/results/clientpositive/create_or_replace_view.q.out @@ -36,6 +36,7 @@ Database: vt Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -124,6 +125,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 2 numRows 0 @@ -220,6 +222,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -293,6 +296,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -389,6 +393,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/create_skewed_table1.q.out b/ql/src/test/results/clientpositive/create_skewed_table1.q.out index cc647a3eb0..eda8cbdce0 100644 --- a/ql/src/test/results/clientpositive/create_skewed_table1.q.out +++ b/ql/src/test/results/clientpositive/create_skewed_table1.q.out @@ -40,6 +40,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -76,6 +77,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -113,6 +115,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/create_table_like_stats.q.out b/ql/src/test/results/clientpositive/create_table_like_stats.q.out index f88c50cfeb..7740fd7d9b 100644 --- a/ql/src/test/results/clientpositive/create_table_like_stats.q.out +++ b/ql/src/test/results/clientpositive/create_table_like_stats.q.out @@ -136,6 +136,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/create_view.q.out b/ql/src/test/results/clientpositive/create_view.q.out index 9be2f5518c..9016cb26d7 100644 --- a/ql/src/test/results/clientpositive/create_view.q.out +++ b/ql/src/test/results/clientpositive/create_view.q.out @@ -253,6 +253,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -302,6 +303,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -348,6 +350,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 fear factor #### A masked pattern was here #### @@ -397,6 +400,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: biggest loser + bucketing_version 2 fear factor #### A masked pattern was here #### @@ -739,6 +743,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -814,6 +819,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -889,6 +895,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -957,6 +964,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -1030,6 +1038,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -1103,6 +1112,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -1183,6 +1193,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -1212,18 +1223,18 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket POSTHOOK: Input: default@view13 #### A masked pattern was here #### -0 -0 -0 -0 -0 -5 -5 -5 -5 -10 -10 -15 +1 +8 +8 +16 +16 +18 +18 +21 +21 +21 +21 +24 PREHOOK: query: CREATE VIEW view14 AS SELECT unionsrc1.key as k1, unionsrc1.value as v1, unionsrc2.key as k2, unionsrc2.value as v2 @@ -1288,6 +1299,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -1400,6 +1412,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -1482,6 +1495,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/create_view_defaultformats.q.out b/ql/src/test/results/clientpositive/create_view_defaultformats.q.out index 71df2b2dad..b408c6e775 100644 --- a/ql/src/test/results/clientpositive/create_view_defaultformats.q.out +++ b/ql/src/test/results/clientpositive/create_view_defaultformats.q.out @@ -46,6 +46,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -77,6 +78,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/create_view_partitioned.q.out b/ql/src/test/results/clientpositive/create_view_partitioned.q.out index 2cfb815292..a337e86211 100644 --- a/ql/src/test/results/clientpositive/create_view_partitioned.q.out +++ b/ql/src/test/results/clientpositive/create_view_partitioned.q.out @@ -65,6 +65,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -264,6 +265,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -379,6 +381,7 @@ Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/create_view_translate.q.out b/ql/src/test/results/clientpositive/create_view_translate.q.out index 2365a7409e..7c746ea109 100644 --- a/ql/src/test/results/clientpositive/create_view_translate.q.out +++ b/ql/src/test/results/clientpositive/create_view_translate.q.out @@ -32,6 +32,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -79,6 +80,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/create_with_constraints.q.out b/ql/src/test/results/clientpositive/create_with_constraints.q.out index 07435ca573..88976631d7 100644 --- a/ql/src/test/results/clientpositive/create_with_constraints.q.out +++ b/ql/src/test/results/clientpositive/create_with_constraints.q.out @@ -457,6 +457,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -498,6 +499,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -538,6 +540,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -591,6 +594,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -650,6 +654,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -697,6 +702,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -747,6 +753,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -788,6 +795,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -829,6 +837,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -870,6 +879,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -919,6 +929,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -967,6 +978,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1012,6 +1024,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -1055,6 +1068,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1097,6 +1111,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1131,6 +1146,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1165,6 +1181,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1210,6 +1227,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -1253,6 +1271,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1300,6 +1319,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1345,6 +1365,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -1389,6 +1410,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1529,6 +1551,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1562,6 +1585,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1609,6 +1633,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1657,6 +1682,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1698,6 +1724,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1732,6 +1759,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1769,6 +1797,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -1832,6 +1861,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1872,6 +1902,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1925,6 +1956,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x\":\"true\",\"y\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -1975,6 +2007,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -2016,6 +2049,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -2054,6 +2088,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -2114,6 +2149,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -2163,6 +2199,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numPartitions 0 @@ -2214,6 +2251,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -2295,6 +2333,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -2357,6 +2396,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -2403,6 +2443,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -2454,6 +2495,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -2526,6 +2568,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -2600,6 +2643,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\",\"f\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 26 diff --git a/ql/src/test/results/clientpositive/create_with_constraints2.q.out b/ql/src/test/results/clientpositive/create_with_constraints2.q.out index eea74d9c26..9f600b2f34 100644 --- a/ql/src/test/results/clientpositive/create_with_constraints2.q.out +++ b/ql/src/test/results/clientpositive/create_with_constraints2.q.out @@ -54,6 +54,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -95,6 +96,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/ctas.q.out b/ql/src/test/results/clientpositive/ctas.q.out index e65965019d..891ca8d46f 100644 --- a/ql/src/test/results/clientpositive/ctas.q.out +++ b/ql/src/test/results/clientpositive/ctas.q.out @@ -149,6 +149,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 @@ -300,6 +301,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 @@ -451,6 +453,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 120 @@ -514,6 +517,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 120 @@ -666,6 +670,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 diff --git a/ql/src/test/results/clientpositive/ctas_colname.q.out b/ql/src/test/results/clientpositive/ctas_colname.q.out index d2565fce76..9f0cf51f5c 100644 --- a/ql/src/test/results/clientpositive/ctas_colname.q.out +++ b/ql/src/test/results/clientpositive/ctas_colname.q.out @@ -99,6 +99,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 20 rawDataSize 620 @@ -257,6 +258,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 25 rawDataSize 242 @@ -448,6 +450,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 20 rawDataSize 268 @@ -619,6 +622,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 25 rawDataSize 309 @@ -770,6 +774,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 309 rawDataSize 3891 @@ -1204,6 +1209,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 45 @@ -1339,6 +1345,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 35 diff --git a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out index ad4402af76..16194e47ea 100644 --- a/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out +++ b/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out @@ -137,6 +137,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/database_location.q.out b/ql/src/test/results/clientpositive/database_location.q.out index a62ba2e304..13fd01e316 100644 --- a/ql/src/test/results/clientpositive/database_location.q.out +++ b/ql/src/test/results/clientpositive/database_location.q.out @@ -43,6 +43,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"name\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -117,6 +118,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"name\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/decimal_serde.q.out b/ql/src/test/results/clientpositive/decimal_serde.q.out index 43f7ab87a3..fb7432458a 100644 --- a/ql/src/test/results/clientpositive/decimal_serde.q.out +++ b/ql/src/test/results/clientpositive/decimal_serde.q.out @@ -116,6 +116,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 38 rawDataSize 157 @@ -168,6 +169,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 38 rawDataSize 157 diff --git a/ql/src/test/results/clientpositive/default_file_format.q.out b/ql/src/test/results/clientpositive/default_file_format.q.out index 9eb7d2d4b8..11909e15a2 100644 --- a/ql/src/test/results/clientpositive/default_file_format.q.out +++ b/ql/src/test/results/clientpositive/default_file_format.q.out @@ -69,6 +69,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -102,6 +103,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -135,6 +137,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -168,6 +171,7 @@ Retention: 0 Table Type: EXTERNAL_TABLE Table Parameters: EXTERNAL TRUE + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -197,6 +201,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -230,6 +235,7 @@ Retention: 0 Table Type: EXTERNAL_TABLE Table Parameters: EXTERNAL TRUE + bucketing_version 2 numFiles 0 totalSize 0 #### A masked pattern was here #### @@ -363,6 +369,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -396,6 +403,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -429,6 +437,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -462,6 +471,7 @@ Retention: 0 Table Type: EXTERNAL_TABLE Table Parameters: EXTERNAL TRUE + bucketing_version 2 numFiles 0 totalSize 0 #### A masked pattern was here #### @@ -493,6 +503,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -526,6 +537,7 @@ Retention: 0 Table Type: EXTERNAL_TABLE Table Parameters: EXTERNAL TRUE + bucketing_version 2 numFiles 0 totalSize 0 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/deleteAnalyze.q.out index b3ce8bcdf5..be45b7580e 100644 --- a/ql/src/test/results/clientpositive/deleteAnalyze.q.out +++ b/ql/src/test/results/clientpositive/deleteAnalyze.q.out @@ -50,6 +50,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 2 rawDataSize 634 @@ -116,6 +117,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/describe_comment_indent.q.out b/ql/src/test/results/clientpositive/describe_comment_indent.q.out index 8da59495f6..d88ed12639 100644 --- a/ql/src/test/results/clientpositive/describe_comment_indent.q.out +++ b/ql/src/test/results/clientpositive/describe_comment_indent.q.out @@ -56,6 +56,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 comment table comment two lines numFiles 0 diff --git a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out index a4d512737a..8bf2019cda 100644 --- a/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out +++ b/ql/src/test/results/clientpositive/describe_comment_nonascii.q.out @@ -49,6 +49,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"col1\":\"true\",\"col2\":\"true\",\"col3\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/describe_syntax.q.out b/ql/src/test/results/clientpositive/describe_syntax.q.out index a0c6182c3f..79c44dec62 100644 --- a/ql/src/test/results/clientpositive/describe_syntax.q.out +++ b/ql/src/test/results/clientpositive/describe_syntax.q.out @@ -94,6 +94,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 3 numRows 0 @@ -166,6 +167,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 3 numRows 0 diff --git a/ql/src/test/results/clientpositive/describe_table.q.out b/ql/src/test/results/clientpositive/describe_table.q.out index 8f7d0f67f5..23236853ab 100644 --- a/ql/src/test/results/clientpositive/describe_table.q.out +++ b/ql/src/test/results/clientpositive/describe_table.q.out @@ -177,6 +177,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numPartitions 4 numRows 2000 @@ -274,6 +275,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numPartitions 4 numRows 2000 diff --git a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out index c2226f6249..927c27ee93 100644 --- a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out +++ b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out @@ -160,6 +160,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments @@ -181,6 +182,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments diff --git a/ql/src/test/results/clientpositive/druid_basic1.q.out b/ql/src/test/results/clientpositive/druid_basic1.q.out index 25ec0caa31..a5c0687620 100644 --- a/ql/src/test/results/clientpositive/druid_basic1.q.out +++ b/ql/src/test/results/clientpositive/druid_basic1.q.out @@ -41,6 +41,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"__time\":\"true\",\"added\":\"true\",\"anonymous\":\"true\",\"count\":\"true\",\"deleted\":\"true\",\"delta\":\"true\",\"language\":\"true\",\"namespace\":\"true\",\"newpage\":\"true\",\"page\":\"true\",\"robot\":\"true\",\"unpatrolled\":\"true\",\"user\":\"true\",\"variation\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 druid.datasource wikipedia numFiles 0 numRows 0 @@ -102,6 +103,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"__time\":\"true\",\"added\":\"true\",\"anonymous\":\"true\",\"count\":\"true\",\"deleted\":\"true\",\"delta\":\"true\",\"language\":\"true\",\"namespace\":\"true\",\"newpage\":\"true\",\"page\":\"true\",\"robot\":\"true\",\"unpatrolled\":\"true\",\"user\":\"true\",\"variation\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 druid.datasource wikipedia numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/druid_basic2.q.out b/ql/src/test/results/clientpositive/druid_basic2.q.out index eb2b83fec4..b94c304d9d 100644 --- a/ql/src/test/results/clientpositive/druid_basic2.q.out +++ b/ql/src/test/results/clientpositive/druid_basic2.q.out @@ -41,6 +41,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"__time\":\"true\",\"added\":\"true\",\"anonymous\":\"true\",\"count\":\"true\",\"deleted\":\"true\",\"delta\":\"true\",\"language\":\"true\",\"namespace\":\"true\",\"newpage\":\"true\",\"page\":\"true\",\"robot\":\"true\",\"unpatrolled\":\"true\",\"user\":\"true\",\"variation\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 druid.datasource wikipedia numFiles 0 numRows 0 @@ -254,6 +255,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' @@ -280,6 +282,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' @@ -422,6 +425,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' @@ -448,6 +452,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' @@ -569,6 +574,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' @@ -595,6 +601,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' @@ -951,6 +958,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' @@ -975,6 +983,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"__time":"true","added":"true","anonymous":"true","count":"true","deleted":"true","delta":"true","language":"true","namespace":"true","newpage":"true","page":"true","robot":"true","unpatrolled":"true","user":"true","variation":"true"}} EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns __time,robot,namespace,anonymous,unpatrolled,page,language,newpage,user,count,added,delta,variation,deleted columns.comments 'from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer','from deserializer' diff --git a/ql/src/test/results/clientpositive/druid_intervals.q.out b/ql/src/test/results/clientpositive/druid_intervals.q.out index 0a0b1d31dc..b3571b1807 100644 --- a/ql/src/test/results/clientpositive/druid_intervals.q.out +++ b/ql/src/test/results/clientpositive/druid_intervals.q.out @@ -41,6 +41,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"__time\":\"true\",\"added\":\"true\",\"anonymous\":\"true\",\"count\":\"true\",\"deleted\":\"true\",\"delta\":\"true\",\"language\":\"true\",\"namespace\":\"true\",\"newpage\":\"true\",\"page\":\"true\",\"robot\":\"true\",\"unpatrolled\":\"true\",\"user\":\"true\",\"variation\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 druid.datasource wikipedia numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/druid_topn.q.out b/ql/src/test/results/clientpositive/druid_topn.q.out index 7a4c1f9f56..57e71854a4 100644 --- a/ql/src/test/results/clientpositive/druid_topn.q.out +++ b/ql/src/test/results/clientpositive/druid_topn.q.out @@ -41,6 +41,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"__time\":\"true\",\"added\":\"true\",\"anonymous\":\"true\",\"count\":\"true\",\"deleted\":\"true\",\"delta\":\"true\",\"language\":\"true\",\"namespace\":\"true\",\"newpage\":\"true\",\"page\":\"true\",\"robot\":\"true\",\"unpatrolled\":\"true\",\"user\":\"true\",\"variation\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 druid.datasource wikipedia numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out b/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out index b4efaf4511..ee9a4afe54 100644 --- a/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out +++ b/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out @@ -85,6 +85,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns intcol columns.comments @@ -154,6 +155,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns intcol columns.comments @@ -223,6 +225,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns intcol columns.comments @@ -269,6 +272,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns intcol columns.comments diff --git a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out index 5bdc0729c0..80ffad6a6c 100644 --- a/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out +++ b/ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out @@ -598,6 +598,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -620,6 +621,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -646,6 +648,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -668,6 +671,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/escape_comments.q.out b/ql/src/test/results/clientpositive/escape_comments.q.out index 15e0bc33c6..2eacf22667 100644 --- a/ql/src/test/results/clientpositive/escape_comments.q.out +++ b/ql/src/test/results/clientpositive/escape_comments.q.out @@ -70,6 +70,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: describe formatted escape_comments_tbl1 PREHOOK: type: DESCTABLE @@ -94,6 +95,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment a b numFiles 0 @@ -151,6 +153,7 @@ Database: escape_comments_db Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 comment a b #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/exim_hidden_files.q.out b/ql/src/test/results/clientpositive/exim_hidden_files.q.out index e83464c42f..9d92cc7ff2 100644 --- a/ql/src/test/results/clientpositive/exim_hidden_files.q.out +++ b/ql/src/test/results/clientpositive/exim_hidden_files.q.out @@ -73,6 +73,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numPartitions 1 numRows 0 diff --git a/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out b/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out index 25c620bbc5..e2b1dc8973 100644 --- a/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out +++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_date.q.out @@ -155,6 +155,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns d_date columns.comments @@ -200,6 +201,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns d_date columns.comments @@ -245,6 +247,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns d_date columns.comments @@ -290,6 +293,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns d_date columns.comments diff --git a/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out b/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out index deda5a0b04..67506bf0c4 100644 --- a/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out +++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_full.q.out @@ -143,6 +143,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -188,6 +189,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -256,6 +258,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -301,6 +304,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -459,6 +463,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -505,6 +510,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -551,6 +557,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -597,6 +604,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -666,6 +674,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -712,6 +721,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -758,6 +768,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -804,6 +815,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments diff --git a/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out b/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out index a5d172479a..d77286c734 100644 --- a/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out +++ b/ql/src/test/results/clientpositive/extrapolate_part_stats_partial.q.out @@ -169,6 +169,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -214,6 +215,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -259,6 +261,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -304,6 +307,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -372,6 +376,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -417,6 +422,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -462,6 +468,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -507,6 +514,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -603,6 +611,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -648,6 +657,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -693,6 +703,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -738,6 +749,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -806,6 +818,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -851,6 +864,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -896,6 +910,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -941,6 +956,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,zip columns.comments @@ -1092,6 +1108,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1138,6 +1155,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1184,6 +1202,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1230,6 +1249,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1276,6 +1296,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1322,6 +1343,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1368,6 +1390,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1414,6 +1437,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1460,6 +1484,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1506,6 +1531,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1552,6 +1578,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1621,6 +1648,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1667,6 +1695,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1713,6 +1742,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1759,6 +1789,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1805,6 +1836,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1851,6 +1883,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1897,6 +1930,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1943,6 +1977,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -1989,6 +2024,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -2035,6 +2071,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments @@ -2081,6 +2118,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid columns.comments diff --git a/ql/src/test/results/clientpositive/filter_aggr.q.out b/ql/src/test/results/clientpositive/filter_aggr.q.out index 008b7d65cf..ed5aa39fc2 100644 --- a/ql/src/test/results/clientpositive/filter_aggr.q.out +++ b/ql/src/test/results/clientpositive/filter_aggr.q.out @@ -58,6 +58,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -79,6 +80,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out index 884bfcdacc..a2624ef5c9 100644 --- a/ql/src/test/results/clientpositive/filter_join_breaktask.q.out +++ b/ql/src/test/results/clientpositive/filter_join_breaktask.q.out @@ -113,6 +113,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -250,6 +251,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/filter_union.q.out b/ql/src/test/results/clientpositive/filter_union.q.out index 88669da4ca..fcf0e43a77 100644 --- a/ql/src/test/results/clientpositive/filter_union.q.out +++ b/ql/src/test/results/clientpositive/filter_union.q.out @@ -68,6 +68,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -89,6 +90,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -281,6 +283,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -302,6 +305,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out index 85321780f6..f41f121cf1 100644 --- a/ql/src/test/results/clientpositive/fouter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/fouter_join_ppr.q.out @@ -77,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -98,6 +99,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -148,6 +150,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -196,6 +199,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -371,6 +375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -392,6 +397,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -442,6 +448,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -490,6 +497,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -669,6 +677,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -690,6 +699,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -740,6 +750,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -788,6 +799,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -963,6 +975,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -984,6 +997,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1034,6 +1048,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1082,6 +1097,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/groupby_map_ppr.q.out b/ql/src/test/results/clientpositive/groupby_map_ppr.q.out index 1a3d0e6448..1e7265df87 100644 --- a/ql/src/test/results/clientpositive/groupby_map_ppr.q.out +++ b/ql/src/test/results/clientpositive/groupby_map_ppr.q.out @@ -89,6 +89,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -137,6 +138,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -180,6 +182,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments @@ -238,6 +241,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments diff --git a/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out index 02cb101d0a..01edec4a30 100644 --- a/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby_map_ppr_multi_distinct.q.out @@ -89,6 +89,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -137,6 +138,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -180,6 +182,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -238,6 +241,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments diff --git a/ql/src/test/results/clientpositive/groupby_ppr.q.out b/ql/src/test/results/clientpositive/groupby_ppr.q.out index 4cf530e8c5..7e6ecc812a 100644 --- a/ql/src/test/results/clientpositive/groupby_ppr.q.out +++ b/ql/src/test/results/clientpositive/groupby_ppr.q.out @@ -82,6 +82,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -130,6 +131,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -173,6 +175,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments @@ -226,6 +229,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments diff --git a/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out index ff5e74c24c..ba61ce0728 100644 --- a/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/groupby_ppr_multi_distinct.q.out @@ -82,6 +82,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -130,6 +131,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -173,6 +175,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -226,6 +229,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -441,6 +445,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -489,6 +494,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -532,6 +538,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -585,6 +592,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments diff --git a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out index 0982c6d2a0..a6d976f4dd 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out @@ -87,6 +87,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -135,6 +136,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -158,6 +160,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -227,6 +230,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -270,6 +274,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -300,6 +305,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -321,6 +327,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -357,6 +364,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -387,6 +395,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -408,6 +417,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -521,6 +531,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -544,6 +555,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -588,6 +600,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -646,6 +659,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -822,6 +836,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -870,6 +885,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -893,6 +909,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -962,6 +979,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1005,6 +1023,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1035,6 +1054,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1056,6 +1076,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1092,6 +1113,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1122,6 +1144,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1143,6 +1166,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1247,6 +1271,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1295,6 +1320,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1318,6 +1344,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1387,6 +1414,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1430,6 +1458,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1460,6 +1489,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1481,6 +1511,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1517,6 +1548,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1547,6 +1579,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1568,6 +1601,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1680,6 +1714,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1728,6 +1763,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1751,6 +1787,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1820,6 +1857,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1863,6 +1901,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1893,6 +1932,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1914,6 +1954,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1950,6 +1991,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1980,6 +2022,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2001,6 +2044,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2115,6 +2159,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2138,6 +2183,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2182,6 +2228,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -2240,6 +2287,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -2418,6 +2466,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2441,6 +2490,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2485,6 +2535,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2543,6 +2594,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2733,6 +2785,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2756,6 +2809,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2800,6 +2854,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2858,6 +2913,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3046,6 +3102,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3114,6 +3171,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3162,6 +3220,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3185,6 +3244,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3254,6 +3314,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3297,6 +3358,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3327,6 +3389,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3348,6 +3411,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3384,6 +3448,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3414,6 +3479,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3435,6 +3501,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3566,6 +3633,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3589,6 +3657,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3675,6 +3744,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3731,6 +3801,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3801,6 +3872,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3824,6 +3896,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3894,6 +3967,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3937,6 +4011,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3967,6 +4042,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3988,6 +4064,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4024,6 +4101,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4054,6 +4132,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4075,6 +4154,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4224,6 +4304,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4247,6 +4328,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4293,6 +4375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4351,6 +4434,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4539,6 +4623,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4562,6 +4647,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4680,6 +4766,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4703,6 +4790,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4837,6 +4925,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4860,6 +4949,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4904,6 +4994,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4962,6 +5053,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -5136,6 +5228,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5184,6 +5277,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5207,6 +5301,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5276,6 +5371,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5319,6 +5415,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5349,6 +5446,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5370,6 +5468,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5406,6 +5505,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5436,6 +5536,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5457,6 +5558,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5572,6 +5674,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -5620,6 +5723,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5643,6 +5747,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5712,6 +5817,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -5755,6 +5861,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -5785,6 +5892,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -5806,6 +5914,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -5842,6 +5951,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -5872,6 +5982,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -5893,6 +6004,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6007,6 +6119,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6055,6 +6168,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6078,6 +6192,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6147,6 +6262,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6190,6 +6306,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6220,6 +6337,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6241,6 +6359,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6277,6 +6396,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6307,6 +6427,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6328,6 +6449,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6449,6 +6571,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6497,6 +6620,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6520,6 +6644,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6589,6 +6714,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6632,6 +6758,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6662,6 +6789,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6683,6 +6811,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6719,6 +6848,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6749,6 +6879,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6770,6 +6901,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments diff --git a/ql/src/test/results/clientpositive/groupby_sort_6.q.out b/ql/src/test/results/clientpositive/groupby_sort_6.q.out index 83a87ee08c..c2b5067622 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_6.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_6.q.out @@ -84,6 +84,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -142,6 +143,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -337,6 +339,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -395,6 +398,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -586,6 +590,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -628,6 +633,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -686,6 +692,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments diff --git a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out index 4ddc74bb6a..572cc53d8e 100644 --- a/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out +++ b/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out @@ -87,6 +87,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -135,6 +136,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -158,6 +160,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -227,6 +230,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -270,6 +274,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -300,6 +305,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -321,6 +327,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -357,6 +364,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -387,6 +395,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -408,6 +417,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -522,6 +532,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -545,6 +556,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -657,6 +669,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -715,6 +728,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -891,6 +905,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -939,6 +954,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -962,6 +978,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1031,6 +1048,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1074,6 +1092,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1104,6 +1123,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1125,6 +1145,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1161,6 +1182,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1191,6 +1213,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1212,6 +1235,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1316,6 +1340,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1364,6 +1389,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1387,6 +1413,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1456,6 +1483,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1499,6 +1527,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1529,6 +1558,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1550,6 +1580,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1586,6 +1617,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1616,6 +1648,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1637,6 +1670,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1749,6 +1783,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1797,6 +1832,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1820,6 +1856,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1889,6 +1926,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1932,6 +1970,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1962,6 +2001,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1983,6 +2023,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2019,6 +2060,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2049,6 +2091,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2070,6 +2113,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2185,6 +2229,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2208,6 +2253,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2320,6 +2366,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -2378,6 +2425,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -2557,6 +2605,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2580,6 +2629,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2692,6 +2742,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2750,6 +2801,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -2941,6 +2993,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2964,6 +3017,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3076,6 +3130,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3134,6 +3189,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3322,6 +3378,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3390,6 +3447,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3438,6 +3496,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3461,6 +3520,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3530,6 +3590,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3573,6 +3634,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3603,6 +3665,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3624,6 +3687,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3660,6 +3724,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3690,6 +3755,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3711,6 +3777,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3843,6 +3910,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3866,6 +3934,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4020,6 +4089,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4076,6 +4146,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4146,6 +4217,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4169,6 +4241,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4239,6 +4312,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4282,6 +4356,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4312,6 +4387,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4333,6 +4409,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4369,6 +4446,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4399,6 +4477,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4420,6 +4499,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4569,6 +4649,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4592,6 +4673,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4638,6 +4720,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4696,6 +4779,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -4885,6 +4969,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -4908,6 +4993,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5094,6 +5180,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5117,6 +5204,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5252,6 +5340,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5275,6 +5364,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5387,6 +5477,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -5445,6 +5536,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -5619,6 +5711,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5667,6 +5760,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5690,6 +5784,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -5759,6 +5854,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5802,6 +5898,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5832,6 +5929,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5853,6 +5951,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5889,6 +5988,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5919,6 +6019,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -5940,6 +6041,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6055,6 +6157,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6103,6 +6206,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6126,6 +6230,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6195,6 +6300,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6238,6 +6344,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6268,6 +6375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6289,6 +6397,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6325,6 +6434,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6355,6 +6465,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6376,6 +6487,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -6490,6 +6602,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6538,6 +6651,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6561,6 +6675,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -6630,6 +6745,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6673,6 +6789,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6703,6 +6820,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6724,6 +6842,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6760,6 +6879,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6790,6 +6910,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6811,6 +6932,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6932,6 +7054,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -6980,6 +7103,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -7003,6 +7127,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -7072,6 +7197,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -7115,6 +7241,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -7145,6 +7272,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -7166,6 +7294,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -7202,6 +7331,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -7232,6 +7362,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -7253,6 +7384,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments diff --git a/ql/src/test/results/clientpositive/input23.q.out b/ql/src/test/results/clientpositive/input23.q.out index 651bf8cb66..e931c8b629 100644 --- a/ql/src/test/results/clientpositive/input23.q.out +++ b/ql/src/test/results/clientpositive/input23.q.out @@ -83,6 +83,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/input30.q.out b/ql/src/test/results/clientpositive/input30.q.out index 84e4ae4786..c655919867 100644 --- a/ql/src/test/results/clientpositive/input30.q.out +++ b/ql/src/test/results/clientpositive/input30.q.out @@ -122,7 +122,7 @@ POSTHOOK: query: select * from tst_dest30 POSTHOOK: type: QUERY POSTHOOK: Input: default@tst_dest30 #### A masked pattern was here #### -18 +15 PREHOOK: query: explain insert overwrite table dest30 select count(1) from src @@ -230,4 +230,4 @@ POSTHOOK: query: select * from tst_dest30 POSTHOOK: type: QUERY POSTHOOK: Input: default@tst_dest30 #### A masked pattern was here #### -18 +15 diff --git a/ql/src/test/results/clientpositive/input31.q.out b/ql/src/test/results/clientpositive/input31.q.out index 3ba7c5f87f..8f49086980 100644 --- a/ql/src/test/results/clientpositive/input31.q.out +++ b/ql/src/test/results/clientpositive/input31.q.out @@ -124,4 +124,4 @@ POSTHOOK: query: select * from tst_dest31 POSTHOOK: type: QUERY POSTHOOK: Input: default@tst_dest31 #### A masked pattern was here #### -493 +242 diff --git a/ql/src/test/results/clientpositive/input39.q.out b/ql/src/test/results/clientpositive/input39.q.out index 6a5b82de0d..c0c5206dcc 100644 --- a/ql/src/test/results/clientpositive/input39.q.out +++ b/ql/src/test/results/clientpositive/input39.q.out @@ -163,6 +163,6 @@ POSTHOOK: Input: default@t1@ds=1 POSTHOOK: Input: default@t2 POSTHOOK: Input: default@t2@ds=1 #### A masked pattern was here #### -18 +15 mapreduce.framework.name=yarn mapreduce.jobtracker.address=localhost:58 diff --git a/ql/src/test/results/clientpositive/input42.q.out b/ql/src/test/results/clientpositive/input42.q.out index 07dcdfaa17..5d44dd27ac 100644 --- a/ql/src/test/results/clientpositive/input42.q.out +++ b/ql/src/test/results/clientpositive/input42.q.out @@ -43,6 +43,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -89,6 +90,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1172,6 +1174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1218,6 +1221,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1683,6 +1687,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1729,6 +1734,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/input_part1.q.out b/ql/src/test/results/clientpositive/input_part1.q.out index 31f45c290f..9a322d3c17 100644 --- a/ql/src/test/results/clientpositive/input_part1.q.out +++ b/ql/src/test/results/clientpositive/input_part1.q.out @@ -53,6 +53,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -191,6 +193,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -234,6 +237,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -264,6 +268,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -285,6 +290,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -321,6 +327,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -351,6 +358,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -372,6 +380,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments diff --git a/ql/src/test/results/clientpositive/input_part2.q.out b/ql/src/test/results/clientpositive/input_part2.q.out index c8ca522573..0e4c998285 100644 --- a/ql/src/test/results/clientpositive/input_part2.q.out +++ b/ql/src/test/results/clientpositive/input_part2.q.out @@ -66,6 +66,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -122,6 +123,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -204,6 +206,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -252,6 +255,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -320,6 +324,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -363,6 +368,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -393,6 +399,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -414,6 +421,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -450,6 +458,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -480,6 +489,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -501,6 +511,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -538,6 +549,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments diff --git a/ql/src/test/results/clientpositive/input_part7.q.out b/ql/src/test/results/clientpositive/input_part7.q.out index 724f07002d..f6cbda5132 100644 --- a/ql/src/test/results/clientpositive/input_part7.q.out +++ b/ql/src/test/results/clientpositive/input_part7.q.out @@ -108,6 +108,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -156,6 +157,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/input_part9.q.out b/ql/src/test/results/clientpositive/input_part9.q.out index a6aee9984b..d1bd4f93d9 100644 --- a/ql/src/test/results/clientpositive/input_part9.q.out +++ b/ql/src/test/results/clientpositive/input_part9.q.out @@ -43,6 +43,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -89,6 +90,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/join17.q.out b/ql/src/test/results/clientpositive/join17.q.out index e6aac08a05..66dc20003a 100644 --- a/ql/src/test/results/clientpositive/join17.q.out +++ b/ql/src/test/results/clientpositive/join17.q.out @@ -77,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -98,6 +99,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -144,6 +146,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key1":"true","key2":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,value1,key2,value2 columns.comments @@ -202,6 +205,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key1":"true","key2":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,value1,key2,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/join26.q.out b/ql/src/test/results/clientpositive/join26.q.out index 870a735d8e..906f4650b8 100644 --- a/ql/src/test/results/clientpositive/join26.q.out +++ b/ql/src/test/results/clientpositive/join26.q.out @@ -118,6 +118,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -177,6 +178,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -198,6 +200,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -223,6 +226,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -244,6 +248,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -294,6 +299,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -323,6 +329,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/join32.q.out b/ql/src/test/results/clientpositive/join32.q.out index 47c88b82c3..2048bbec91 100644 --- a/ql/src/test/results/clientpositive/join32.q.out +++ b/ql/src/test/results/clientpositive/join32.q.out @@ -65,6 +65,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -171,6 +172,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -230,6 +232,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -251,6 +254,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -276,6 +280,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -297,6 +302,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -347,6 +353,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -376,6 +383,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/join33.q.out b/ql/src/test/results/clientpositive/join33.q.out index 47c88b82c3..2048bbec91 100644 --- a/ql/src/test/results/clientpositive/join33.q.out +++ b/ql/src/test/results/clientpositive/join33.q.out @@ -65,6 +65,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -171,6 +172,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -230,6 +232,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -251,6 +254,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -276,6 +280,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -297,6 +302,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -347,6 +353,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -376,6 +383,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/join34.q.out b/ql/src/test/results/clientpositive/join34.q.out index a28d7606ad..4dd2107be4 100644 --- a/ql/src/test/results/clientpositive/join34.q.out +++ b/ql/src/test/results/clientpositive/join34.q.out @@ -103,6 +103,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -189,6 +190,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -248,6 +250,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -269,6 +272,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -294,6 +298,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -315,6 +320,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -346,6 +352,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/join35.q.out b/ql/src/test/results/clientpositive/join35.q.out index 4a5b10d7af..271339cc43 100644 --- a/ql/src/test/results/clientpositive/join35.q.out +++ b/ql/src/test/results/clientpositive/join35.q.out @@ -73,6 +73,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -94,6 +95,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -199,6 +201,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -275,6 +278,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -378,6 +382,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -399,6 +404,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -430,6 +436,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -563,6 +570,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -584,6 +592,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/join9.q.out b/ql/src/test/results/clientpositive/join9.q.out index 6db5185b20..4372aa2284 100644 --- a/ql/src/test/results/clientpositive/join9.q.out +++ b/ql/src/test/results/clientpositive/join9.q.out @@ -76,6 +76,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -97,6 +98,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -147,6 +149,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -192,6 +195,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -250,6 +254,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/join_filters_overlap.q.out b/ql/src/test/results/clientpositive/join_filters_overlap.q.out index db0b26d174..7d4855ae2d 100644 --- a/ql/src/test/results/clientpositive/join_filters_overlap.q.out +++ b/ql/src/test/results/clientpositive/join_filters_overlap.q.out @@ -92,6 +92,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -113,6 +114,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -283,6 +285,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -304,6 +307,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -474,6 +478,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -495,6 +500,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -682,6 +688,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -703,6 +710,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -889,6 +897,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -910,6 +919,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/join_map_ppr.q.out b/ql/src/test/results/clientpositive/join_map_ppr.q.out index c5acb9b351..b16185e239 100644 --- a/ql/src/test/results/clientpositive/join_map_ppr.q.out +++ b/ql/src/test/results/clientpositive/join_map_ppr.q.out @@ -112,6 +112,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -185,6 +186,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -252,6 +254,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -295,6 +298,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -325,6 +329,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -346,6 +351,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -382,6 +388,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -412,6 +419,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -433,6 +441,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -741,6 +750,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -814,6 +824,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -881,6 +892,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -924,6 +936,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -954,6 +967,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -975,6 +989,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1011,6 +1026,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1041,6 +1057,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1062,6 +1079,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out index 6901a8e85b..e2f18a165d 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_1.q.out @@ -48,6 +48,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -120,6 +121,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -168,6 +170,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -234,6 +237,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -436,6 +440,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out index 872dd14a36..d708fe8a73 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_11.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -99,6 +100,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -120,6 +122,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -187,6 +190,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -319,6 +323,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out index 09d4718a14..83d27c152e 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_12.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1,col2,col3,col4,col5 columns.comments @@ -99,6 +100,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -120,6 +122,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -187,6 +190,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1,col2,col3,col4,col5 columns.comments @@ -327,6 +331,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1,col2,col3,col4,col5 columns.comments @@ -419,6 +424,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1,col2,col3,col4,col5 columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out index becdf67aa6..4d1224bad6 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_13.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1,col2,col3,col4,col5 columns.comments @@ -99,6 +100,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -120,6 +122,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -187,6 +190,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1,col2,col3,col4,col5 columns.comments @@ -327,6 +331,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1,col2,col3,col4,col5 columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out index b6f65409aa..af0347ccdf 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_14.q.out @@ -46,6 +46,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -92,6 +93,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -113,6 +115,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -173,6 +176,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -228,6 +232,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 2 numRows 500 rawDataSize 5312 @@ -335,6 +340,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -356,6 +362,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out index 0280c0253d..fd8de07cc4 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_2.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -238,6 +241,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -392,6 +396,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out index b556890eb0..c75d161012 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_3.q.out @@ -42,6 +42,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -114,6 +115,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -162,6 +164,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -228,6 +231,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -384,6 +388,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out index 7fc96c1a7e..967b84dc42 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_4.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -238,6 +241,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -372,6 +376,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -443,6 +448,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -491,6 +497,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -566,6 +573,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -604,6 +612,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -621,6 +630,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -653,6 +663,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -670,6 +681,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -823,6 +835,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out index f70ffa55f7..d67ec0afeb 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_5.q.out @@ -48,6 +48,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -120,6 +121,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -168,6 +170,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -234,6 +237,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -441,6 +445,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -487,6 +492,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out index 40011a76cc..42afe47d88 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_6.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -238,6 +241,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -417,6 +421,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -489,6 +494,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -537,6 +543,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -612,6 +619,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -651,6 +659,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -669,6 +678,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -702,6 +712,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -720,6 +731,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -919,6 +931,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -965,6 +978,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out index 83d6c3bf11..a325337ac4 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_7.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -238,6 +241,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -417,6 +421,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -489,6 +494,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -537,6 +543,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -612,6 +619,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -651,6 +659,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -669,6 +678,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -702,6 +712,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -720,6 +731,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -919,6 +931,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -965,6 +978,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out index 22096dc591..6b407ad476 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_8.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -238,6 +241,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -491,6 +495,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -536,6 +541,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out index 495934fb39..7afece8807 100644 --- a/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_dml_9.q.out @@ -52,6 +52,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -238,6 +241,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -372,6 +376,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -443,6 +448,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -491,6 +497,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -566,6 +573,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -604,6 +612,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -621,6 +630,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -653,6 +663,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -670,6 +681,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -823,6 +835,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out index 0dc5493929..40455b771e 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out @@ -119,6 +119,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -203,6 +204,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -288,6 +290,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -371,6 +374,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out index 3aefb55a34..54e9009a9f 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out @@ -119,6 +119,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -203,6 +204,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -290,6 +292,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out index 13073f44bf..cdf8339bd4 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out @@ -229,6 +229,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -340,6 +341,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -426,6 +428,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out index bb75940bc4..1868691575 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out @@ -167,6 +167,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x columns.comments @@ -248,6 +249,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x columns.comments @@ -329,6 +331,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out index 54c9b3894c..a1ce3ac36b 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out @@ -170,6 +170,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x,y columns.comments @@ -251,6 +252,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x,y columns.comments @@ -364,6 +366,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x,y columns.comments @@ -499,6 +502,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x,y columns.comments diff --git a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out index cc8d3cef86..7b0e8d4a85 100644 --- a/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out +++ b/ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out @@ -190,6 +190,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns x,y,z columns.comments diff --git a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out index 6a5ace0af6..af22218db0 100644 --- a/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/acid_bucket_pruning.q.out @@ -44,8 +44,8 @@ STAGE PLANS: TableScan alias: acidtbldefault filterExpr: (a = 1) (type: boolean) - buckets included: [1,] of 16 - Statistics: Num rows: 1765 Data size: 6712 Basic stats: COMPLETE Column stats: NONE + buckets included: [13,] of 16 + Statistics: Num rows: 1839 Data size: 6996 Basic stats: COMPLETE Column stats: NONE GatherStats: false Filter Operator isSamplingPred: false @@ -90,6 +90,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name a + bucketing_version 2 column.name.delimiter , columns a columns.comments @@ -101,7 +102,7 @@ STAGE PLANS: serialization.ddl struct acidtbldefault { i32 a} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 33194 + totalSize 34591 transactional true transactional_properties default #### A masked pattern was here #### @@ -112,6 +113,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name a + bucketing_version 2 column.name.delimiter , columns a columns.comments @@ -123,7 +125,7 @@ STAGE PLANS: serialization.ddl struct acidtbldefault { i32 a} serialization.format 1 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde - totalSize 33194 + totalSize 34591 transactional true transactional_properties default #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out index 05d5d0abb3..727bfe43a8 100644 --- a/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out +++ b/ql/src/test/results/clientpositive/llap/acid_vectorization_original.q.out @@ -543,12 +543,12 @@ POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 42 POSTHOOK: type: QUERY POSTHOOK: Input: default@over10k_orc_bucketed #### A masked pattern was here #### -{"writeid":0,"bucketid":536870912,"rowid":36} -3 344 65733 -{"writeid":0,"bucketid":536870912,"rowid":300} -3 344 65733 -{"writeid":0,"bucketid":536936448,"rowid":82} 5 501 65585 -{"writeid":0,"bucketid":536936448,"rowid":344} 5 501 65585 -{"writeid":0,"bucketid":537067520,"rowid":211} 35 463 65646 -{"writeid":0,"bucketid":537067520,"rowid":488} 35 463 65646 +{"writeid":0,"bucketid":536870912,"rowid":104} 5 501 65585 +{"writeid":0,"bucketid":536870912,"rowid":420} 5 501 65585 +{"writeid":0,"bucketid":536936448,"rowid":37} -3 344 65733 +{"writeid":0,"bucketid":536936448,"rowid":295} -3 344 65733 +{"writeid":0,"bucketid":537067520,"rowid":173} 35 463 65646 +{"writeid":0,"bucketid":537067520,"rowid":406} 35 463 65646 PREHOOK: query: explain update over10k_orc_bucketed set i = 0 where b = 4294967363 and t < 100 PREHOOK: type: QUERY POSTHOOK: query: explain update over10k_orc_bucketed set i = 0 where b = 4294967363 and t < 100 @@ -639,10 +639,10 @@ POSTHOOK: query: select ROW__ID, t, si, i from over10k_orc_bucketed where b = 42 POSTHOOK: type: QUERY POSTHOOK: Input: default@over10k_orc_bucketed #### A masked pattern was here #### -{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":0} -3 344 0 -{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":1} -3 344 0 -{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":0} 5 501 0 -{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":1} 5 501 0 +{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":0} 5 501 0 +{"writeid":### Masked writeid ###,"bucketid":536870912,"rowid":1} 5 501 0 +{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":0} -3 344 0 +{"writeid":### Masked writeid ###,"bucketid":536936448,"rowid":1} -3 344 0 {"writeid":### Masked writeid ###,"bucketid":537067520,"rowid":0} 35 463 0 {"writeid":### Masked writeid ###,"bucketid":537067520,"rowid":1} 35 463 0 PREHOOK: query: explain select ROW__ID, count(*) from over10k_orc_bucketed group by ROW__ID having count(*) > 1 @@ -665,22 +665,22 @@ STAGE PLANS: Map Operator Tree: TableScan alias: over10k_orc_bucketed - Statistics: Num rows: 1227 Data size: 702030 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1229 Data size: 703470 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: ROW__ID (type: struct) outputColumnNames: ROW__ID - Statistics: Num rows: 1227 Data size: 702030 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1229 Data size: 703470 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() keys: ROW__ID (type: struct) mode: hash outputColumnNames: _col0, _col1 - Statistics: Num rows: 613 Data size: 51492 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 614 Data size: 51576 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: struct) sort order: + Map-reduce partition columns: _col0 (type: struct) - Statistics: Num rows: 613 Data size: 51492 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 614 Data size: 51576 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: bigint) Execution mode: llap LLAP IO: may be used (ACID table) @@ -692,7 +692,7 @@ STAGE PLANS: keys: KEY._col0 (type: struct) mode: mergepartial outputColumnNames: _col0, _col1 - Statistics: Num rows: 613 Data size: 51492 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 614 Data size: 51576 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (_col1 > 1L) (type: boolean) Statistics: Num rows: 204 Data size: 17136 Basic stats: COMPLETE Column stats: COMPLETE diff --git a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out index c87a0a64f2..c8b831df79 100644 --- a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out +++ b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out @@ -89,6 +89,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 3 numRows 1500 rawDataSize 141000 @@ -139,6 +140,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1500 rawDataSize 141000 diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out index b63022302f..3266fdefd3 100644 --- a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out +++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out @@ -395,6 +395,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -1005,6 +1006,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out index 9ae59e6943..6634966edf 100644 --- a/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out +++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out @@ -29,6 +29,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -75,6 +76,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 8 @@ -118,6 +120,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"insert_num\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 1 @@ -203,6 +206,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"insert_num\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numRows 2 @@ -293,6 +297,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\",\"insert_num\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -339,6 +344,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 8 @@ -382,6 +388,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 1 @@ -467,6 +474,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numRows 2 diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out index 6973ec06bb..f1ae2a5ec0 100644 --- a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out +++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out @@ -1127,6 +1127,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out index 2e02499ebd..daa8d6a15a 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_1.q.out @@ -165,6 +165,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -252,6 +253,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -300,6 +302,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -439,6 +442,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -526,6 +530,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -574,6 +579,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -713,6 +719,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -800,6 +807,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -848,6 +856,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out index e8973a3198..81f9f87b8f 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_11.q.out @@ -175,6 +175,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -253,6 +254,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -302,6 +304,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -465,6 +468,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -552,6 +556,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -600,6 +605,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -735,6 +741,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -818,6 +825,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -866,6 +874,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1001,6 +1010,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1063,6 +1073,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1111,6 +1122,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1197,6 +1209,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1245,6 +1258,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out index 2c7decd16f..5ce2d4057d 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_12.q.out @@ -202,6 +202,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -268,6 +269,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -351,6 +353,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -399,6 +402,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -470,6 +474,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out index 054b0d00be..942738dae1 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_2.q.out @@ -147,6 +147,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -234,6 +235,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -282,6 +284,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -421,6 +424,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -508,6 +512,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -556,6 +561,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out index 5c3fb0fc02..b389dcc639 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_3.q.out @@ -147,6 +147,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -195,6 +196,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -283,6 +285,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -421,6 +424,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -469,6 +473,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -557,6 +562,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -695,6 +701,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -743,6 +750,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -831,6 +839,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out index 95d329862c..612f3ead58 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_4.q.out @@ -163,6 +163,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -211,6 +212,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -299,6 +301,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -437,6 +440,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -485,6 +489,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -573,6 +578,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -711,6 +717,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -759,6 +766,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -847,6 +855,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out index bbe1252b64..c56c82c977 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_5.q.out @@ -103,6 +103,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -125,6 +126,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -189,6 +191,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -211,6 +214,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -320,6 +324,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -342,6 +347,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -406,6 +412,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -428,6 +435,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -537,6 +545,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -559,6 +568,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -623,6 +633,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -645,6 +656,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out index 53c685cb11..b8923760b8 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_7.q.out @@ -180,6 +180,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -228,6 +229,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -316,6 +318,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -364,6 +367,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -505,6 +509,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -553,6 +558,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -641,6 +647,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -689,6 +696,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -830,6 +838,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -878,6 +887,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -966,6 +976,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1014,6 +1025,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out index 80116eca07..4d10634a8c 100644 --- a/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out +++ b/ql/src/test/results/clientpositive/llap/auto_sortmerge_join_8.q.out @@ -180,6 +180,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -228,6 +229,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -316,6 +318,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -364,6 +367,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -505,6 +509,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -553,6 +558,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -641,6 +647,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -689,6 +696,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -830,6 +838,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -878,6 +887,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -966,6 +976,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1014,6 +1025,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucket2.q.out b/ql/src/test/results/clientpositive/llap/bucket2.q.out index 10fc171ae1..e0dce94987 100644 --- a/ql/src/test/results/clientpositive/llap/bucket2.q.out +++ b/ql/src/test/results/clientpositive/llap/bucket2.q.out @@ -59,6 +59,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -80,6 +81,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -121,6 +123,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -191,6 +194,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucket3.q.out b/ql/src/test/results/clientpositive/llap/bucket3.q.out index 9ae5166ded..05404c7de9 100644 --- a/ql/src/test/results/clientpositive/llap/bucket3.q.out +++ b/ql/src/test/results/clientpositive/llap/bucket3.q.out @@ -60,6 +60,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -81,6 +82,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -122,6 +124,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -211,6 +214,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucket4.q.out b/ql/src/test/results/clientpositive/llap/bucket4.q.out index 0a1c49797b..9260877693 100644 --- a/ql/src/test/results/clientpositive/llap/bucket4.q.out +++ b/ql/src/test/results/clientpositive/llap/bucket4.q.out @@ -60,6 +60,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -81,6 +82,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -123,6 +125,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -194,6 +197,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucket5.q.out b/ql/src/test/results/clientpositive/llap/bucket5.q.out index 6649344727..dd5f9a423e 100644 --- a/ql/src/test/results/clientpositive/llap/bucket5.q.out +++ b/ql/src/test/results/clientpositive/llap/bucket5.q.out @@ -93,6 +93,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -115,6 +116,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -158,6 +160,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -246,6 +249,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -330,6 +334,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -369,6 +374,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -426,6 +432,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -457,6 +464,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -479,6 +487,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -519,6 +528,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -550,6 +560,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -572,6 +583,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -637,6 +649,7 @@ Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} SORTBUCKETCOLSPREFIX TRUE + bucketing_version 2 numFiles 2 numRows 500 rawDataSize 5312 @@ -661,16 +674,16 @@ POSTHOOK: query: SELECT * FROM bucketed_table TABLESAMPLE (BUCKET 1 OUT OF 2) s POSTHOOK: type: QUERY POSTHOOK: Input: default@bucketed_table POSTHOOK: Output: hdfs://### HDFS PATH ### -0 val_0 -0 val_0 -0 val_0 -2 val_2 4 val_4 -8 val_8 -10 val_10 12 val_12 12 val_12 -18 val_18 +24 val_24 +24 val_24 +26 val_26 +26 val_26 +30 val_30 +42 val_42 +42 val_42 PREHOOK: query: SELECT * FROM bucketed_table TABLESAMPLE (BUCKET 2 OUT OF 2) s LIMIT 10 PREHOOK: type: QUERY PREHOOK: Input: default@bucketed_table @@ -682,13 +695,13 @@ POSTHOOK: Output: hdfs://### HDFS PATH ### 5 val_5 5 val_5 5 val_5 -9 val_9 11 val_11 -15 val_15 -15 val_15 17 val_17 19 val_19 27 val_27 +41 val_41 +47 val_47 +53 val_53 PREHOOK: query: SELECT COUNT(DISTINCT INPUT__FILE__NAME) FROM bucketed_table PREHOOK: type: QUERY PREHOOK: Input: default@bucketed_table diff --git a/ql/src/test/results/clientpositive/llap/bucket_many.q.out b/ql/src/test/results/clientpositive/llap/bucket_many.q.out index 22027457ed..350cc0d80f 100644 --- a/ql/src/test/results/clientpositive/llap/bucket_many.q.out +++ b/ql/src/test/results/clientpositive/llap/bucket_many.q.out @@ -60,6 +60,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -81,6 +82,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -122,6 +124,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 256 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -204,6 +207,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 256 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out index 61db738021..bbd689a247 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin1.q.out @@ -439,6 +439,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -460,6 +461,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -540,6 +542,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -587,6 +590,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -668,6 +672,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -859,6 +864,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -880,6 +886,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -960,6 +967,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1007,6 +1015,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1088,6 +1097,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out index d6f541db7c..633e6b8a6c 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin2.q.out @@ -176,6 +176,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -254,6 +255,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -301,6 +303,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -382,6 +385,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -602,6 +606,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -680,6 +685,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -727,6 +733,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -808,6 +815,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1045,6 +1053,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1123,6 +1132,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1171,6 +1181,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1219,6 +1230,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1300,6 +1312,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out index e37a618bdc..e73c2af465 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin3.q.out @@ -200,6 +200,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -278,6 +279,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -325,6 +327,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -406,6 +409,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -626,6 +630,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -704,6 +709,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -751,6 +757,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -832,6 +839,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out index c8deac4253..23ef650acc 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin4.q.out @@ -175,6 +175,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -196,6 +197,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -251,6 +253,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -272,6 +275,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -321,6 +325,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -402,6 +407,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -585,6 +591,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -606,6 +613,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -661,6 +669,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -682,6 +691,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -731,6 +741,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -812,6 +823,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out index 1e87e1a423..ad740c8416 100644 --- a/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketmapjoin7.q.out @@ -134,6 +134,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -209,6 +210,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out index 83070e6422..f54f328d64 100644 --- a/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketpruning1.q.out @@ -34,7 +34,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key = 1) (type: boolean) - buckets included: [1,] of 16 + buckets included: [13,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -96,7 +96,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key = 16) (type: boolean) - buckets included: [0,] of 16 + buckets included: [3,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -158,7 +158,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key = 17) (type: boolean) - buckets included: [1,] of 16 + buckets included: [12,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -220,7 +220,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key = 17) (type: boolean) - buckets included: [1,] of 16 + buckets included: [12,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -282,7 +282,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key = 11) (type: boolean) - buckets included: [11,] of 16 + buckets included: [5,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -344,7 +344,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key = 1) and (ds = '2008-04-08')) (type: boolean) - buckets included: [1,] of 16 + buckets included: [13,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -406,7 +406,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key = 1) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) - buckets included: [1,] of 16 + buckets included: [13,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -468,7 +468,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((value = 'One') and (key = 1) and (ds = '2008-04-08')) (type: boolean) - buckets included: [1,] of 16 + buckets included: [13,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -530,7 +530,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key) IN (2, 3) (type: boolean) - buckets included: [2,3,] of 16 + buckets included: [4,6,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -592,7 +592,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key) IN (2, 3) and (ds = '2008-04-08')) (type: boolean) - buckets included: [2,3,] of 16 + buckets included: [4,6,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -654,7 +654,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key) IN (2, 3) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) - buckets included: [2,3,] of 16 + buckets included: [4,6,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -716,7 +716,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key) IN (2, 3) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) - buckets included: [2,3,] of 16 + buckets included: [4,6,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -900,7 +900,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key = -15) (type: boolean) - buckets included: [1,15,] of 16 + buckets included: [6,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -962,6 +962,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: (key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) (type: boolean) + buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -1023,6 +1024,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08')) (type: boolean) + buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -1084,6 +1086,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (ds = '2008-04-08') and (value = 'One')) (type: boolean) + buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator @@ -1145,6 +1148,7 @@ STAGE PLANS: TableScan alias: srcbucket_pruned filterExpr: ((key) IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17) and (value = 'One') and (ds = '2008-04-08')) (type: boolean) + buckets included: [1,3,4,5,6,8,11,12,13,15,] of 16 Statistics: Num rows: 1 Data size: 372 Basic stats: COMPLETE Column stats: PARTIAL GatherStats: false Filter Operator diff --git a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out index 49827b4c5b..79da100543 100644 --- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_2.q.out @@ -252,6 +252,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +4 val_4val_4 1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 @@ -262,7 +263,6 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0 1 0 val_0val_0 1 2 val_2val_2 1 -4 val_4val_4 1 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY @@ -462,6 +462,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +4 val_4val_4 1 +4 val_4val_4 1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 @@ -482,8 +484,6 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0 1 2 val_2val_2 1 2 val_2val_2 1 -4 val_4val_4 1 -4 val_4val_4 1 8 val_8val_8 1 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' @@ -694,6 +694,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +4 val_4val_4 1 +4 val_4val_4 1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 @@ -714,8 +716,6 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0 1 2 val_2val_2 1 2 val_2val_2 1 -4 val_4val_4 1 -4 val_4val_4 1 8 val_8val_8 1 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' @@ -936,6 +936,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +4 val_4val_4 1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 @@ -946,7 +947,6 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0 1 0 val_0val_0 1 2 val_2val_2 1 -4 val_4val_4 1 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY @@ -1156,6 +1156,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +4 val_4val_4val_4val_4 1 0 val_0val_0val_0val_0 1 0 val_0val_0val_0val_0 1 0 val_0val_0val_0val_0 1 @@ -1166,7 +1167,6 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0val_0val_0 1 0 val_0val_0val_0val_0 1 2 val_2val_2val_2val_2 1 -4 val_4val_4val_4val_4 1 8 val_8val_8val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY @@ -1376,6 +1376,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +4 val_2val_2 1 +16 val_8val_8 1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 @@ -1385,7 +1387,6 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 -4 val_2val_2 1 8 val_4val_4 1 10 val_5val_5 1 10 val_5val_5 1 @@ -1396,7 +1397,6 @@ POSTHOOK: Input: default@test_table3@ds=1 10 val_5val_5 1 10 val_5val_5 1 10 val_5val_5 1 -16 val_8val_8 1 18 val_9val_9 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out index 56e93ac12d..9e80eab188 100644 --- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_6.q.out @@ -231,16 +231,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -252,6 +242,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -261,7 +262,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -452,16 +452,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -473,6 +463,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -482,7 +483,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -979,16 +979,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -1000,6 +990,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -1009,7 +1010,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -1212,16 +1212,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -1233,6 +1223,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -1242,7 +1243,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: CREATE TABLE test_table4 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key DESC, key2 DESC) INTO 2 BUCKETS diff --git a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out index da28ae4b93..34890e07ce 100644 --- a/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out +++ b/ql/src/test/results/clientpositive/llap/bucketsortoptimize_insert_7.q.out @@ -232,15 +232,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -251,6 +242,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -448,15 +448,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -467,6 +458,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -668,15 +668,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -687,6 +678,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out index 25ea4cf50b..44e5501f6d 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_rp_views.q.out @@ -50,9 +50,9 @@ POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 POSTHOOK: Input: default@v1 #### A masked pattern was here #### -1 NULL 1 +1 PREHOOK: query: select count(v1.c_int) from v1 join cbo_t2 on v1.c_int = cbo_t2.c_int PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 diff --git a/ql/src/test/results/clientpositive/llap/cbo_views.q.out b/ql/src/test/results/clientpositive/llap/cbo_views.q.out index 25ea4cf50b..44e5501f6d 100644 --- a/ql/src/test/results/clientpositive/llap/cbo_views.q.out +++ b/ql/src/test/results/clientpositive/llap/cbo_views.q.out @@ -50,9 +50,9 @@ POSTHOOK: Input: default@cbo_t1 POSTHOOK: Input: default@cbo_t1@dt=2014 POSTHOOK: Input: default@v1 #### A masked pattern was here #### -1 NULL 1 +1 PREHOOK: query: select count(v1.c_int) from v1 join cbo_t2 on v1.c_int = cbo_t2.c_int PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 diff --git a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out index fb7e872696..4c73fec88f 100644 --- a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out +++ b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out @@ -38,6 +38,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 3 rawDataSize 21 @@ -80,6 +81,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 3 rawDataSize 21 @@ -214,6 +216,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"month\":\"true\",\"year\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 3 rawDataSize 21 @@ -281,6 +284,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numRows 4 rawDataSize 28 @@ -459,6 +463,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"year\":\"true\"}} + bucketing_version 2 numFiles 2 numRows 4 rawDataSize 28 @@ -593,6 +598,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"month\":\"true\",\"year\":\"true\"}} + bucketing_version 2 numFiles 2 numRows 4 rawDataSize 28 @@ -965,6 +971,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 0 rawDataSize 0 @@ -1007,6 +1014,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out index b327bf8e14..e83a370391 100644 --- a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out +++ b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out @@ -25,6 +25,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\" left\":\"true\",\" middle \":\"true\",\"right \":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out index 7f3cc02618..1457932726 100644 --- a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out +++ b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out @@ -35,6 +35,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 0 rawDataSize 0 @@ -102,6 +103,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -122,6 +124,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -211,6 +214,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 @@ -287,6 +291,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 0 @@ -383,6 +388,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -430,6 +436,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -536,6 +543,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 1000 @@ -693,6 +701,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 0 @@ -789,6 +798,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -836,6 +846,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -942,6 +953,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 1000 @@ -1099,6 +1111,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 0 @@ -1195,6 +1208,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1295,6 +1309,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 500 diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out index 2c8e9ab6ed..5ed5dbf96d 100644 --- a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out +++ b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out @@ -38,6 +38,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 170 @@ -106,6 +107,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -127,6 +129,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -215,6 +218,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 170 @@ -290,6 +294,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 2 @@ -383,6 +388,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -427,6 +433,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -532,6 +539,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 2 @@ -688,6 +696,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 2 @@ -781,6 +790,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -881,6 +891,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numPartitions 2 numRows 2 diff --git a/ql/src/test/results/clientpositive/llap/ctas.q.out b/ql/src/test/results/clientpositive/llap/ctas.q.out index 7240da636b..0b85984d64 100644 --- a/ql/src/test/results/clientpositive/llap/ctas.q.out +++ b/ql/src/test/results/clientpositive/llap/ctas.q.out @@ -154,6 +154,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 @@ -310,6 +311,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 @@ -466,6 +468,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 120 @@ -529,6 +532,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 120 @@ -686,6 +690,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 diff --git a/ql/src/test/results/clientpositive/llap/default_constraint.q.out b/ql/src/test/results/clientpositive/llap/default_constraint.q.out index 72ff7af046..9026e5a7b1 100644 --- a/ql/src/test/results/clientpositive/llap/default_constraint.q.out +++ b/ql/src/test/results/clientpositive/llap/default_constraint.q.out @@ -31,6 +31,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 transactional true transactional_properties default #### A masked pattern was here #### @@ -301,6 +302,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -530,6 +532,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 transactional true transactional_properties default #### A masked pattern was here #### @@ -788,6 +791,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 transactional true transactional_properties default #### A masked pattern was here #### @@ -1059,6 +1063,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -1148,10 +1153,10 @@ STAGE PLANS: Select Operator expressions: UDFToInteger(UDFToDouble(4)) (type: int), UDFToBoolean('true') (type: boolean), UDFToInteger(5.67) (type: int), UDFToByte(45) (type: tinyint), UDFToFloat(45.4) (type: float), UDFToLong(567) (type: bigint), UDFToShort(88) (type: smallint), CAST( CURRENT_TIMESTAMP() AS varchar(50)) (type: varchar(50)), UDFToString(CAST( CURRENT_USER() AS varchar(50))) (type: string), CAST( '2016-01-03 12:26:34 America/Los_Angeles' AS timestamp with local time zone) (type: timestamp with local time zone), CAST( '2016-01-01 12:01:01' AS TIMESTAMP) (type: timestamp), CAST( 4.5 AS decimal(8,2)) (type: decimal(8,2)), UDFToDouble(5) (type: double), CAST( col1 AS CHAR(2)) (type: char(2)) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11, _col12, _col13 - Statistics: Num rows: 1 Data size: 523 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 522 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 1 Data size: 523 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 1 Data size: 522 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -1336,6 +1341,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 transactional true transactional_properties default #### A masked pattern was here #### @@ -1491,6 +1497,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 transactional true transactional_properties default #### A masked pattern was here #### @@ -1658,6 +1665,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 #### A masked pattern was here #### transactional true transactional_properties default @@ -1736,6 +1744,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 #### A masked pattern was here #### transactional true transactional_properties default @@ -1911,6 +1920,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 #### A masked pattern was here #### transactional true transactional_properties default @@ -1988,6 +1998,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 #### A masked pattern was here #### transactional true transactional_properties default @@ -2066,6 +2077,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 #### A masked pattern was here #### transactional true transactional_properties default @@ -2253,6 +2265,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -2484,6 +2497,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 transactional true transactional_properties default #### A masked pattern was here #### @@ -2639,6 +2653,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 transactional true transactional_properties default #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out index aeca5184c8..48bc7ace76 100644 --- a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out +++ b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out @@ -50,6 +50,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 2 rawDataSize 634 @@ -116,6 +117,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"amount\":\"true\",\"id\":\"true\",\"item\":\"true\",\"sales_tax\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out index e45d49e602..a5ad10e945 100644 --- a/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out +++ b/ql/src/test/results/clientpositive/llap/disable_merge_for_bucketing.q.out @@ -59,6 +59,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -80,6 +81,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -121,6 +123,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -191,6 +194,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out index f468b90c64..6b890fc688 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_partition_pruning.q.out @@ -32,8 +32,8 @@ 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 #### A masked pattern was here #### -11 12 +11 PREHOOK: query: EXPLAIN create table srcpart_date as select ds as ds, ds as `date` from srcpart group by ds PREHOOK: type: CREATETABLE_AS_SELECT POSTHOOK: query: EXPLAIN create table srcpart_date as select ds as ds, ds as `date` from srcpart group by ds diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out index 3d711c3225..86e41116d2 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_reduction.q.out @@ -1608,6 +1608,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1651,6 +1652,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1742,6 +1744,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,value1 columns.comments @@ -1785,6 +1788,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,value1 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out index af4004efd3..9b73c3440d 100644 --- a/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out +++ b/ql/src/test/results/clientpositive/llap/dynamic_semijoin_user_level.q.out @@ -874,6 +874,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -919,6 +920,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1013,6 +1015,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,value1 columns.comments @@ -1058,6 +1061,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,value1 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out index 97f7cd159f..9e3dc1a5e2 100644 --- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out +++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization_acid.q.out @@ -94,19 +94,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acid_part - Statistics: Num rows: 158 Data size: 60414 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 160 Data size: 60951 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 'foo') (type: boolean) - Statistics: Num rows: 5 Data size: 1911 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ROW__ID (type: struct) outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 1911 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: struct) sort order: + Map-reduce partition columns: UDFToInteger(_col0) (type: int) - Statistics: Num rows: 5 Data size: 1911 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE Execution mode: llap LLAP IO: may be used (ACID table) Reducer 2 @@ -115,10 +115,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: struct), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 5 Data size: 1911 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1911 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1904 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat @@ -189,7 +189,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acid_part - Statistics: Num rows: 157 Data size: 102975 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 158 Data size: 103696 Basic stats: COMPLETE Column stats: PARTIAL Filter Operator predicate: (key = 'foo') (type: boolean) Statistics: Num rows: 5 Data size: 1355 Basic stats: COMPLETE Column stats: PARTIAL @@ -380,19 +380,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acid_part_sdpo - Statistics: Num rows: 174 Data size: 66399 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 176 Data size: 67233 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 'foo') (type: boolean) - Statistics: Num rows: 5 Data size: 1908 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1910 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ROW__ID (type: struct) outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 1908 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1910 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: struct) sort order: + Map-reduce partition columns: UDFToInteger(_col0) (type: int) - Statistics: Num rows: 5 Data size: 1908 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1910 Basic stats: COMPLETE Column stats: NONE Execution mode: llap LLAP IO: may be used (ACID table) Reducer 2 @@ -401,10 +401,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: struct), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string) outputColumnNames: _col0, _col1, _col2, _col3 - Statistics: Num rows: 5 Data size: 1908 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1910 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1908 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1910 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat @@ -475,7 +475,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acid_part_sdpo - Statistics: Num rows: 169 Data size: 110820 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 171 Data size: 112022 Basic stats: COMPLETE Column stats: PARTIAL Filter Operator predicate: (key = 'foo') (type: boolean) Statistics: Num rows: 5 Data size: 1355 Basic stats: COMPLETE Column stats: PARTIAL @@ -675,19 +675,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acid_2l_part - Statistics: Num rows: 154 Data size: 59496 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 157 Data size: 60437 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 'foo') (type: boolean) - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ROW__ID (type: struct) outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: struct) sort order: + Map-reduce partition columns: UDFToInteger(_col0) (type: int) - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE Execution mode: llap LLAP IO: may be used (ACID table) Reducer 2 @@ -696,10 +696,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: struct), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string), 11 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat @@ -1095,19 +1095,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acid_2l_part_sdpo - Statistics: Num rows: 154 Data size: 59496 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 157 Data size: 60437 Basic stats: COMPLETE Column stats: NONE Filter Operator predicate: (key = 'foo') (type: boolean) - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE Select Operator expressions: ROW__ID (type: struct) outputColumnNames: _col0 - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE Reduce Output Operator key expressions: _col0 (type: struct) sort order: + Map-reduce partition columns: UDFToInteger(_col0) (type: int) - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE Execution mode: llap LLAP IO: may be used (ACID table) Reducer 2 @@ -1116,10 +1116,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: struct), 'foo' (type: string), 'bar' (type: string), '2008-04-08' (type: string), 11 (type: int) outputColumnNames: _col0, _col1, _col2, _col3, _col4 - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE File Output Operator compressed: false - Statistics: Num rows: 5 Data size: 1931 Basic stats: COMPLETE Column stats: NONE + Statistics: Num rows: 5 Data size: 1924 Basic stats: COMPLETE Column stats: NONE table: input format: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat @@ -1515,7 +1515,7 @@ STAGE PLANS: Map Operator Tree: TableScan alias: acid_2l_part_sdpo_no_cp - Statistics: Num rows: 95 Data size: 81408 Basic stats: COMPLETE Column stats: PARTIAL + Statistics: Num rows: 96 Data size: 82460 Basic stats: COMPLETE Column stats: PARTIAL Filter Operator predicate: (key = 'foo') (type: boolean) Statistics: Num rows: 5 Data size: 1860 Basic stats: COMPLETE Column stats: PARTIAL diff --git a/ql/src/test/results/clientpositive/llap/explainanalyze_2.q.out b/ql/src/test/results/clientpositive/llap/explainanalyze_2.q.out index 8a6b70daec..6bbb130271 100644 --- a/ql/src/test/results/clientpositive/llap/explainanalyze_2.q.out +++ b/ql/src/test/results/clientpositive/llap/explainanalyze_2.q.out @@ -65,9 +65,9 @@ Stage-0 <-Reducer 11 [CONTAINS] llap Reduce Output Operator [RS_53] PartitionCols:_col0, _col1 - Select Operator [SEL_49] (rows=67/61 width=177) + Select Operator [SEL_49] (rows=67/72 width=177) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_82] (rows=67/61 width=177) + Merge Join Operator [MERGEJOIN_82] (rows=67/72 width=177) Conds:RS_46._col2=RS_47._col0(Inner),Output:["_col1","_col2"] <-Map 17 [SIMPLE_EDGE] llap SHUFFLE [RS_47] @@ -81,7 +81,7 @@ Stage-0 <-Reducer 10 [SIMPLE_EDGE] llap SHUFFLE [RS_46] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_81] (rows=42/52 width=177) + Merge Join Operator [MERGEJOIN_81] (rows=42/61 width=177) Conds:RS_43._col1=RS_44._col1(Inner),Output:["_col1","_col2"] <-Map 9 [SIMPLE_EDGE] llap SHUFFLE [RS_44] @@ -95,9 +95,9 @@ Stage-0 <-Reducer 15 [SIMPLE_EDGE] llap SHUFFLE [RS_43] PartitionCols:_col1 - Select Operator [SEL_36] (rows=525/319 width=178) + Select Operator [SEL_36] (rows=525/338 width=178) Output:["_col1"] - Group By Operator [GBY_35] (rows=525/319 width=178) + Group By Operator [GBY_35] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 14 [SIMPLE_EDGE] <-Map 13 [CONTAINS] llap @@ -121,9 +121,9 @@ Stage-0 <-Reducer 5 [CONTAINS] llap Reduce Output Operator [RS_53] PartitionCols:_col0, _col1 - Select Operator [SEL_24] (rows=67/61 width=177) + Select Operator [SEL_24] (rows=67/72 width=177) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_80] (rows=67/61 width=177) + Merge Join Operator [MERGEJOIN_80] (rows=67/72 width=177) Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col1","_col2"] <-Map 12 [SIMPLE_EDGE] llap SHUFFLE [RS_22] @@ -137,7 +137,7 @@ Stage-0 <-Reducer 4 [SIMPLE_EDGE] llap SHUFFLE [RS_21] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_79] (rows=42/52 width=177) + Merge Join Operator [MERGEJOIN_79] (rows=42/61 width=177) Conds:RS_18._col1=RS_19._col1(Inner),Output:["_col1","_col2"] <-Map 9 [SIMPLE_EDGE] llap SHUFFLE [RS_19] @@ -146,9 +146,9 @@ Stage-0 <-Reducer 3 [SIMPLE_EDGE] llap SHUFFLE [RS_18] PartitionCols:_col1 - Select Operator [SEL_11] (rows=525/319 width=178) + Select Operator [SEL_11] (rows=525/338 width=178) Output:["_col1"] - Group By Operator [GBY_10] (rows=525/319 width=178) + Group By Operator [GBY_10] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 2 [SIMPLE_EDGE] <-Map 1 [CONTAINS] llap @@ -265,9 +265,9 @@ Stage-0 <-Reducer 15 [CONTAINS] llap Reduce Output Operator [RS_111] PartitionCols:_col0, _col1 - Select Operator [SEL_107] (rows=199/61 width=177) + Select Operator [SEL_107] (rows=199/64 width=177) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_162] (rows=199/61 width=177) + Merge Join Operator [MERGEJOIN_162] (rows=199/64 width=177) Conds:RS_104._col2=RS_105._col0(Inner),Output:["_col2","_col5"] <-Map 16 [SIMPLE_EDGE] llap SHUFFLE [RS_105] @@ -281,7 +281,7 @@ Stage-0 <-Reducer 14 [SIMPLE_EDGE] llap SHUFFLE [RS_104] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_161] (rows=123/52 width=86) + Merge Join Operator [MERGEJOIN_161] (rows=123/55 width=86) Conds:RS_101._col1=RS_102._col1(Inner),Output:["_col2"] <-Map 11 [SIMPLE_EDGE] llap SHUFFLE [RS_102] @@ -295,9 +295,9 @@ Stage-0 <-Reducer 31 [SIMPLE_EDGE] llap SHUFFLE [RS_101] PartitionCols:_col1 - Select Operator [SEL_94] (rows=1525/319 width=178) + Select Operator [SEL_94] (rows=1525/375 width=178) Output:["_col1"] - Group By Operator [GBY_93] (rows=1525/319 width=178) + Group By Operator [GBY_93] (rows=1525/375 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 30 [SIMPLE_EDGE] <-Map 34 [CONTAINS] llap @@ -312,9 +312,9 @@ Stage-0 <-Reducer 29 [CONTAINS] llap Reduce Output Operator [RS_92] PartitionCols:_col1, _col0 - Select Operator [SEL_85] (rows=1025/319 width=178) + Select Operator [SEL_85] (rows=1025/375 width=178) Output:["_col0","_col1"] - Group By Operator [GBY_84] (rows=1025/319 width=178) + Group By Operator [GBY_84] (rows=1025/375 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 28 [SIMPLE_EDGE] <-Map 33 [CONTAINS] llap @@ -329,9 +329,9 @@ Stage-0 <-Reducer 27 [CONTAINS] llap Reduce Output Operator [RS_83] PartitionCols:_col1, _col0 - Select Operator [SEL_76] (rows=525/319 width=178) + Select Operator [SEL_76] (rows=525/338 width=178) Output:["_col0","_col1"] - Group By Operator [GBY_75] (rows=525/319 width=178) + Group By Operator [GBY_75] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 26 [SIMPLE_EDGE] <-Map 25 [CONTAINS] llap @@ -361,9 +361,9 @@ Stage-0 <-Reducer 13 [CONTAINS] llap Reduce Output Operator [RS_62] PartitionCols:_col0, _col1 - Select Operator [SEL_58] (rows=132/61 width=177) + Select Operator [SEL_58] (rows=132/64 width=177) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_160] (rows=132/61 width=177) + Merge Join Operator [MERGEJOIN_160] (rows=132/64 width=177) Conds:RS_55._col2=RS_56._col0(Inner),Output:["_col2","_col5"] <-Map 24 [SIMPLE_EDGE] llap SHUFFLE [RS_56] @@ -377,7 +377,7 @@ Stage-0 <-Reducer 12 [SIMPLE_EDGE] llap SHUFFLE [RS_55] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_159] (rows=82/52 width=86) + Merge Join Operator [MERGEJOIN_159] (rows=82/55 width=86) Conds:RS_52._col1=RS_53._col1(Inner),Output:["_col2"] <-Map 11 [SIMPLE_EDGE] llap SHUFFLE [RS_53] @@ -386,9 +386,9 @@ Stage-0 <-Reducer 21 [SIMPLE_EDGE] llap SHUFFLE [RS_52] PartitionCols:_col1 - Select Operator [SEL_45] (rows=1025/319 width=178) + Select Operator [SEL_45] (rows=1025/375 width=178) Output:["_col1"] - Group By Operator [GBY_44] (rows=1025/319 width=178) + Group By Operator [GBY_44] (rows=1025/375 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 20 [SIMPLE_EDGE] <-Map 23 [CONTAINS] llap @@ -403,9 +403,9 @@ Stage-0 <-Reducer 19 [CONTAINS] llap Reduce Output Operator [RS_43] PartitionCols:_col1, _col0 - Select Operator [SEL_36] (rows=525/319 width=178) + Select Operator [SEL_36] (rows=525/338 width=178) Output:["_col0","_col1"] - Group By Operator [GBY_35] (rows=525/319 width=178) + Group By Operator [GBY_35] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 18 [SIMPLE_EDGE] <-Map 17 [CONTAINS] llap @@ -429,9 +429,9 @@ Stage-0 <-Reducer 5 [CONTAINS] llap Reduce Output Operator [RS_62] PartitionCols:_col0, _col1 - Select Operator [SEL_24] (rows=67/61 width=177) + Select Operator [SEL_24] (rows=67/72 width=177) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_158] (rows=67/61 width=177) + Merge Join Operator [MERGEJOIN_158] (rows=67/72 width=177) Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col2","_col5"] <-Map 16 [SIMPLE_EDGE] llap SHUFFLE [RS_22] @@ -440,7 +440,7 @@ Stage-0 <-Reducer 4 [SIMPLE_EDGE] llap SHUFFLE [RS_21] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_157] (rows=42/52 width=86) + Merge Join Operator [MERGEJOIN_157] (rows=42/61 width=86) Conds:RS_18._col1=RS_19._col1(Inner),Output:["_col2"] <-Map 11 [SIMPLE_EDGE] llap SHUFFLE [RS_19] @@ -449,9 +449,9 @@ Stage-0 <-Reducer 3 [SIMPLE_EDGE] llap SHUFFLE [RS_18] PartitionCols:_col1 - Select Operator [SEL_11] (rows=525/319 width=178) + Select Operator [SEL_11] (rows=525/338 width=178) Output:["_col1"] - Group By Operator [GBY_10] (rows=525/319 width=178) + Group By Operator [GBY_10] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 2 [SIMPLE_EDGE] <-Map 1 [CONTAINS] llap @@ -1507,9 +1507,9 @@ Stage-5 <-Reducer 16 [CONTAINS] llap Reduce Output Operator [RS_111] PartitionCols:_col0, _col1 - Select Operator [SEL_107] (rows=192/304 width=175) + Select Operator [SEL_107] (rows=192/316 width=175) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_164] (rows=192/304 width=175) + Merge Join Operator [MERGEJOIN_164] (rows=192/316 width=175) Conds:RS_104._col1=RS_105._col1(Inner),Output:["_col0","_col3"] <-Reducer 15 [SIMPLE_EDGE] llap SHUFFLE [RS_104] @@ -1537,9 +1537,9 @@ Stage-5 <-Reducer 35 [SIMPLE_EDGE] llap SHUFFLE [RS_105] PartitionCols:_col1 - Select Operator [SEL_100] (rows=1525/319 width=178) + Select Operator [SEL_100] (rows=1525/375 width=178) Output:["_col1"] - Group By Operator [GBY_99] (rows=1525/319 width=178) + Group By Operator [GBY_99] (rows=1525/375 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 34 [SIMPLE_EDGE] <-Map 38 [CONTAINS] llap @@ -1554,9 +1554,9 @@ Stage-5 <-Reducer 33 [CONTAINS] llap Reduce Output Operator [RS_98] PartitionCols:_col1, _col0 - Select Operator [SEL_91] (rows=1025/319 width=178) + Select Operator [SEL_91] (rows=1025/375 width=178) Output:["_col0","_col1"] - Group By Operator [GBY_90] (rows=1025/319 width=178) + Group By Operator [GBY_90] (rows=1025/375 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 32 [SIMPLE_EDGE] <-Map 37 [CONTAINS] llap @@ -1571,9 +1571,9 @@ Stage-5 <-Reducer 31 [CONTAINS] llap Reduce Output Operator [RS_89] PartitionCols:_col1, _col0 - Select Operator [SEL_82] (rows=525/319 width=178) + Select Operator [SEL_82] (rows=525/338 width=178) Output:["_col0","_col1"] - Group By Operator [GBY_81] (rows=525/319 width=178) + Group By Operator [GBY_81] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 30 [SIMPLE_EDGE] <-Map 29 [CONTAINS] llap @@ -1603,9 +1603,9 @@ Stage-5 <-Reducer 19 [CONTAINS] llap Reduce Output Operator [RS_62] PartitionCols:_col0, _col1 - Select Operator [SEL_58] (rows=2682/1056 width=178) + Select Operator [SEL_58] (rows=2682/1245 width=178) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_162] (rows=2682/1056 width=178) + Merge Join Operator [MERGEJOIN_162] (rows=2682/1245 width=178) Conds:RS_55._col2=RS_56._col0(Inner),Output:["_col2","_col5"] <-Map 27 [SIMPLE_EDGE] llap SHUFFLE [RS_56] @@ -1619,7 +1619,7 @@ Stage-5 <-Reducer 18 [SIMPLE_EDGE] llap SHUFFLE [RS_55] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_161] (rows=1658/512 width=87) + Merge Join Operator [MERGEJOIN_161] (rows=1658/607 width=87) Conds:RS_52._col1=RS_53._col1(Inner),Output:["_col2"] <-Map 17 [SIMPLE_EDGE] llap SHUFFLE [RS_53] @@ -1633,9 +1633,9 @@ Stage-5 <-Reducer 24 [SIMPLE_EDGE] llap SHUFFLE [RS_52] PartitionCols:_col1 - Select Operator [SEL_45] (rows=1025/319 width=178) + Select Operator [SEL_45] (rows=1025/375 width=178) Output:["_col1"] - Group By Operator [GBY_44] (rows=1025/319 width=178) + Group By Operator [GBY_44] (rows=1025/375 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 23 [SIMPLE_EDGE] <-Map 26 [CONTAINS] llap @@ -1650,9 +1650,9 @@ Stage-5 <-Reducer 22 [CONTAINS] llap Reduce Output Operator [RS_43] PartitionCols:_col1, _col0 - Select Operator [SEL_36] (rows=525/319 width=178) + Select Operator [SEL_36] (rows=525/338 width=178) Output:["_col0","_col1"] - Group By Operator [GBY_35] (rows=525/319 width=178) + Group By Operator [GBY_35] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 21 [SIMPLE_EDGE] <-Map 20 [CONTAINS] llap @@ -1676,9 +1676,9 @@ Stage-5 <-Reducer 5 [CONTAINS] llap Reduce Output Operator [RS_62] PartitionCols:_col0, _col1 - Select Operator [SEL_24] (rows=67/61 width=177) + Select Operator [SEL_24] (rows=67/72 width=177) Output:["_col0","_col1"] - Merge Join Operator [MERGEJOIN_160] (rows=67/61 width=177) + Merge Join Operator [MERGEJOIN_160] (rows=67/72 width=177) Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col2","_col5"] <-Map 17 [SIMPLE_EDGE] llap SHUFFLE [RS_22] @@ -1691,7 +1691,7 @@ Stage-5 <-Reducer 4 [SIMPLE_EDGE] llap SHUFFLE [RS_21] PartitionCols:_col2 - Merge Join Operator [MERGEJOIN_159] (rows=42/52 width=86) + Merge Join Operator [MERGEJOIN_159] (rows=42/61 width=86) Conds:RS_18._col1=RS_19._col1(Inner),Output:["_col2"] <-Map 14 [SIMPLE_EDGE] llap SHUFFLE [RS_19] @@ -1700,9 +1700,9 @@ Stage-5 <-Reducer 3 [SIMPLE_EDGE] llap SHUFFLE [RS_18] PartitionCols:_col1 - Select Operator [SEL_11] (rows=525/319 width=178) + Select Operator [SEL_11] (rows=525/338 width=178) Output:["_col1"] - Group By Operator [GBY_10] (rows=525/319 width=178) + Group By Operator [GBY_10] (rows=525/338 width=178) Output:["_col0","_col1"],keys:KEY._col0, KEY._col1 <-Union 2 [SIMPLE_EDGE] <-Map 1 [CONTAINS] llap diff --git a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out index c4fdc18136..7b552468a0 100644 --- a/ql/src/test/results/clientpositive/llap/explainuser_4.q.out +++ b/ql/src/test/results/clientpositive/llap/explainuser_4.q.out @@ -232,10 +232,10 @@ order by c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### --8915 1 --3799 1 10782 1 -13036 1 +-8915 1 +-3799 1 NULL 6 PREHOOK: query: explain select @@ -471,10 +471,10 @@ order by c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### --8915 1 --3799 1 10782 1 -13036 1 +-8915 1 +-3799 1 NULL 6 Warning: Shuffle Join MERGEJOIN[9][tables = [$hdt$_0, $hdt$_1]] in Stage 'Reducer 2' is a cross product PREHOOK: query: explain diff --git a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out index aa44d33420..2b1ec3c326 100644 --- a/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out +++ b/ql/src/test/results/clientpositive/llap/extrapolate_part_stats_partial_ndv.q.out @@ -293,6 +293,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -338,6 +339,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -383,6 +385,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -428,6 +431,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -666,6 +670,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -711,6 +716,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -756,6 +762,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -801,6 +808,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt,zip columns.comments @@ -1075,6 +1083,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1121,6 +1130,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1167,6 +1177,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1213,6 +1224,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1259,6 +1271,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1305,6 +1318,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1351,6 +1365,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1397,6 +1412,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1443,6 +1459,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1489,6 +1506,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments @@ -1535,6 +1553,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns state,locid,cnt columns.comments diff --git a/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out index f69d8a2ae0..5c6dd26b8e 100644 --- a/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out +++ b/ql/src/test/results/clientpositive/llap/filter_join_breaktask.q.out @@ -100,6 +100,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -177,6 +178,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -253,6 +255,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/filter_union.q.out b/ql/src/test/results/clientpositive/llap/filter_union.q.out index 0aab9e0a0e..813f49b828 100644 --- a/ql/src/test/results/clientpositive/llap/filter_union.q.out +++ b/ql/src/test/results/clientpositive/llap/filter_union.q.out @@ -75,6 +75,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -96,6 +97,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -153,6 +155,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -174,6 +177,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/llap/groupby3.q.out b/ql/src/test/results/clientpositive/llap/groupby3.q.out index 05b5bfddc7..bcd2c39ddd 100644 --- a/ql/src/test/results/clientpositive/llap/groupby3.q.out +++ b/ql/src/test/results/clientpositive/llap/groupby3.q.out @@ -192,4 +192,4 @@ POSTHOOK: query: SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -130091.0 260.182 256.10355987055016 98.0 0.0 142.92680950752379 143.06995106518903 20428.07287599999 20469.010897795582 +130091.0 260.182 256.10355987055016 98.0 0.0 142.9268095075238 143.06995106518906 20428.072876000002 20469.010897795593 diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out index 1520232a10..cab1caeb0d 100644 --- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out +++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out @@ -67,7 +67,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 #### A masked pattern was here #### -31 +101 PREHOOK: query: SELECT COUNT(*) FROM test_table_bucketed TABLESAMPLE (BUCKET 2 OUT OF 3) WHERE part = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table_bucketed @@ -78,7 +78,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 #### A masked pattern was here #### -179 +4 PREHOOK: query: SELECT COUNT(*) FROM test_table_bucketed TABLESAMPLE (BUCKET 3 OUT OF 3) WHERE part = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table_bucketed @@ -89,7 +89,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 #### A masked pattern was here #### -99 +204 PREHOOK: query: SELECT cnt FROM (SELECT INPUT__FILE__NAME, COUNT(*) cnt FROM test_table_bucketed WHERE part = '1' GROUP BY INPUT__FILE__NAME ORDER BY INPUT__FILE__NAME ASC LIMIT 3) a PREHOOK: type: QUERY @@ -102,6 +102,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 #### A masked pattern was here #### -31 -179 -99 +101 +4 +204 diff --git a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out index f8622dae76..927fa876b5 100644 --- a/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out +++ b/ql/src/test/results/clientpositive/llap/join32_lessSize.q.out @@ -90,6 +90,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -111,6 +112,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -166,6 +168,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -187,6 +190,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -266,6 +270,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -313,6 +318,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -394,6 +400,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -616,6 +623,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -637,6 +645,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -692,6 +701,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -713,6 +723,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -767,6 +778,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -788,6 +800,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -843,6 +856,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -864,6 +878,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -935,6 +950,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1016,6 +1032,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1245,6 +1262,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1314,6 +1332,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1335,6 +1354,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1390,6 +1410,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1411,6 +1432,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1460,6 +1482,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1541,6 +1564,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1772,6 +1796,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1820,6 +1845,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1841,6 +1867,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1896,6 +1923,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1917,6 +1945,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1966,6 +1995,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -2073,6 +2103,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/lateral_view.q.out b/ql/src/test/results/clientpositive/llap/lateral_view.q.out index 20e44374ca..b28f6e377c 100644 --- a/ql/src/test/results/clientpositive/llap/lateral_view.q.out +++ b/ql/src/test/results/clientpositive/llap/lateral_view.q.out @@ -716,16 +716,16 @@ LATERAL VIEW explode(value) myTable AS myCol POSTHOOK: type: QUERY POSTHOOK: Input: default@tmp_pyang_src_rcfile #### A masked pattern was here #### +["val_116"] val_116 +["val_118"] val_118 ["val_0"] val_0 -["val_10"] val_10 +["val_100"] val_100 +["val_103"] val_103 ["val_104"] val_104 +["val_11"] val_11 +["val_114"] val_114 +["val_10"] val_10 ["val_105"] val_105 ["val_111"] val_111 ["val_113"] val_113 -["val_114"] val_114 -["val_116"] val_116 ["val_119"] val_119 -["val_103"] val_103 -["val_100"] val_100 -["val_11"] val_11 -["val_118"] val_118 diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out index 2bf96d0aae..5e9d191885 100644 --- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out +++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out @@ -59,6 +59,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -108,6 +109,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -129,6 +131,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -201,6 +204,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out b/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out index 911b65a56d..aa0e6e4d7d 100644 --- a/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out +++ b/ql/src/test/results/clientpositive/llap/llap_nullscan.q.out @@ -87,6 +87,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,ds,hr columns.comments @@ -109,6 +110,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,ds,hr columns.comments diff --git a/ql/src/test/results/clientpositive/llap/llap_smb.q.out b/ql/src/test/results/clientpositive/llap/llap_smb.q.out index 4c0f6a01fe..377a81599f 100644 --- a/ql/src/test/results/clientpositive/llap/llap_smb.q.out +++ b/ql/src/test/results/clientpositive/llap/llap_smb.q.out @@ -172,25 +172,25 @@ POSTHOOK: Input: default@orc_a@y=2001/q=8 POSTHOOK: Input: default@orc_a@y=2001/q=9 POSTHOOK: Input: default@orc_b POSTHOOK: Output: hdfs://### HDFS PATH ### -2000 2 6578 +2000 0 6721 +2000 7 6149 +2000 9 8151 2001 8 9438 +2000 2 6578 2000 3 6149 -2000 5 5720 -2000 9 8151 +2000 6 5577 2001 0 6721 -2001 1 7493 -2001 2 6578 -2001 4 7865 +2001 7 6149 2001 9 8151 2000 1 7493 -2000 7 6149 -2000 8 9438 -2001 6 5577 -2001 7 6149 -2000 0 6721 2000 4 7865 -2000 6 5577 +2000 5 5720 +2001 2 6578 2001 3 6149 +2001 6 5577 +2000 8 9438 +2001 1 7493 +2001 4 7865 2001 5 5720 PREHOOK: query: explain select y,q,count(*) from orc_a a join orc_b b on a.id=b.id group by y,q @@ -234,7 +234,7 @@ STAGE PLANS: 0 id (type: bigint) 1 id (type: bigint) outputColumnNames: _col2, _col3 - Statistics: Num rows: 987 Data size: 7896 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 988 Data size: 7904 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: count() keys: _col2 (type: int), _col3 (type: smallint) @@ -321,25 +321,25 @@ POSTHOOK: Input: default@orc_a@y=2001/q=8 POSTHOOK: Input: default@orc_a@y=2001/q=9 POSTHOOK: Input: default@orc_b POSTHOOK: Output: hdfs://### HDFS PATH ### -2000 2 6578 +2000 0 6721 +2000 7 6149 +2000 9 8151 2001 8 9438 +2000 2 6578 2000 3 6149 -2000 5 5720 -2000 9 8151 +2000 6 5577 2001 0 6721 -2001 1 7493 -2001 2 6578 -2001 4 7865 +2001 7 6149 2001 9 8151 2000 1 7493 -2000 7 6149 -2000 8 9438 -2001 6 5577 -2001 7 6149 -2000 0 6721 2000 4 7865 -2000 6 5577 +2000 5 5720 +2001 2 6578 2001 3 6149 +2001 6 5577 +2000 8 9438 +2001 1 7493 +2001 4 7865 2001 5 5720 PREHOOK: query: DROP TABLE orc_a PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out index c4361de5b2..89be93356a 100644 --- a/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/llap/mapjoin_mapjoin.q.out @@ -112,6 +112,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -160,6 +161,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -208,6 +210,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -256,6 +259,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -311,6 +315,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -332,6 +337,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -386,6 +392,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -407,6 +414,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out index 89523042a9..3d41685b4b 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out @@ -46,6 +46,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 1025 @@ -106,6 +107,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 580 @@ -178,8 +180,8 @@ POSTHOOK: query: select * from cmv_mat_view4 POSTHOOK: type: QUERY POSTHOOK: Input: default@cmv_mat_view4 #### A masked pattern was here #### -1 10.30 2 172345.34 +1 10.30 3 988.56 PREHOOK: query: describe extended cmv_mat_view4 PREHOOK: type: DESCTABLE @@ -240,6 +242,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view5 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 key value numFiles 1 numRows 5 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out index 86e3c56627..0feebf358c 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite.q.out @@ -65,6 +65,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 408 @@ -97,6 +98,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view2 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out index 9c3c336145..f66f98710d 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_2.q.out @@ -393,11 +393,11 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_mat_view_4 #### A masked pattern was here #### -bob alfred +bob bonnie -charlie calvin +charlie PREHOOK: query: create table cmv_basetable_2 (a int, b varchar(256), c decimal(10,2), d int) stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -499,8 +499,8 @@ POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_basetable_2 POSTHOOK: Input: default@cmv_mat_view_5 #### A masked pattern was here #### -3 1 +3 PREHOOK: query: explain select cmv_basetable.a from cmv_basetable join cmv_basetable_2 on (cmv_basetable.a = cmv_basetable_2.a) diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out index 1ef7b876d8..03167ad9fa 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_3.q.out @@ -278,8 +278,8 @@ POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_basetable_2 POSTHOOK: Input: default@cmv_mat_view #### A masked pattern was here #### -3 1 +3 PREHOOK: query: insert into cmv_basetable_2 values (3, 'charlie', 15.8, 1) PREHOOK: type: QUERY @@ -431,9 +431,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_basetable_2 #### A masked pattern was here #### +1 3 3 -1 PREHOOK: query: EXPLAIN ALTER MATERIALIZED VIEW cmv_mat_view REBUILD PREHOOK: type: QUERY @@ -645,9 +645,9 @@ POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_basetable_2 POSTHOOK: Input: default@cmv_mat_view #### A masked pattern was here #### +1 3 3 -1 PREHOOK: query: DELETE FROM cmv_basetable_2 WHERE a = 3 PREHOOK: type: QUERY PREHOOK: Input: default@cmv_basetable_2 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out index 86e3c56627..0feebf358c 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_dummy.q.out @@ -65,6 +65,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 408 @@ -97,6 +98,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view2 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out index 8930b80422..50c9b040d2 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_multi_db.q.out @@ -89,6 +89,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 408 @@ -121,6 +122,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view2 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out index 1ef7b876d8..03167ad9fa 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_rebuild_dummy.q.out @@ -278,8 +278,8 @@ POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_basetable_2 POSTHOOK: Input: default@cmv_mat_view #### A masked pattern was here #### -3 1 +3 PREHOOK: query: insert into cmv_basetable_2 values (3, 'charlie', 15.8, 1) PREHOOK: type: QUERY @@ -431,9 +431,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_basetable_2 #### A masked pattern was here #### +1 3 3 -1 PREHOOK: query: EXPLAIN ALTER MATERIALIZED VIEW cmv_mat_view REBUILD PREHOOK: type: QUERY @@ -645,9 +645,9 @@ POSTHOOK: Input: default@cmv_basetable POSTHOOK: Input: default@cmv_basetable_2 POSTHOOK: Input: default@cmv_mat_view #### A masked pattern was here #### +1 3 3 -1 PREHOOK: query: DELETE FROM cmv_basetable_2 WHERE a = 3 PREHOOK: type: QUERY PREHOOK: Input: default@cmv_basetable_2 diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out index efd60d4345..7f9bb7a063 100644 --- a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out +++ b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out @@ -67,6 +67,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the first view key foo numFiles 1 @@ -93,6 +94,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 comment this is the first view key foo numFiles 1 @@ -154,6 +156,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the second view key alice key2 bob @@ -234,6 +237,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the third view numFiles 1 numRows 5 @@ -275,8 +279,8 @@ POSTHOOK: query: select distinct a from cmv_mat_view3 POSTHOOK: type: QUERY POSTHOOK: Input: default@cmv_mat_view3 #### A masked pattern was here #### -1 2 +1 3 PREHOOK: query: drop materialized view cmv_mat_view3 PREHOOK: type: DROP_MATERIALIZED_VIEW @@ -323,6 +327,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the last view numFiles 1 numRows 5 diff --git a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out index c705f6406f..fea0b3cc19 100644 --- a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out +++ b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out @@ -174,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -315,6 +316,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -456,6 +458,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -604,6 +607,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -651,6 +655,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -728,6 +733,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -775,6 +781,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1012,6 +1019,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1059,6 +1067,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1106,6 +1115,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1257,6 +1267,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1305,6 +1316,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1353,6 +1365,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1500,6 +1513,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1546,6 +1560,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1745,6 +1760,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1792,6 +1808,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1839,6 +1856,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1886,6 +1904,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments @@ -1933,6 +1952,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns a,b columns.comments diff --git a/ql/src/test/results/clientpositive/llap/mm_all.q.out b/ql/src/test/results/clientpositive/llap/mm_all.q.out index 7c8a38f290..8a5c9d0301 100644 --- a/ql/src/test/results/clientpositive/llap/mm_all.q.out +++ b/ql/src/test/results/clientpositive/llap/mm_all.q.out @@ -1815,6 +1815,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 numRows 6 rawDataSize 13 @@ -1864,6 +1865,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 6 numRows 12 rawDataSize 26 @@ -1922,6 +1924,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 numFiles 55 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/llap/mm_exim.q.out b/ql/src/test/results/clientpositive/llap/mm_exim.q.out index 1f40754373..0f93037d30 100644 --- a/ql/src/test/results/clientpositive/llap/mm_exim.q.out +++ b/ql/src/test/results/clientpositive/llap/mm_exim.q.out @@ -214,7 +214,7 @@ POSTHOOK: Input: default@import0_mm #### A masked pattern was here #### 0 456 10 456 -97 455 +98 455 98 455 100 457 103 457 @@ -267,7 +267,7 @@ POSTHOOK: Input: default@import1_mm@p=457 #### A masked pattern was here #### 0 456 10 456 -97 455 +98 455 98 455 100 457 103 457 @@ -310,7 +310,7 @@ POSTHOOK: Input: default@import2_mm #### A masked pattern was here #### 0 456 10 456 -97 455 +98 455 98 455 100 457 103 457 @@ -366,7 +366,7 @@ POSTHOOK: Input: default@import3_mm@p=457 #### A masked pattern was here #### 0 456 10 456 -97 455 +98 455 98 455 100 457 103 457 @@ -408,7 +408,7 @@ POSTHOOK: Input: default@import4_mm #### A masked pattern was here #### 0 456 10 456 -97 455 +98 455 98 455 100 457 103 457 @@ -451,7 +451,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@import5_mm POSTHOOK: Input: default@import5_mm@p=455 #### A masked pattern was here #### -97 455 +98 455 98 455 PREHOOK: query: drop table import5_mm PREHOOK: type: DROPTABLE @@ -491,7 +491,7 @@ POSTHOOK: Input: default@import6_mm #### A masked pattern was here #### 0 456 10 456 -97 455 +98 455 98 455 100 457 103 457 @@ -542,7 +542,7 @@ POSTHOOK: Input: default@import7_mm@p=457 #### A masked pattern was here #### 0 456 10 456 -97 455 +98 455 98 455 100 457 103 457 diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out index 559173c89e..3e267e3694 100644 --- a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out +++ b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out @@ -659,12 +659,12 @@ POSTHOOK: Input: default@smalltbl1 POSTHOOK: Input: default@smalltbl2 #### A masked pattern was here #### RUN: Stage-1:MAPRED +270 10 +270 10 10 10 -270 -270 PREHOOK: query: drop table bigTbl PREHOOK: type: DROPTABLE PREHOOK: Input: default@bigtbl diff --git a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out index c210c4c20d..d6c1838bec 100644 --- a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out +++ b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out @@ -291,24 +291,24 @@ group by department_id, gender, education_level grouping sets POSTHOOK: type: QUERY POSTHOOK: Input: default@employee POSTHOOK: Output: hdfs://### HDFS PATH ### -5 NULL NULL NULL -2 NULL NULL 1 -2 1 NULL 1 +6 NULL NULL 3 +5 NULL F NULL +3 1 NULL NULL 2 1 NULL 3 3 4 NULL NULL -2 4 NULL 1 3 NULL NULL NULL +6 NULL NULL 1 +2 1 NULL 1 +3 2 NULL NULL +2 2 NULL 3 +2 3 NULL 2 +2 4 NULL 1 6 NULL NULL NULL +2 NULL NULL 1 6 NULL NULL 2 -5 NULL F NULL -3 1 NULL NULL -2 2 NULL 3 -6 NULL NULL 3 -3 2 NULL NULL +2 1 NULL 2 2 2 NULL 1 2 NULL NULL NULL -6 NULL NULL 1 +5 NULL NULL NULL 5 NULL M NULL -2 1 NULL 2 3 3 NULL NULL -2 3 NULL 2 diff --git a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out index 39f1ea8495..d73d4d189a 100644 --- a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out +++ b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out @@ -180,6 +180,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -201,6 +202,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -280,6 +282,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -327,6 +330,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -374,6 +378,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -421,6 +426,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -573,6 +579,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -594,6 +601,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -673,6 +681,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -721,6 +730,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -769,6 +779,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -817,6 +828,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -981,6 +993,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1002,6 +1015,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1081,6 +1095,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1128,6 +1143,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1175,6 +1191,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1222,6 +1239,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1389,6 +1407,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1410,6 +1429,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1459,6 +1479,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1480,6 +1501,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1622,6 +1644,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1643,6 +1666,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1693,6 +1717,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1714,6 +1739,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1839,6 +1865,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1860,6 +1887,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out index fd33bfd408..6e950ce41f 100644 --- a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out @@ -98,6 +98,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 100 rawDataSize 52600 @@ -145,6 +146,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 100 rawDataSize 52600 @@ -231,6 +233,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\",\"state\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 100 rawDataSize 52600 @@ -727,8 +730,8 @@ Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} numFiles 4 numRows 50 - rawDataSize 21975 - totalSize 5260 + rawDataSize 21963 + totalSize 5341 #### A masked pattern was here #### # Storage Information @@ -768,8 +771,8 @@ Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} numFiles 4 numRows 50 - rawDataSize 22043 - totalSize 5331 + rawDataSize 22069 + totalSize 5301 #### A masked pattern was here #### # Storage Information @@ -821,8 +824,8 @@ Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} numFiles 4 numRows 50 - rawDataSize 21975 - totalSize 5260 + rawDataSize 21963 + totalSize 5341 #### A masked pattern was here #### # Storage Information @@ -862,8 +865,8 @@ Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} numFiles 4 numRows 50 - rawDataSize 22043 - totalSize 5331 + rawDataSize 22069 + totalSize 5301 #### A masked pattern was here #### # Storage Information @@ -964,8 +967,8 @@ Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\"}} numFiles 4 numRows 50 - rawDataSize 21975 - totalSize 5260 + rawDataSize 21963 + totalSize 5341 #### A masked pattern was here #### # Storage Information @@ -1005,8 +1008,8 @@ Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\"}} numFiles 4 numRows 50 - rawDataSize 22043 - totalSize 5331 + rawDataSize 22069 + totalSize 5301 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/llap/orc_create.q.out b/ql/src/test/results/clientpositive/llap/orc_create.q.out index 44373da600..0654fc75fa 100644 --- a/ql/src/test/results/clientpositive/llap/orc_create.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_create.q.out @@ -66,6 +66,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"lst\":\"true\",\"mp\":\"true\",\"str\":\"true\",\"strct\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -119,6 +120,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -176,6 +178,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -223,6 +226,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 0 numPartitions 0 @@ -281,6 +285,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 @@ -336,6 +341,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"lst\":\"true\",\"mp\":\"true\",\"str\":\"true\",\"strct\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out index af237eab30..98d9e06ee0 100644 --- a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out @@ -227,6 +227,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 2100 orc.bloom.filter.columns * diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out index 01fb4afad9..c07832633d 100644 --- a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out +++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out @@ -227,6 +227,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 2100 orc.bloom.filter.columns * diff --git a/ql/src/test/results/clientpositive/llap/parquet_types.q.out b/ql/src/test/results/clientpositive/llap/parquet_types.q.out index 4d7c5fda28..4ce462a5f6 100644 --- a/ql/src/test/results/clientpositive/llap/parquet_types.q.out +++ b/ql/src/test/results/clientpositive/llap/parquet_types.q.out @@ -369,7 +369,7 @@ POSTHOOK: query: SELECT hex(cbinary), count(*) FROM parquet_types GROUP BY cbina POSTHOOK: type: QUERY POSTHOOK: Input: default@parquet_types #### A masked pattern was here #### -68692CCAC0BDE7 10 - 1 68656C6C6F 1 + 1 +68692CCAC0BDE7 10 B4F3CAFDBEDD 10 diff --git a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out index c786ba31c7..f67c5bc32c 100644 --- a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out +++ b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out @@ -843,7 +843,7 @@ POSTHOOK: query: SELECT hex(cbinary), count(*) FROM parquet_types GROUP BY cbina POSTHOOK: type: QUERY POSTHOOK: Input: default@parquet_types POSTHOOK: Output: hdfs://### HDFS PATH ### -68692CCAC0BDE7 10 +B4F3CAFDBEDD 10 1 68656C6C6F 1 -B4F3CAFDBEDD 10 +68692CCAC0BDE7 10 diff --git a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out index 520e7145f1..829ab15346 100644 --- a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out @@ -134,6 +134,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns customer columns.comments @@ -203,6 +204,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns customer columns.comments @@ -248,6 +250,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns customer columns.comments @@ -317,6 +320,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns customer columns.comments @@ -362,6 +366,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns customer columns.comments diff --git a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out index 00b5e88efb..5a6ff13948 100644 --- a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out +++ b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out @@ -253,6 +253,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns keymap,value columns.comments @@ -334,6 +335,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,keymap columns.comments @@ -535,6 +537,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out index 67ab4fe105..1d6e002560 100644 --- a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out +++ b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out @@ -128,16 +128,16 @@ POSTHOOK: Input: default@src_b2 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 -103 val_103 103 val_103 -103 val_103 103 val_103 -103 val_103 103 val_103 -103 val_103 103 val_103 -105 val_105 105 val_105 -10 val_10 10 val_10 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 +105 val_105 105 val_105 +10 val_10 10 val_10 +103 val_103 103 val_103 +103 val_103 103 val_103 +103 val_103 103 val_103 +103 val_103 103 val_103 104 val_104 104 val_104 104 val_104 104 val_104 104 val_104 104 val_104 diff --git a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out index 68c2af2b51..28b7aede1d 100644 --- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out +++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out @@ -60,6 +60,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -82,6 +83,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -124,6 +126,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -195,6 +198,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -385,6 +389,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns aid,bid,t,ctime,etime,l,et columns.comments @@ -474,6 +479,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns aid,bid,t,ctime,etime,l,et columns.comments diff --git a/ql/src/test/results/clientpositive/llap/sample1.q.out b/ql/src/test/results/clientpositive/llap/sample1.q.out index 3458ee28d0..583ac3571a 100644 --- a/ql/src/test/results/clientpositive/llap/sample1.q.out +++ b/ql/src/test/results/clientpositive/llap/sample1.q.out @@ -57,6 +57,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -130,6 +131,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -193,6 +195,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out index e76eaf862c..2aff794bcf 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out @@ -78,6 +78,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 @@ -283,6 +284,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 #### A masked pattern was here #### numFiles 2 numPartitions 2 diff --git a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out index a9d090d5bd..fbf2fa5f43 100644 --- a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out +++ b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out @@ -1392,6 +1392,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -3853,6 +3854,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out b/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out index 74f98ed50d..987bcc14fd 100644 --- a/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out +++ b/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out @@ -64,8 +64,8 @@ POSTHOOK: Input: default@skiphtbl POSTHOOK: Input: default@skiphtbl@b=1 POSTHOOK: Input: default@skiphtbl@b=2 #### A masked pattern was here #### -1 2 +1 PREHOOK: query: SELECT MAX(b) FROM skipHTbl PREHOOK: type: QUERY PREHOOK: Input: default@skiphtbl @@ -91,8 +91,8 @@ POSTHOOK: Input: default@skiphtbl POSTHOOK: Input: default@skiphtbl@b=1 POSTHOOK: Input: default@skiphtbl@b=2 #### A masked pattern was here #### -4 2 +4 3 PREHOOK: query: INSERT OVERWRITE TABLE skipHTbl PARTITION (b = 1) VALUES (1) PREHOOK: type: QUERY @@ -150,8 +150,8 @@ POSTHOOK: Input: default@skiphtbl POSTHOOK: Input: default@skiphtbl@b=1 POSTHOOK: Input: default@skiphtbl@b=2 #### A masked pattern was here #### -4 2 +4 3 PREHOOK: query: DROP TABLE IF EXISTS skipFTbl PREHOOK: type: DROPTABLE @@ -219,8 +219,8 @@ POSTHOOK: Input: default@skipftbl POSTHOOK: Input: default@skipftbl@b=1 POSTHOOK: Input: default@skipftbl@b=2 #### A masked pattern was here #### -1 2 +1 PREHOOK: query: SELECT MAX(b) FROM skipFTbl PREHOOK: type: QUERY PREHOOK: Input: default@skipftbl @@ -246,8 +246,8 @@ POSTHOOK: Input: default@skipftbl POSTHOOK: Input: default@skipftbl@b=1 POSTHOOK: Input: default@skipftbl@b=2 #### A masked pattern was here #### -1 2 +1 3 PREHOOK: query: DROP TABLE skipHTbl PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out index 490afb69a9..ddb594255c 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out @@ -89,6 +89,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -112,6 +113,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -169,6 +171,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -192,6 +195,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -403,6 +407,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -426,6 +431,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -483,6 +489,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -506,6 +513,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -665,6 +673,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -688,6 +697,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -745,6 +755,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -768,6 +779,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -927,6 +939,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -950,6 +963,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -1007,6 +1021,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -1030,6 +1045,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out index 6580938944..88213639a7 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out @@ -53,14 +53,14 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 500 Data size: 46500 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: key (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 500 Data size: 46500 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 500 Data size: 46500 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -147,7 +147,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table1 @@ -158,7 +158,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select count(*) from test_table2 where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -200,7 +200,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -211,7 +211,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' and a.key = 238 @@ -239,19 +239,19 @@ STAGE PLANS: Map Operator Tree: TableScan alias: a - Statistics: Num rows: 500 Data size: 47500 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 500 Data size: 46500 Basic stats: COMPLETE Column stats: COMPLETE Filter Operator predicate: (key = 238) (type: boolean) - Statistics: Num rows: 2 Data size: 190 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 83 Data size: 7719 Basic stats: COMPLETE Column stats: COMPLETE Select Operator expressions: 238 (type: int), value (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 2 Data size: 190 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 83 Data size: 7719 Basic stats: COMPLETE Column stats: COMPLETE Reduce Output Operator key expressions: _col0 (type: int) sort order: + Map-reduce partition columns: _col0 (type: int) - Statistics: Num rows: 2 Data size: 190 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 83 Data size: 7719 Basic stats: COMPLETE Column stats: COMPLETE value expressions: _col1 (type: string) Execution mode: llap LLAP IO: no inputs @@ -261,10 +261,10 @@ STAGE PLANS: Select Operator expressions: KEY.reducesinkkey0 (type: int), VALUE._col0 (type: string) outputColumnNames: _col0, _col1 - Statistics: Num rows: 2 Data size: 190 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 83 Data size: 7719 Basic stats: COMPLETE Column stats: COMPLETE File Output Operator compressed: false - Statistics: Num rows: 2 Data size: 190 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 83 Data size: 7719 Basic stats: COMPLETE Column stats: COMPLETE table: input format: org.apache.hadoop.mapred.TextInputFormat output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat @@ -273,7 +273,7 @@ STAGE PLANS: Select Operator expressions: _col0 (type: int), _col1 (type: string), '2' (type: string) outputColumnNames: key, value, ds - Statistics: Num rows: 2 Data size: 360 Basic stats: COMPLETE Column stats: COMPLETE + Statistics: Num rows: 83 Data size: 14774 Basic stats: COMPLETE Column stats: COMPLETE Group By Operator aggregations: compute_stats(key, 'hll'), compute_stats(value, 'hll') keys: ds (type: string) diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out index 97e74517ee..b86c7f1d73 100644 --- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out +++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out @@ -169,7 +169,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -40 +19 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 13 out of 16) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table1 @@ -180,7 +180,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -29 +33 PREHOOK: query: select count(*) from test_table2 where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -244,7 +244,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -40 +19 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 13 out of 16) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -255,4 +255,4 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -29 +33 diff --git a/ql/src/test/results/clientpositive/llap/stats11.q.out b/ql/src/test/results/clientpositive/llap/stats11.q.out index 22be814c9e..a53b296341 100644 --- a/ql/src/test/results/clientpositive/llap/stats11.q.out +++ b/ql/src/test/results/clientpositive/llap/stats11.q.out @@ -346,6 +346,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -367,6 +368,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -447,6 +449,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -494,6 +497,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -575,6 +579,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -766,6 +771,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -787,6 +793,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -867,6 +874,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -914,6 +922,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -995,6 +1004,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out index b63b25fb13..f4ca55d7c5 100644 --- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_1.q.out @@ -404,10 +404,10 @@ order by c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### --8915 1 -3799 1 -10782 1 -13036 1 +10782 1 +-8915 1 NULL 6 PREHOOK: query: explain select diff --git a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out index 4f557d3cc3..44788ebba8 100644 --- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out @@ -126,7 +126,8 @@ STAGE PLANS: Tez #### A masked pattern was here #### Edges: - Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE), Map 3 (BROADCAST_EDGE) + Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE) + Reducer 3 <- Map 4 (CUSTOM_SIMPLE_EDGE), Reducer 2 (CUSTOM_SIMPLE_EDGE) #### A masked pattern was here #### Vertices: Map 1 @@ -148,7 +149,7 @@ STAGE PLANS: value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) Execution mode: llap LLAP IO: all inputs - Map 3 + Map 4 Map Operator Tree: TableScan alias: b @@ -174,29 +175,39 @@ STAGE PLANS: Limit Number of rows: 1 Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE Column stats: COMPLETE - Map Join Operator - condition map: - Left Outer Join 0 to 1 - filter predicates: - 0 {(_col2 < 100)} - 1 - keys: - 0 _col2 (type: int) - 1 UDFToInteger(_col0) (type: int) - outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 - input vertices: - 1 Map 3 + Reduce Output Operator + key expressions: _col2 (type: int) + sort order: + + Map-reduce partition columns: _col2 (type: int) Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE Column stats: COMPLETE - Limit - Number of rows: 1 - Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE Column stats: COMPLETE - File Output Operator - compressed: false - Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE Column stats: COMPLETE - table: - input format: org.apache.hadoop.mapred.SequenceFileInputFormat - output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat - serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe + value expressions: _col0 (type: tinyint), _col1 (type: smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), _col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: boolean) + Reducer 3 + Execution mode: llap + Reduce Operator Tree: + Map Join Operator + condition map: + Left Outer Join 0 to 1 + filter predicates: + 0 {(_col2 < 100)} + 1 + keys: + 0 KEY.reducesinkkey0 (type: int) + 1 KEY.reducesinkkey0 (type: int) + outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8, _col9, _col10, _col11 + input vertices: + 1 Map 4 + Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE Column stats: COMPLETE + HybridGraceHashJoin: true + Limit + Number of rows: 1 + Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE Column stats: COMPLETE + File Output Operator + compressed: false + Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE Column stats: COMPLETE + table: + input format: org.apache.hadoop.mapred.SequenceFileInputFormat + output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat + serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Stage: Stage-0 Fetch Operator diff --git a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out index eee2ab6100..8b5f73ff29 100644 --- a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out @@ -198,6 +198,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes columns.comments @@ -222,6 +223,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes columns.comments @@ -308,6 +310,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes columns.comments @@ -332,6 +335,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes columns.comments @@ -1183,6 +1187,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes columns.comments @@ -1207,6 +1212,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes columns.comments @@ -1293,6 +1299,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes columns.comments @@ -1317,6 +1324,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes columns.comments diff --git a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out index d0a5e62d72..4fbdacdb1b 100644 --- a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out +++ b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out @@ -404,10 +404,10 @@ order by c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### --8915 1 --3799 1 10782 1 -13036 1 +-8915 1 +-3799 1 NULL 6 PREHOOK: query: explain select @@ -824,8 +824,8 @@ order by c1 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc #### A masked pattern was here #### +-13036 1 -8915 1 -3799 1 10782 1 --13036 1 NULL 6 diff --git a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out index aa55979de8..8bc333d8e3 100644 --- a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out +++ b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out @@ -102,8 +102,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}] 2 [{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}] +1 [{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}] 3 [{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}] PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, "amount", o.amount))) FROM customers c @@ -121,8 +121,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}] 2 [{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}] +1 [{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}] 3 [{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}] PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1))))) FROM customers c @@ -140,8 +140,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}] 2 [{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}] +1 [{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}] 3 [{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}] PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1))))) FROM customers c @@ -159,8 +159,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}] 2 [{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}] +1 [{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}] 3 [{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}] PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, o.amount))) FROM customers c @@ -178,8 +178,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}] 2 [{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}] +1 [{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}] 3 [{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}] PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, o.amount))) FROM customers c @@ -197,8 +197,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}] 2 [{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}] +1 [{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}] 3 [{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}] PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, "sub", o.sub))) FROM customers c @@ -216,8 +216,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 2 [{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}] +1 [{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 3 [{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}] PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, "sub", o.sub))) FROM customers c @@ -235,8 +235,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 2 [{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}] +1 [{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 3 [{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}] PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, o.sub))) FROM customers c @@ -254,8 +254,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 2 [{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}] +1 [{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 3 [{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}] PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, o.sub))) FROM customers c @@ -273,8 +273,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 2 [{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}] +1 [{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 3 [{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}] PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", c.name, "date", o.d, "sub", map_values(o.sub)))) FROM customers c @@ -292,8 +292,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}] 2 [{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}] +1 [{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}] 3 [{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}] PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", c.name, "date", o.d, "sub", map_values(o.sub)))) FROM customers c @@ -311,8 +311,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}] 2 [{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}] +1 [{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[1200.5,29.36]}] 3 [{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}] PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, map_values(o.sub)))) FROM customers c @@ -330,8 +330,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[1200.5,29.36]}] 2 [{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}] +1 [{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[1200.5,29.36]}] 3 [{"col1":"Martin","col2":"2014-05-11","col3":[30.5,41.35]},{"col1":"Martin","col2":"2014-12-12","col3":[210.03,100.56,500.0]}] PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, map_values(o.sub)))) FROM customers c @@ -349,8 +349,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[1200.5,29.36]}] 2 [{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}] +1 [{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[1200.5,29.36]}] 3 [{"col1":"Martin","col2":"2014-05-11","col3":[30.5,41.35]},{"col1":"Martin","col2":"2014-12-12","col3":[210.03,100.56,500.0]}] PREHOOK: query: SELECT c.id, sort_array(collect_set(array(o.amount))) FROM customers c @@ -368,8 +368,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [[21.45],[29.36]] 2 [[3.65],[27.45],[126.57]] +1 [[21.45],[29.36]] 3 [[30.5],[210.03]] PREHOOK: query: SELECT c.id, sort_array(collect_list(array(o.amount))) FROM customers c @@ -387,8 +387,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [[21.45],[21.45],[29.36]] 2 [[3.65],[27.45],[126.57]] +1 [[21.45],[21.45],[29.36]] 3 [[30.5],[210.03]] PREHOOK: query: SELECT c.id, sort_array(collect_set(array(cast(o.amount as decimal(10,1))))) FROM customers c @@ -406,8 +406,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [[21.5],[29.4]] 2 [[3.7],[27.5],[126.6]] +1 [[21.5],[29.4]] 3 [[30.5],[210]] PREHOOK: query: SELECT c.id, sort_array(collect_list(array(cast(o.amount as decimal(10,1))))) FROM customers c @@ -425,8 +425,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [[21.5],[21.5],[29.4]] 2 [[3.7],[27.5],[126.6]] +1 [[21.5],[21.5],[29.4]] 3 [[30.5],[210]] PREHOOK: query: SELECT c.id, sort_array(collect_set(array(o.sub))) FROM customers c @@ -444,8 +444,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"grape\"":1200.5,"\"rice\"":29.36}]] 2 [[{"\"milk\"":27.45}],[{"\"yogurt\"":126.57,"\"beef\"":210.57}],[{"\"chocolate\"":3.65,"\"water\"":420.36}]] +1 [[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"grape\"":1200.5,"\"rice\"":29.36}]] 3 [[{"\"apple\"":30.5,"\"orange\"":41.35}],[{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}]] PREHOOK: query: SELECT c.id, sort_array(collect_list(array(o.sub))) FROM customers c @@ -463,8 +463,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"grape\"":1200.5,"\"rice\"":29.36}]] 2 [[{"\"milk\"":27.45}],[{"\"yogurt\"":126.57,"\"beef\"":210.57}],[{"\"chocolate\"":3.65,"\"water\"":420.36}]] +1 [[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"grape\"":1200.5,"\"rice\"":29.36}]] 3 [[{"\"apple\"":30.5,"\"orange\"":41.35}],[{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}]] PREHOOK: query: SELECT c.id, sort_array(collect_set(array(map_values(o.sub)))) FROM customers c @@ -482,8 +482,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [[[21.45,15.2]],[[1200.5,29.36]]] 2 [[[3.65,420.36]],[[27.45]],[[126.57,210.57]]] +1 [[[21.45,15.2]],[[1200.5,29.36]]] 3 [[[30.5,41.35]],[[210.03,100.56,500.0]]] PREHOOK: query: SELECT c.id, sort_array(collect_list(array(map_values(o.sub)))) FROM customers c @@ -501,8 +501,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [[[21.45,15.2]],[[21.45,15.2]],[[1200.5,29.36]]] 2 [[[3.65,420.36]],[[27.45]],[[126.57,210.57]]] +1 [[[21.45,15.2]],[[21.45,15.2]],[[1200.5,29.36]]] 3 [[[30.5,41.35]],[[210.03,100.56,500.0]]] PREHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", o.amount))) FROM customers c @@ -520,8 +520,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"amount":21.45},{"amount":29.36}] 2 [{"amount":3.65},{"amount":27.45},{"amount":126.57}] +1 [{"amount":21.45},{"amount":29.36}] 3 [{"amount":30.5},{"amount":210.03}] PREHOOK: query: SELECT c.id, sort_array(collect_list(map("amount", o.amount))) FROM customers c @@ -539,8 +539,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"amount":21.45},{"amount":21.45},{"amount":29.36}] 2 [{"amount":3.65},{"amount":27.45},{"amount":126.57}] +1 [{"amount":21.45},{"amount":21.45},{"amount":29.36}] 3 [{"amount":30.5},{"amount":210.03}] PREHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", cast(o.amount as decimal(10,1))))) FROM customers c @@ -558,8 +558,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"amount":21.5},{"amount":29.4}] 2 [{"amount":3.7},{"amount":27.5},{"amount":126.6}] +1 [{"amount":21.5},{"amount":29.4}] 3 [{"amount":30.5},{"amount":210}] PREHOOK: query: SELECT c.id, sort_array(collect_list(map("amount", cast(o.amount as decimal(10,1))))) FROM customers c @@ -577,8 +577,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@orders #### A masked pattern was here #### -1 [{"amount":21.5},{"amount":21.5},{"amount":29.4}] 2 [{"amount":3.7},{"amount":27.5},{"amount":126.6}] +1 [{"amount":21.5},{"amount":21.5},{"amount":29.4}] 3 [{"amount":30.5},{"amount":210}] PREHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", o.sub))) FROM customers c @@ -596,8 +596,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 2 [{"sub":{"\"milk\"":27.45}},{"sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"sub":{"\"chocolate\"":3.65,"\"water\"":420.36}}] +1 [{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 3 [{"sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}] PREHOOK: query: SELECT c.id, sort_array(collect_list(map("sub", o.sub))) FROM customers c @@ -615,8 +615,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 2 [{"sub":{"\"milk\"":27.45}},{"sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"sub":{"\"chocolate\"":3.65,"\"water\"":420.36}}] +1 [{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"grape\"":1200.5,"\"rice\"":29.36}}] 3 [{"sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}] PREHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", map_values(o.sub)))) FROM customers c @@ -634,8 +634,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"sub":[21.45,15.2]},{"sub":[1200.5,29.36]}] 2 [{"sub":[3.65,420.36]},{"sub":[27.45]},{"sub":[126.57,210.57]}] +1 [{"sub":[21.45,15.2]},{"sub":[1200.5,29.36]}] 3 [{"sub":[30.5,41.35]},{"sub":[210.03,100.56,500.0]}] PREHOOK: query: SELECT c.id, sort_array(collect_list(map("sub", map_values(o.sub)))) FROM customers c @@ -653,8 +653,8 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@customers POSTHOOK: Input: default@nested_orders #### A masked pattern was here #### -1 [{"sub":[21.45,15.2]},{"sub":[21.45,15.2]},{"sub":[1200.5,29.36]}] 2 [{"sub":[3.65,420.36]},{"sub":[27.45]},{"sub":[126.57,210.57]}] +1 [{"sub":[21.45,15.2]},{"sub":[21.45,15.2]},{"sub":[1200.5,29.36]}] 3 [{"sub":[30.5,41.35]},{"sub":[210.03,100.56,500.0]}] PREHOOK: query: DROP TABLE customer PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out index b4594b9952..53fc0acf9c 100644 --- a/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out +++ b/ql/src/test/results/clientpositive/llap/unionDistinct_1.q.out @@ -638,314 +638,314 @@ POSTHOOK: query: select unionsrc.key, unionsrc.value FROM (select s1.key as key, POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: hdfs://### HDFS PATH ### -0 val_0 -103 val_103 -105 val_105 116 val_116 +118 val_118 120 val_120 -129 val_129 131 val_131 -136 val_136 +133 val_133 +15 val_15 +150 val_150 +152 val_152 +153 val_153 155 val_155 -157 val_157 160 val_160 -180 val_180 +169 val_169 +175 val_175 +176 val_176 +178 val_178 183 val_183 -190 val_190 -191 val_191 -193 val_193 -205 val_205 -207 val_207 +186 val_186 +194 val_194 +202 val_202 +203 val_203 213 val_213 223 val_223 -235 val_235 -238 val_238 +224 val_224 +226 val_226 +228 val_228 239 val_239 -24 val_24 -248 val_248 -260 val_260 +244 val_244 +247 val_247 +252 val_252 +255 val_255 +256 val_256 +257 val_257 +266 val_266 +272 val_272 +274 val_274 +275 val_275 28 val_28 +284 val_284 286 val_286 -298 val_298 -305 val_305 +289 val_289 +296 val_296 +302 val_302 306 val_306 307 val_307 -308 val_308 -315 val_315 317 val_317 321 val_321 +323 val_323 33 val_33 -331 val_331 -356 val_356 +338 val_338 +34 val_34 +35 val_35 360 val_360 -366 val_366 -367 val_367 -368 val_368 -37 val_37 -378 val_378 -379 val_379 -382 val_382 -389 val_389 -395 val_395 -400 val_400 -402 val_402 +365 val_365 +374 val_374 +377 val_377 +393 val_393 +399 val_399 +404 val_404 406 val_406 -407 val_407 +409 val_409 +41 val_41 +417 val_417 +418 val_418 42 val_42 -430 val_430 -436 val_436 +431 val_431 +439 val_439 44 val_44 -452 val_452 -466 val_466 -467 val_467 -472 val_472 -480 val_480 -484 val_484 -485 val_485 -487 val_487 -495 val_495 -496 val_496 -498 val_498 -51 val_51 -57 val_57 -58 val_58 -65 val_65 +443 val_443 +448 val_448 +455 val_455 +459 val_459 +462 val_462 +463 val_463 +470 val_470 +490 val_490 +491 val_491 +494 val_494 +5 val_5 +53 val_53 66 val_66 -69 val_69 -70 val_70 -78 val_78 -8 val_8 -92 val_92 -96 val_96 -104 val_104 +72 val_72 +76 val_76 +77 val_77 +80 val_80 +84 val_84 +90 val_90 +10 val_10 +105 val_105 111 val_111 -114 val_114 -118 val_118 -12 val_12 -133 val_133 -138 val_138 -153 val_153 -156 val_156 -162 val_162 -168 val_168 +113 val_113 +119 val_119 +129 val_129 +136 val_136 +143 val_143 +149 val_149 +163 val_163 +167 val_167 174 val_174 -176 val_176 -178 val_178 -181 val_181 -186 val_186 187 val_187 -192 val_192 197 val_197 -199 val_199 2 val_2 -201 val_201 -203 val_203 +200 val_200 208 val_208 -214 val_214 +209 val_209 +216 val_216 +217 val_217 218 val_218 -219 val_219 +221 val_221 230 val_230 -237 val_237 -249 val_249 -256 val_256 -257 val_257 +258 val_258 +26 val_26 +263 val_263 +273 val_273 277 val_277 -278 val_278 -284 val_284 -285 val_285 -310 val_310 -322 val_322 -327 val_327 -333 val_333 -336 val_336 -338 val_338 +281 val_281 +292 val_292 +30 val_30 +316 val_316 +335 val_335 341 val_341 +342 val_342 344 val_344 -348 val_348 -351 val_351 +345 val_345 362 val_362 -364 val_364 -374 val_374 +367 val_367 +368 val_368 +37 val_37 392 val_392 -397 val_397 +394 val_394 4 val_4 -403 val_403 -404 val_404 -419 val_419 -421 val_421 -427 val_427 -429 val_429 +413 val_413 437 val_437 -438 val_438 -439 val_439 -454 val_454 -455 val_455 +444 val_444 +446 val_446 +452 val_452 +453 val_453 +457 val_457 460 val_460 -463 val_463 -470 val_470 -478 val_478 +466 val_466 +468 val_468 +477 val_477 479 val_479 -489 val_489 -491 val_491 +483 val_483 +487 val_487 492 val_492 -53 val_53 +493 val_493 +498 val_498 +51 val_51 +54 val_54 +64 val_64 +65 val_65 67 val_67 82 val_82 -90 val_90 -97 val_97 -10 val_10 -125 val_125 -134 val_134 -143 val_143 +85 val_85 +87 val_87 +95 val_95 +96 val_96 +100 val_100 +103 val_103 +104 val_104 +11 val_11 +114 val_114 +137 val_137 145 val_145 -149 val_149 -150 val_150 -158 val_158 -163 val_163 -164 val_164 -166 val_166 +156 val_156 +157 val_157 +162 val_162 +168 val_168 17 val_17 170 val_170 -172 val_172 -189 val_189 +180 val_180 19 val_19 -195 val_195 +190 val_190 +192 val_192 196 val_196 +199 val_199 20 val_20 -209 val_209 -216 val_216 -217 val_217 -224 val_224 -228 val_228 -229 val_229 +207 val_207 +214 val_214 +219 val_219 +222 val_222 233 val_233 241 val_241 -244 val_244 -247 val_247 -255 val_255 -258 val_258 -26 val_26 -263 val_263 -265 val_265 -266 val_266 -272 val_272 -273 val_273 -274 val_274 -281 val_281 -291 val_291 -296 val_296 -30 val_30 -302 val_302 -309 val_309 -316 val_316 +260 val_260 +27 val_27 +278 val_278 +280 val_280 +285 val_285 +288 val_288 +305 val_305 +311 val_311 318 val_318 -325 val_325 -332 val_332 -335 val_335 -339 val_339 -342 val_342 -345 val_345 -353 val_353 +322 val_322 +327 val_327 +331 val_331 +336 val_336 +348 val_348 +351 val_351 +366 val_366 369 val_369 -373 val_373 375 val_375 -377 val_377 +379 val_379 +382 val_382 384 val_384 -386 val_386 -394 val_394 +389 val_389 +395 val_395 396 val_396 -399 val_399 +397 val_397 +400 val_400 401 val_401 -41 val_41 -413 val_413 +407 val_407 414 val_414 -431 val_431 -446 val_446 -448 val_448 -449 val_449 -459 val_459 -462 val_462 -468 val_468 +421 val_421 +427 val_427 +430 val_430 +435 val_435 +438 val_438 +454 val_454 47 val_47 -482 val_482 -490 val_490 -493 val_493 -494 val_494 -497 val_497 -5 val_5 -54 val_54 +472 val_472 +478 val_478 +480 val_480 +481 val_481 +485 val_485 +489 val_489 +57 val_57 +69 val_69 74 val_74 -77 val_77 -80 val_80 -84 val_84 -85 val_85 -87 val_87 +78 val_78 +8 val_8 +86 val_86 9 val_9 -95 val_95 -100 val_100 -11 val_11 -113 val_113 -119 val_119 +0 val_0 +12 val_12 +125 val_125 126 val_126 128 val_128 -137 val_137 +134 val_134 +138 val_138 146 val_146 -15 val_15 -152 val_152 +158 val_158 +164 val_164 165 val_165 -167 val_167 -169 val_169 -175 val_175 +166 val_166 +172 val_172 177 val_177 179 val_179 18 val_18 -194 val_194 -200 val_200 -202 val_202 -221 val_221 -222 val_222 -226 val_226 +181 val_181 +189 val_189 +191 val_191 +193 val_193 +195 val_195 +201 val_201 +205 val_205 +229 val_229 +235 val_235 +237 val_237 +238 val_238 +24 val_24 242 val_242 -252 val_252 +248 val_248 +249 val_249 262 val_262 -27 val_27 -275 val_275 -280 val_280 +265 val_265 282 val_282 283 val_283 287 val_287 -288 val_288 -289 val_289 -292 val_292 -311 val_311 -323 val_323 -34 val_34 -35 val_35 -365 val_365 -393 val_393 -409 val_409 +291 val_291 +298 val_298 +308 val_308 +309 val_309 +310 val_310 +315 val_315 +325 val_325 +332 val_332 +333 val_333 +339 val_339 +353 val_353 +356 val_356 +364 val_364 +373 val_373 +378 val_378 +386 val_386 +402 val_402 +403 val_403 411 val_411 -417 val_417 -418 val_418 +419 val_419 424 val_424 +429 val_429 43 val_43 432 val_432 -435 val_435 -443 val_443 -444 val_444 -453 val_453 -457 val_457 +436 val_436 +449 val_449 458 val_458 +467 val_467 469 val_469 475 val_475 -477 val_477 -481 val_481 -483 val_483 -64 val_64 -72 val_72 -76 val_76 +482 val_482 +484 val_484 +495 val_495 +496 val_496 +497 val_497 +58 val_58 +70 val_70 83 val_83 -86 val_86 +92 val_92 +97 val_97 98 val_98 PREHOOK: query: CREATE TABLE DEST1(key STRING, value STRING) STORED AS TEXTFILE PREHOOK: type: CREATETABLE @@ -3813,6 +3813,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments @@ -3890,6 +3891,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -3967,6 +3969,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments @@ -4007,6 +4010,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -4132,6 +4136,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -4206,329 +4211,329 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@dst_union22 POSTHOOK: Input: default@dst_union22@ds=2 POSTHOOK: Output: hdfs://### HDFS PATH ### +100 val_100 100 val_100 2 103 val_103 103 val_103 2 -113 val_113 113 val_113 2 +104 val_104 104 val_104 2 +11 val_11 11 val_11 2 +114 val_114 114 val_114 2 +116 val_116 116 val_116 2 +118 val_118 118 val_118 2 120 val_120 120 val_120 2 -128 val_128 128 val_128 2 +131 val_131 131 val_131 2 +133 val_133 133 val_133 2 137 val_137 137 val_137 2 145 val_145 145 val_145 2 -146 val_146 146 val_146 2 15 val_15 15 val_15 2 +150 val_150 150 val_150 2 +152 val_152 152 val_152 2 +153 val_153 153 val_153 2 +155 val_155 155 val_155 2 156 val_156 156 val_156 2 -163 val_163 163 val_163 2 -165 val_165 165 val_165 2 -166 val_166 166 val_166 2 -167 val_167 167 val_167 2 +157 val_157 157 val_157 2 +160 val_160 160 val_160 2 +162 val_162 162 val_162 2 +168 val_168 168 val_168 2 +169 val_169 169 val_169 2 +17 val_17 17 val_17 2 170 val_170 170 val_170 2 -174 val_174 174 val_174 2 +175 val_175 175 val_175 2 +176 val_176 176 val_176 2 178 val_178 178 val_178 2 +180 val_180 180 val_180 2 183 val_183 183 val_183 2 -191 val_191 191 val_191 2 -195 val_195 195 val_195 2 +186 val_186 186 val_186 2 +19 val_19 19 val_19 2 +190 val_190 190 val_190 2 +192 val_192 192 val_192 2 +194 val_194 194 val_194 2 +196 val_196 196 val_196 2 199 val_199 199 val_199 2 -2 val_2 2 val_2 2 +20 val_20 20 val_20 2 +202 val_202 202 val_202 2 203 val_203 203 val_203 2 -217 val_217 217 val_217 2 +207 val_207 207 val_207 2 +213 val_213 213 val_213 2 +214 val_214 214 val_214 2 +219 val_219 219 val_219 2 +222 val_222 222 val_222 2 +223 val_223 223 val_223 2 224 val_224 224 val_224 2 -229 val_229 229 val_229 2 -242 val_242 242 val_242 2 -27 val_27 NULL NULL 2 -272 val_272 272 val_272 2 -28 val_28 NULL NULL 2 -280 val_280 280 val_280 2 -282 val_282 282 val_282 2 -283 val_283 283 val_283 2 -287 val_287 287 val_287 2 -289 val_289 289 val_289 2 -292 val_292 292 val_292 2 -306 val_306 306 val_306 2 -307 val_307 307 val_307 2 -309 val_309 309 val_309 2 -310 val_310 310 val_310 2 -315 val_315 315 val_315 2 -327 val_327 327 val_327 2 -33 val_33 33 val_33 2 -331 val_331 331 val_331 2 -332 val_332 332 val_332 2 -333 val_333 333 val_333 2 -338 val_338 338 val_338 2 -344 val_344 344 val_344 2 -348 val_348 348 val_348 2 -35 val_35 35 val_35 2 -353 val_353 353 val_353 2 -362 val_362 362 val_362 2 -37 val_37 37 val_37 2 -373 val_373 373 val_373 2 -379 val_379 379 val_379 2 -4 val_4 4 val_4 2 -400 val_400 400 val_400 2 -401 val_401 401 val_401 2 -403 val_403 403 val_403 2 -406 val_406 406 val_406 2 -41 val_41 41 val_41 2 -414 val_414 414 val_414 2 -417 val_417 417 val_417 2 -431 val_431 431 val_431 2 -432 val_432 432 val_432 2 -436 val_436 436 val_436 2 -439 val_439 439 val_439 2 -452 val_452 452 val_452 2 -453 val_453 453 val_453 2 -455 val_455 455 val_455 2 -466 val_466 466 val_466 2 -469 val_469 469 val_469 2 -47 val_47 NULL NULL 2 -470 val_470 470 val_470 2 -475 val_475 475 val_475 2 -477 val_477 477 val_477 2 -493 val_493 493 val_493 2 -496 val_496 496 val_496 2 -54 val_54 54 val_54 2 -57 val_57 57 val_57 2 -65 val_65 65 val_65 2 -69 val_69 69 val_69 2 -77 val_77 77 val_77 2 -78 val_78 78 val_78 2 -8 val_8 8 val_8 2 -82 val_82 82 val_82 2 -87 val_87 87 val_87 2 -9 val_9 9 val_9 2 -92 val_92 92 val_92 2 -10 val_10 10 val_10 2 -11 val_11 11 val_11 2 -111 val_111 111 val_111 2 -114 val_114 114 val_114 2 -116 val_116 116 val_116 2 -12 val_12 12 val_12 2 -129 val_129 129 val_129 2 -136 val_136 136 val_136 2 -152 val_152 152 val_152 2 -155 val_155 155 val_155 2 -158 val_158 158 val_158 2 -168 val_168 168 val_168 2 -176 val_176 176 val_176 2 -177 val_177 177 val_177 2 -179 val_179 179 val_179 2 -18 val_18 18 val_18 2 -186 val_186 186 val_186 2 -194 val_194 194 val_194 2 -208 val_208 208 val_208 2 -214 val_214 214 val_214 2 -222 val_222 222 val_222 2 226 val_226 226 val_226 2 -230 val_230 230 val_230 2 -237 val_237 237 val_237 2 -24 val_24 NULL NULL 2 -24 val_24 24 val_24 2 -248 val_248 248 val_248 2 +228 val_228 228 val_228 2 +233 val_233 233 val_233 2 +239 val_239 239 val_239 2 +241 val_241 241 val_241 2 +244 val_244 244 val_244 2 +247 val_247 247 val_247 2 +252 val_252 252 val_252 2 255 val_255 255 val_255 2 256 val_256 256 val_256 2 -26 val_26 26 val_26 2 -265 val_265 265 val_265 2 +257 val_257 257 val_257 2 +260 val_260 260 val_260 2 266 val_266 266 val_266 2 -273 val_273 273 val_273 2 +27 val_27 27 val_27 2 +272 val_272 272 val_272 2 +274 val_274 274 val_274 2 275 val_275 275 val_275 2 +278 val_278 278 val_278 2 +28 val_28 NULL NULL 2 28 val_28 28 val_28 2 +280 val_280 280 val_280 2 284 val_284 284 val_284 2 -291 val_291 291 val_291 2 -298 val_298 298 val_298 2 -30 val_30 NULL NULL 2 -30 val_30 30 val_30 2 -308 val_308 308 val_308 2 +285 val_285 285 val_285 2 +286 val_286 286 val_286 2 +288 val_288 288 val_288 2 +289 val_289 289 val_289 2 +296 val_296 296 val_296 2 +302 val_302 302 val_302 2 +305 val_305 305 val_305 2 +306 val_306 306 val_306 2 +307 val_307 307 val_307 2 +311 val_311 311 val_311 2 +317 val_317 317 val_317 2 +318 val_318 318 val_318 2 321 val_321 321 val_321 2 322 val_322 322 val_322 2 -335 val_335 335 val_335 2 +323 val_323 323 val_323 2 +327 val_327 327 val_327 2 +33 val_33 NULL NULL 2 +33 val_33 33 val_33 2 +331 val_331 331 val_331 2 336 val_336 336 val_336 2 +338 val_338 338 val_338 2 +34 val_34 NULL NULL 2 34 val_34 34 val_34 2 -341 val_341 341 val_341 2 -342 val_342 342 val_342 2 +348 val_348 348 val_348 2 +35 val_35 NULL NULL 2 +35 val_35 35 val_35 2 +351 val_351 351 val_351 2 +360 val_360 360 val_360 2 +365 val_365 365 val_365 2 +366 val_366 366 val_366 2 369 val_369 369 val_369 2 374 val_374 374 val_374 2 +375 val_375 375 val_375 2 377 val_377 377 val_377 2 +379 val_379 379 val_379 2 382 val_382 382 val_382 2 -386 val_386 386 val_386 2 +384 val_384 384 val_384 2 +389 val_389 389 val_389 2 393 val_393 393 val_393 2 +395 val_395 395 val_395 2 +396 val_396 396 val_396 2 397 val_397 397 val_397 2 -402 val_402 402 val_402 2 +399 val_399 399 val_399 2 +400 val_400 400 val_400 2 +401 val_401 401 val_401 2 404 val_404 404 val_404 2 +406 val_406 406 val_406 2 407 val_407 407 val_407 2 +409 val_409 409 val_409 2 +41 val_41 NULL NULL 2 +41 val_41 41 val_41 2 +414 val_414 414 val_414 2 +417 val_417 417 val_417 2 418 val_418 418 val_418 2 -446 val_446 446 val_446 2 +42 val_42 NULL NULL 2 +42 val_42 42 val_42 2 +421 val_421 421 val_421 2 +427 val_427 427 val_427 2 +430 val_430 430 val_430 2 +431 val_431 431 val_431 2 +435 val_435 435 val_435 2 +438 val_438 438 val_438 2 +439 val_439 439 val_439 2 +44 val_44 NULL NULL 2 +44 val_44 44 val_44 2 +443 val_443 443 val_443 2 448 val_448 448 val_448 2 -457 val_457 457 val_457 2 +454 val_454 454 val_454 2 +455 val_455 455 val_455 2 459 val_459 459 val_459 2 462 val_462 462 val_462 2 463 val_463 463 val_463 2 +47 val_47 47 val_47 2 +470 val_470 470 val_470 2 472 val_472 472 val_472 2 478 val_478 478 val_478 2 -479 val_479 479 val_479 2 480 val_480 480 val_480 2 -483 val_483 483 val_483 2 +481 val_481 481 val_481 2 485 val_485 485 val_485 2 +489 val_489 489 val_489 2 +490 val_490 490 val_490 2 491 val_491 491 val_491 2 +494 val_494 494 val_494 2 5 val_5 5 val_5 2 53 val_53 53 val_53 2 -67 val_67 67 val_67 2 +57 val_57 57 val_57 2 +66 val_66 66 val_66 2 +69 val_69 69 val_69 2 +72 val_72 72 val_72 2 +74 val_74 74 val_74 2 76 val_76 76 val_76 2 -83 val_83 83 val_83 2 +77 val_77 77 val_77 2 +78 val_78 78 val_78 2 +8 val_8 8 val_8 2 +80 val_80 80 val_80 2 +84 val_84 84 val_84 2 86 val_86 86 val_86 2 -95 val_95 95 val_95 2 -96 val_96 96 val_96 2 -98 val_98 98 val_98 2 -100 val_100 100 val_100 2 +9 val_9 9 val_9 2 +90 val_90 90 val_90 2 +26 val_26 NULL NULL 2 +30 val_30 NULL NULL 2 +37 val_37 NULL NULL 2 +0 val_0 0 val_0 2 +10 val_10 10 val_10 2 +105 val_105 105 val_105 2 +111 val_111 111 val_111 2 +113 val_113 113 val_113 2 +119 val_119 119 val_119 2 +12 val_12 12 val_12 2 125 val_125 125 val_125 2 126 val_126 126 val_126 2 +128 val_128 128 val_128 2 +129 val_129 129 val_129 2 134 val_134 134 val_134 2 +136 val_136 136 val_136 2 138 val_138 138 val_138 2 143 val_143 143 val_143 2 +146 val_146 146 val_146 2 149 val_149 149 val_149 2 -150 val_150 150 val_150 2 -157 val_157 157 val_157 2 +158 val_158 158 val_158 2 +163 val_163 163 val_163 2 164 val_164 164 val_164 2 -169 val_169 169 val_169 2 -17 val_17 17 val_17 2 +165 val_165 165 val_165 2 +166 val_166 166 val_166 2 +167 val_167 167 val_167 2 172 val_172 172 val_172 2 +174 val_174 174 val_174 2 +177 val_177 177 val_177 2 +179 val_179 179 val_179 2 +18 val_18 18 val_18 2 181 val_181 181 val_181 2 187 val_187 187 val_187 2 189 val_189 189 val_189 2 -190 val_190 190 val_190 2 -192 val_192 192 val_192 2 +191 val_191 191 val_191 2 +193 val_193 193 val_193 2 +195 val_195 195 val_195 2 197 val_197 197 val_197 2 +2 val_2 2 val_2 2 +200 val_200 200 val_200 2 201 val_201 201 val_201 2 -202 val_202 202 val_202 2 205 val_205 205 val_205 2 -207 val_207 207 val_207 2 +208 val_208 208 val_208 2 209 val_209 209 val_209 2 216 val_216 216 val_216 2 +217 val_217 217 val_217 2 218 val_218 218 val_218 2 -223 val_223 223 val_223 2 -228 val_228 228 val_228 2 -233 val_233 233 val_233 2 +221 val_221 221 val_221 2 +229 val_229 229 val_229 2 +230 val_230 230 val_230 2 235 val_235 235 val_235 2 +237 val_237 237 val_237 2 238 val_238 238 val_238 2 -241 val_241 241 val_241 2 -244 val_244 244 val_244 2 -247 val_247 247 val_247 2 -252 val_252 252 val_252 2 +24 val_24 24 val_24 2 +242 val_242 242 val_242 2 +248 val_248 248 val_248 2 +249 val_249 249 val_249 2 258 val_258 258 val_258 2 -260 val_260 260 val_260 2 +26 val_26 26 val_26 2 262 val_262 262 val_262 2 -27 val_27 27 val_27 2 -274 val_274 274 val_274 2 +263 val_263 263 val_263 2 +265 val_265 265 val_265 2 +27 val_27 NULL NULL 2 +273 val_273 273 val_273 2 277 val_277 277 val_277 2 -278 val_278 278 val_278 2 -288 val_288 288 val_288 2 -296 val_296 296 val_296 2 -302 val_302 302 val_302 2 -305 val_305 305 val_305 2 -311 val_311 311 val_311 2 -318 val_318 318 val_318 2 +281 val_281 281 val_281 2 +282 val_282 282 val_282 2 +283 val_283 283 val_283 2 +287 val_287 287 val_287 2 +291 val_291 291 val_291 2 +292 val_292 292 val_292 2 +298 val_298 298 val_298 2 +30 val_30 30 val_30 2 +308 val_308 308 val_308 2 +309 val_309 309 val_309 2 +310 val_310 310 val_310 2 +315 val_315 315 val_315 2 +316 val_316 316 val_316 2 +325 val_325 325 val_325 2 +332 val_332 332 val_332 2 +333 val_333 333 val_333 2 +335 val_335 335 val_335 2 +339 val_339 339 val_339 2 +341 val_341 341 val_341 2 +342 val_342 342 val_342 2 +344 val_344 344 val_344 2 345 val_345 345 val_345 2 -35 val_35 NULL NULL 2 +353 val_353 353 val_353 2 356 val_356 356 val_356 2 -360 val_360 360 val_360 2 -365 val_365 365 val_365 2 -375 val_375 375 val_375 2 -389 val_389 389 val_389 2 +362 val_362 362 val_362 2 +364 val_364 364 val_364 2 +367 val_367 367 val_367 2 +368 val_368 368 val_368 2 +37 val_37 37 val_37 2 +373 val_373 373 val_373 2 +378 val_378 378 val_378 2 +386 val_386 386 val_386 2 392 val_392 392 val_392 2 394 val_394 394 val_394 2 -395 val_395 395 val_395 2 -409 val_409 409 val_409 2 -41 val_41 NULL NULL 2 +4 val_4 4 val_4 2 +402 val_402 402 val_402 2 +403 val_403 403 val_403 2 411 val_411 411 val_411 2 413 val_413 413 val_413 2 419 val_419 419 val_419 2 -42 val_42 42 val_42 2 -427 val_427 427 val_427 2 +424 val_424 424 val_424 2 429 val_429 429 val_429 2 -430 val_430 430 val_430 2 -44 val_44 NULL NULL 2 +43 val_43 43 val_43 2 +432 val_432 432 val_432 2 +436 val_436 436 val_436 2 +437 val_437 437 val_437 2 444 val_444 444 val_444 2 -454 val_454 454 val_454 2 +446 val_446 446 val_446 2 +449 val_449 449 val_449 2 +452 val_452 452 val_452 2 +453 val_453 453 val_453 2 +457 val_457 457 val_457 2 +458 val_458 458 val_458 2 460 val_460 460 val_460 2 +466 val_466 466 val_466 2 +467 val_467 467 val_467 2 468 val_468 468 val_468 2 -47 val_47 47 val_47 2 -481 val_481 481 val_481 2 +469 val_469 469 val_469 2 +47 val_47 NULL NULL 2 +475 val_475 475 val_475 2 +477 val_477 477 val_477 2 +479 val_479 479 val_479 2 482 val_482 482 val_482 2 +483 val_483 483 val_483 2 484 val_484 484 val_484 2 -489 val_489 489 val_489 2 +487 val_487 487 val_487 2 492 val_492 492 val_492 2 +493 val_493 493 val_493 2 495 val_495 495 val_495 2 +496 val_496 496 val_496 2 +497 val_497 497 val_497 2 498 val_498 498 val_498 2 +51 val_51 51 val_51 2 +54 val_54 54 val_54 2 58 val_58 58 val_58 2 64 val_64 64 val_64 2 -66 val_66 66 val_66 2 +65 val_65 65 val_65 2 +67 val_67 67 val_67 2 70 val_70 70 val_70 2 -72 val_72 72 val_72 2 -74 val_74 74 val_74 2 -80 val_80 80 val_80 2 -84 val_84 84 val_84 2 -90 val_90 90 val_90 2 -0 val_0 0 val_0 2 -104 val_104 104 val_104 2 -105 val_105 105 val_105 2 -118 val_118 118 val_118 2 -119 val_119 119 val_119 2 -131 val_131 131 val_131 2 -133 val_133 133 val_133 2 -153 val_153 153 val_153 2 -160 val_160 160 val_160 2 -162 val_162 162 val_162 2 -175 val_175 175 val_175 2 -180 val_180 180 val_180 2 -19 val_19 19 val_19 2 -193 val_193 193 val_193 2 -196 val_196 196 val_196 2 -20 val_20 20 val_20 2 -200 val_200 200 val_200 2 -213 val_213 213 val_213 2 -219 val_219 219 val_219 2 -221 val_221 221 val_221 2 -239 val_239 239 val_239 2 -249 val_249 249 val_249 2 -257 val_257 257 val_257 2 -26 val_26 NULL NULL 2 -263 val_263 263 val_263 2 -281 val_281 281 val_281 2 -285 val_285 285 val_285 2 -286 val_286 286 val_286 2 -316 val_316 316 val_316 2 -317 val_317 317 val_317 2 -323 val_323 323 val_323 2 -325 val_325 325 val_325 2 -33 val_33 NULL NULL 2 -339 val_339 339 val_339 2 -34 val_34 NULL NULL 2 -351 val_351 351 val_351 2 -364 val_364 364 val_364 2 -366 val_366 366 val_366 2 -367 val_367 367 val_367 2 -368 val_368 368 val_368 2 -37 val_37 NULL NULL 2 -378 val_378 378 val_378 2 -384 val_384 384 val_384 2 -396 val_396 396 val_396 2 -399 val_399 399 val_399 2 -42 val_42 NULL NULL 2 -421 val_421 421 val_421 2 -424 val_424 424 val_424 2 -43 val_43 NULL NULL 2 -43 val_43 43 val_43 2 -435 val_435 435 val_435 2 -437 val_437 437 val_437 2 -438 val_438 438 val_438 2 -44 val_44 44 val_44 2 -443 val_443 443 val_443 2 -449 val_449 449 val_449 2 -458 val_458 458 val_458 2 -467 val_467 467 val_467 2 -487 val_487 487 val_487 2 -490 val_490 490 val_490 2 -494 val_494 494 val_494 2 -497 val_497 497 val_497 2 -51 val_51 51 val_51 2 +82 val_82 82 val_82 2 +83 val_83 83 val_83 2 85 val_85 85 val_85 2 +87 val_87 87 val_87 2 +92 val_92 92 val_92 2 +95 val_95 95 val_95 2 +96 val_96 96 val_96 2 97 val_97 97 val_97 2 +98 val_98 98 val_98 2 +24 val_24 NULL NULL 2 +43 val_43 NULL NULL 2 PREHOOK: query: explain select s.key2, s.value2 from ( @@ -4646,314 +4651,314 @@ from ( POSTHOOK: type: QUERY POSTHOOK: Input: default@src POSTHOOK: Output: hdfs://### HDFS PATH ### -0 val_0 -103 val_103 -105 val_105 116 val_116 +118 val_118 120 val_120 -129 val_129 131 val_131 -136 val_136 +133 val_133 +15 val_15 +150 val_150 +152 val_152 +153 val_153 155 val_155 -157 val_157 160 val_160 -180 val_180 +169 val_169 +175 val_175 +176 val_176 +178 val_178 183 val_183 -190 val_190 -191 val_191 -193 val_193 -205 val_205 -207 val_207 +186 val_186 +194 val_194 +202 val_202 +203 val_203 213 val_213 223 val_223 -235 val_235 -238 val_238 +224 val_224 +226 val_226 +228 val_228 239 val_239 -24 val_24 -248 val_248 -260 val_260 +244 val_244 +247 val_247 +252 val_252 +255 val_255 +256 val_256 +257 val_257 +266 val_266 +272 val_272 +274 val_274 +275 val_275 28 val_28 +284 val_284 286 val_286 -298 val_298 -305 val_305 +289 val_289 +296 val_296 +302 val_302 306 val_306 307 val_307 -308 val_308 -315 val_315 317 val_317 321 val_321 +323 val_323 33 val_33 -331 val_331 -356 val_356 +338 val_338 +34 val_34 +35 val_35 360 val_360 -366 val_366 -367 val_367 -368 val_368 -37 val_37 -378 val_378 -379 val_379 -382 val_382 -389 val_389 -395 val_395 -400 val_400 -402 val_402 +365 val_365 +374 val_374 +377 val_377 +393 val_393 +399 val_399 +404 val_404 406 val_406 -407 val_407 +409 val_409 +41 val_41 +417 val_417 +418 val_418 42 val_42 -430 val_430 -436 val_436 +431 val_431 +439 val_439 44 val_44 -452 val_452 -466 val_466 -467 val_467 -472 val_472 -480 val_480 -484 val_484 -485 val_485 -487 val_487 -495 val_495 -496 val_496 -498 val_498 -51 val_51 -57 val_57 -58 val_58 -65 val_65 +443 val_443 +448 val_448 +455 val_455 +459 val_459 +462 val_462 +463 val_463 +470 val_470 +490 val_490 +491 val_491 +494 val_494 +5 val_5 +53 val_53 66 val_66 -69 val_69 -70 val_70 -78 val_78 -8 val_8 -92 val_92 -96 val_96 -104 val_104 +72 val_72 +76 val_76 +77 val_77 +80 val_80 +84 val_84 +90 val_90 +10 val_10 +105 val_105 111 val_111 -114 val_114 -118 val_118 -12 val_12 -133 val_133 -138 val_138 -153 val_153 -156 val_156 -162 val_162 -168 val_168 +113 val_113 +119 val_119 +129 val_129 +136 val_136 +143 val_143 +149 val_149 +163 val_163 +167 val_167 174 val_174 -176 val_176 -178 val_178 -181 val_181 -186 val_186 187 val_187 -192 val_192 197 val_197 -199 val_199 2 val_2 -201 val_201 -203 val_203 +200 val_200 208 val_208 -214 val_214 +209 val_209 +216 val_216 +217 val_217 218 val_218 -219 val_219 +221 val_221 230 val_230 -237 val_237 -249 val_249 -256 val_256 -257 val_257 +258 val_258 +26 val_26 +263 val_263 +273 val_273 277 val_277 -278 val_278 -284 val_284 -285 val_285 -310 val_310 -322 val_322 -327 val_327 -333 val_333 -336 val_336 -338 val_338 +281 val_281 +292 val_292 +30 val_30 +316 val_316 +335 val_335 341 val_341 +342 val_342 344 val_344 -348 val_348 -351 val_351 +345 val_345 362 val_362 -364 val_364 -374 val_374 +367 val_367 +368 val_368 +37 val_37 392 val_392 -397 val_397 +394 val_394 4 val_4 -403 val_403 -404 val_404 -419 val_419 -421 val_421 -427 val_427 -429 val_429 +413 val_413 437 val_437 -438 val_438 -439 val_439 -454 val_454 -455 val_455 +444 val_444 +446 val_446 +452 val_452 +453 val_453 +457 val_457 460 val_460 -463 val_463 -470 val_470 -478 val_478 +466 val_466 +468 val_468 +477 val_477 479 val_479 -489 val_489 -491 val_491 +483 val_483 +487 val_487 492 val_492 -53 val_53 +493 val_493 +498 val_498 +51 val_51 +54 val_54 +64 val_64 +65 val_65 67 val_67 82 val_82 -90 val_90 -97 val_97 -10 val_10 -125 val_125 -134 val_134 -143 val_143 +85 val_85 +87 val_87 +95 val_95 +96 val_96 +100 val_100 +103 val_103 +104 val_104 +11 val_11 +114 val_114 +137 val_137 145 val_145 -149 val_149 -150 val_150 -158 val_158 -163 val_163 -164 val_164 -166 val_166 +156 val_156 +157 val_157 +162 val_162 +168 val_168 17 val_17 170 val_170 -172 val_172 -189 val_189 +180 val_180 19 val_19 -195 val_195 +190 val_190 +192 val_192 196 val_196 +199 val_199 20 val_20 -209 val_209 -216 val_216 -217 val_217 -224 val_224 -228 val_228 -229 val_229 +207 val_207 +214 val_214 +219 val_219 +222 val_222 233 val_233 241 val_241 -244 val_244 -247 val_247 -255 val_255 -258 val_258 -26 val_26 -263 val_263 -265 val_265 -266 val_266 -272 val_272 -273 val_273 -274 val_274 -281 val_281 -291 val_291 -296 val_296 -30 val_30 -302 val_302 -309 val_309 -316 val_316 +260 val_260 +27 val_27 +278 val_278 +280 val_280 +285 val_285 +288 val_288 +305 val_305 +311 val_311 318 val_318 -325 val_325 -332 val_332 -335 val_335 -339 val_339 -342 val_342 -345 val_345 -353 val_353 +322 val_322 +327 val_327 +331 val_331 +336 val_336 +348 val_348 +351 val_351 +366 val_366 369 val_369 -373 val_373 375 val_375 -377 val_377 +379 val_379 +382 val_382 384 val_384 -386 val_386 -394 val_394 +389 val_389 +395 val_395 396 val_396 -399 val_399 +397 val_397 +400 val_400 401 val_401 -41 val_41 -413 val_413 +407 val_407 414 val_414 -431 val_431 -446 val_446 -448 val_448 -449 val_449 -459 val_459 -462 val_462 -468 val_468 +421 val_421 +427 val_427 +430 val_430 +435 val_435 +438 val_438 +454 val_454 47 val_47 -482 val_482 -490 val_490 -493 val_493 -494 val_494 -497 val_497 -5 val_5 -54 val_54 +472 val_472 +478 val_478 +480 val_480 +481 val_481 +485 val_485 +489 val_489 +57 val_57 +69 val_69 74 val_74 -77 val_77 -80 val_80 -84 val_84 -85 val_85 -87 val_87 +78 val_78 +8 val_8 +86 val_86 9 val_9 -95 val_95 -100 val_100 -11 val_11 -113 val_113 -119 val_119 +0 val_0 +12 val_12 +125 val_125 126 val_126 128 val_128 -137 val_137 +134 val_134 +138 val_138 146 val_146 -15 val_15 -152 val_152 +158 val_158 +164 val_164 165 val_165 -167 val_167 -169 val_169 -175 val_175 +166 val_166 +172 val_172 177 val_177 179 val_179 18 val_18 -194 val_194 -200 val_200 -202 val_202 -221 val_221 -222 val_222 -226 val_226 +181 val_181 +189 val_189 +191 val_191 +193 val_193 +195 val_195 +201 val_201 +205 val_205 +229 val_229 +235 val_235 +237 val_237 +238 val_238 +24 val_24 242 val_242 -252 val_252 +248 val_248 +249 val_249 262 val_262 -27 val_27 -275 val_275 -280 val_280 +265 val_265 282 val_282 283 val_283 287 val_287 -288 val_288 -289 val_289 -292 val_292 -311 val_311 -323 val_323 -34 val_34 -35 val_35 -365 val_365 -393 val_393 -409 val_409 +291 val_291 +298 val_298 +308 val_308 +309 val_309 +310 val_310 +315 val_315 +325 val_325 +332 val_332 +333 val_333 +339 val_339 +353 val_353 +356 val_356 +364 val_364 +373 val_373 +378 val_378 +386 val_386 +402 val_402 +403 val_403 411 val_411 -417 val_417 -418 val_418 +419 val_419 424 val_424 +429 val_429 43 val_43 432 val_432 -435 val_435 -443 val_443 -444 val_444 -453 val_453 -457 val_457 +436 val_436 +449 val_449 458 val_458 +467 val_467 469 val_469 475 val_475 -477 val_477 -481 val_481 -483 val_483 -64 val_64 -72 val_72 -76 val_76 +482 val_482 +484 val_484 +495 val_495 +496 val_496 +497 val_497 +58 val_58 +70 val_70 83 val_83 -86 val_86 +92 val_92 +97 val_97 98 val_98 PREHOOK: query: create table src2 as select key, count(1) as count from src group by key PREHOOK: type: CREATETABLE_AS_SELECT @@ -5081,6 +5086,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5103,6 +5109,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5159,6 +5166,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5181,6 +5189,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5239,6 +5248,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5261,6 +5271,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5319,6 +5330,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5341,6 +5353,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5578,6 +5591,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5600,6 +5614,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5658,6 +5673,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5680,6 +5696,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5733,6 +5750,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5755,6 +5773,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5809,6 +5828,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -5831,6 +5851,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6047,6 +6068,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6069,6 +6091,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6122,6 +6145,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6144,6 +6168,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6202,6 +6227,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6224,6 +6250,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6277,6 +6304,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -6299,6 +6327,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -7276,314 +7305,314 @@ 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: Output: hdfs://### HDFS PATH ### -1 0 val_0 -1 103 val_103 -1 105 val_105 1 116 val_116 +1 118 val_118 1 120 val_120 -1 129 val_129 1 131 val_131 -1 136 val_136 +1 133 val_133 +1 15 val_15 +1 150 val_150 +1 152 val_152 +1 153 val_153 1 155 val_155 -1 157 val_157 1 160 val_160 -1 180 val_180 +1 169 val_169 +1 175 val_175 +1 176 val_176 +1 178 val_178 1 183 val_183 -1 190 val_190 -1 191 val_191 -1 193 val_193 -1 205 val_205 -1 207 val_207 +1 186 val_186 +1 194 val_194 +1 202 val_202 +1 203 val_203 1 213 val_213 1 223 val_223 -1 235 val_235 -1 238 val_238 +1 224 val_224 +1 226 val_226 +1 228 val_228 1 239 val_239 -1 24 val_24 -1 248 val_248 -1 260 val_260 +1 244 val_244 +1 247 val_247 +1 252 val_252 +1 255 val_255 +1 256 val_256 +1 257 val_257 +1 266 val_266 +1 272 val_272 +1 274 val_274 +1 275 val_275 1 28 val_28 +1 284 val_284 1 286 val_286 -1 298 val_298 -1 305 val_305 +1 289 val_289 +1 296 val_296 +1 302 val_302 1 306 val_306 1 307 val_307 -1 308 val_308 -1 315 val_315 1 317 val_317 1 321 val_321 +1 323 val_323 1 33 val_33 -1 331 val_331 -1 356 val_356 +1 338 val_338 +1 34 val_34 +1 35 val_35 1 360 val_360 -1 366 val_366 -1 367 val_367 -1 368 val_368 -1 37 val_37 -1 378 val_378 -1 379 val_379 -1 382 val_382 -1 389 val_389 -1 395 val_395 -1 400 val_400 -1 402 val_402 +1 365 val_365 +1 374 val_374 +1 377 val_377 +1 393 val_393 +1 399 val_399 +1 404 val_404 1 406 val_406 -1 407 val_407 +1 409 val_409 +1 41 val_41 +1 417 val_417 +1 418 val_418 1 42 val_42 -1 430 val_430 -1 436 val_436 +1 431 val_431 +1 439 val_439 1 44 val_44 +1 443 val_443 +1 448 val_448 +1 455 val_455 +1 459 val_459 +1 462 val_462 +1 463 val_463 +1 470 val_470 +1 490 val_490 +1 491 val_491 +1 494 val_494 +1 5 val_5 +1 53 val_53 +1 66 val_66 +1 72 val_72 +1 76 val_76 +1 77 val_77 +1 80 val_80 +1 84 val_84 +1 90 val_90 +1 10 val_10 +1 105 val_105 +1 111 val_111 +1 113 val_113 +1 119 val_119 +1 129 val_129 +1 136 val_136 +1 143 val_143 +1 149 val_149 +1 163 val_163 +1 167 val_167 +1 174 val_174 +1 187 val_187 +1 197 val_197 +1 2 val_2 +1 200 val_200 +1 208 val_208 +1 209 val_209 +1 216 val_216 +1 217 val_217 +1 218 val_218 +1 221 val_221 +1 230 val_230 +1 258 val_258 +1 26 val_26 +1 263 val_263 +1 273 val_273 +1 277 val_277 +1 281 val_281 +1 292 val_292 +1 30 val_30 +1 316 val_316 +1 335 val_335 +1 341 val_341 +1 342 val_342 +1 344 val_344 +1 345 val_345 +1 362 val_362 +1 367 val_367 +1 368 val_368 +1 37 val_37 +1 392 val_392 +1 394 val_394 +1 4 val_4 +1 413 val_413 +1 437 val_437 +1 444 val_444 +1 446 val_446 1 452 val_452 +1 453 val_453 +1 457 val_457 +1 460 val_460 1 466 val_466 -1 467 val_467 -1 472 val_472 -1 480 val_480 -1 484 val_484 -1 485 val_485 +1 468 val_468 +1 477 val_477 +1 479 val_479 +1 483 val_483 1 487 val_487 -1 495 val_495 -1 496 val_496 +1 492 val_492 +1 493 val_493 1 498 val_498 1 51 val_51 -1 57 val_57 -1 58 val_58 +1 54 val_54 +1 64 val_64 1 65 val_65 -1 66 val_66 -1 69 val_69 -1 70 val_70 -1 78 val_78 -1 8 val_8 -1 92 val_92 +1 67 val_67 +1 82 val_82 +1 85 val_85 +1 87 val_87 +1 95 val_95 1 96 val_96 +1 100 val_100 +1 103 val_103 1 104 val_104 -1 111 val_111 +1 11 val_11 1 114 val_114 -1 118 val_118 -1 12 val_12 -1 133 val_133 -1 138 val_138 -1 153 val_153 +1 137 val_137 +1 145 val_145 1 156 val_156 +1 157 val_157 1 162 val_162 1 168 val_168 -1 174 val_174 -1 176 val_176 -1 178 val_178 -1 181 val_181 -1 186 val_186 -1 187 val_187 +1 17 val_17 +1 170 val_170 +1 180 val_180 +1 19 val_19 +1 190 val_190 1 192 val_192 -1 197 val_197 +1 196 val_196 1 199 val_199 -1 2 val_2 -1 201 val_201 -1 203 val_203 -1 208 val_208 +1 20 val_20 +1 207 val_207 1 214 val_214 -1 218 val_218 1 219 val_219 -1 230 val_230 -1 237 val_237 -1 249 val_249 -1 256 val_256 -1 257 val_257 -1 277 val_277 +1 222 val_222 +1 233 val_233 +1 241 val_241 +1 260 val_260 +1 27 val_27 1 278 val_278 -1 284 val_284 +1 280 val_280 1 285 val_285 -1 310 val_310 +1 288 val_288 +1 305 val_305 +1 311 val_311 +1 318 val_318 1 322 val_322 1 327 val_327 -1 333 val_333 +1 331 val_331 1 336 val_336 -1 338 val_338 -1 341 val_341 -1 344 val_344 1 348 val_348 1 351 val_351 -1 362 val_362 -1 364 val_364 -1 374 val_374 -1 392 val_392 +1 366 val_366 +1 369 val_369 +1 375 val_375 +1 379 val_379 +1 382 val_382 +1 384 val_384 +1 389 val_389 +1 395 val_395 +1 396 val_396 1 397 val_397 -1 4 val_4 -1 403 val_403 -1 404 val_404 -1 419 val_419 +1 400 val_400 +1 401 val_401 +1 407 val_407 +1 414 val_414 1 421 val_421 1 427 val_427 -1 429 val_429 -1 437 val_437 +1 430 val_430 +1 435 val_435 1 438 val_438 -1 439 val_439 1 454 val_454 -1 455 val_455 -1 460 val_460 -1 463 val_463 -1 470 val_470 +1 47 val_47 +1 472 val_472 1 478 val_478 -1 479 val_479 +1 480 val_480 +1 481 val_481 +1 485 val_485 1 489 val_489 -1 491 val_491 -1 492 val_492 -1 53 val_53 -1 67 val_67 -1 82 val_82 -1 90 val_90 -1 97 val_97 -1 10 val_10 +1 57 val_57 +1 69 val_69 +1 74 val_74 +1 78 val_78 +1 8 val_8 +1 86 val_86 +1 9 val_9 +1 0 val_0 +1 12 val_12 1 125 val_125 +1 126 val_126 +1 128 val_128 1 134 val_134 -1 143 val_143 -1 145 val_145 -1 149 val_149 -1 150 val_150 +1 138 val_138 +1 146 val_146 1 158 val_158 -1 163 val_163 1 164 val_164 +1 165 val_165 1 166 val_166 -1 17 val_17 -1 170 val_170 1 172 val_172 +1 177 val_177 +1 179 val_179 +1 18 val_18 +1 181 val_181 1 189 val_189 -1 19 val_19 +1 191 val_191 +1 193 val_193 1 195 val_195 -1 196 val_196 -1 20 val_20 -1 209 val_209 -1 216 val_216 -1 217 val_217 -1 224 val_224 -1 228 val_228 +1 201 val_201 +1 205 val_205 1 229 val_229 -1 233 val_233 -1 241 val_241 -1 244 val_244 -1 247 val_247 -1 255 val_255 -1 258 val_258 -1 26 val_26 -1 263 val_263 +1 235 val_235 +1 237 val_237 +1 238 val_238 +1 24 val_24 +1 242 val_242 +1 248 val_248 +1 249 val_249 +1 262 val_262 1 265 val_265 -1 266 val_266 -1 272 val_272 -1 273 val_273 -1 274 val_274 -1 281 val_281 +1 282 val_282 +1 283 val_283 +1 287 val_287 1 291 val_291 -1 296 val_296 -1 30 val_30 -1 302 val_302 +1 298 val_298 +1 308 val_308 1 309 val_309 -1 316 val_316 -1 318 val_318 +1 310 val_310 +1 315 val_315 1 325 val_325 1 332 val_332 -1 335 val_335 +1 333 val_333 1 339 val_339 -1 342 val_342 -1 345 val_345 1 353 val_353 -1 369 val_369 +1 356 val_356 +1 364 val_364 1 373 val_373 -1 375 val_375 -1 377 val_377 -1 384 val_384 +1 378 val_378 1 386 val_386 -1 394 val_394 -1 396 val_396 -1 399 val_399 -1 401 val_401 -1 41 val_41 -1 413 val_413 -1 414 val_414 -1 431 val_431 -1 446 val_446 -1 448 val_448 -1 449 val_449 -1 459 val_459 -1 462 val_462 -1 468 val_468 -1 47 val_47 -1 482 val_482 -1 490 val_490 -1 493 val_493 -1 494 val_494 -1 497 val_497 -1 5 val_5 -1 54 val_54 -1 74 val_74 -1 77 val_77 -1 80 val_80 -1 84 val_84 -1 85 val_85 -1 87 val_87 -1 9 val_9 -1 95 val_95 -1 100 val_100 -1 11 val_11 -1 113 val_113 -1 119 val_119 -1 126 val_126 -1 128 val_128 -1 137 val_137 -1 146 val_146 -1 15 val_15 -1 152 val_152 -1 165 val_165 -1 167 val_167 -1 169 val_169 -1 175 val_175 -1 177 val_177 -1 179 val_179 -1 18 val_18 -1 194 val_194 -1 200 val_200 -1 202 val_202 -1 221 val_221 -1 222 val_222 -1 226 val_226 -1 242 val_242 -1 252 val_252 -1 262 val_262 -1 27 val_27 -1 275 val_275 -1 280 val_280 -1 282 val_282 -1 283 val_283 -1 287 val_287 -1 288 val_288 -1 289 val_289 -1 292 val_292 -1 311 val_311 -1 323 val_323 -1 34 val_34 -1 35 val_35 -1 365 val_365 -1 393 val_393 -1 409 val_409 +1 402 val_402 +1 403 val_403 1 411 val_411 -1 417 val_417 -1 418 val_418 +1 419 val_419 1 424 val_424 +1 429 val_429 1 43 val_43 1 432 val_432 -1 435 val_435 -1 443 val_443 -1 444 val_444 -1 453 val_453 -1 457 val_457 +1 436 val_436 +1 449 val_449 1 458 val_458 +1 467 val_467 1 469 val_469 1 475 val_475 -1 477 val_477 -1 481 val_481 -1 483 val_483 -1 64 val_64 -1 72 val_72 -1 76 val_76 +1 482 val_482 +1 484 val_484 +1 495 val_495 +1 496 val_496 +1 497 val_497 +1 58 val_58 +1 70 val_70 1 83 val_83 -1 86 val_86 +1 92 val_92 +1 97 val_97 1 98 val_98 PREHOOK: query: SELECT count(1) as counts, @@ -7635,314 +7664,314 @@ 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: Output: hdfs://### HDFS PATH ### -1 0 val_0 -1 103 val_103 -1 105 val_105 1 116 val_116 +1 118 val_118 1 120 val_120 -1 129 val_129 1 131 val_131 -1 136 val_136 +1 133 val_133 +1 15 val_15 +1 150 val_150 +1 152 val_152 +1 153 val_153 1 155 val_155 -1 157 val_157 1 160 val_160 -1 180 val_180 +1 169 val_169 +1 175 val_175 +1 176 val_176 +1 178 val_178 1 183 val_183 -1 190 val_190 -1 191 val_191 -1 193 val_193 -1 205 val_205 -1 207 val_207 +1 186 val_186 +1 194 val_194 +1 202 val_202 +1 203 val_203 1 213 val_213 1 223 val_223 -1 235 val_235 -1 238 val_238 +1 224 val_224 +1 226 val_226 +1 228 val_228 1 239 val_239 -1 24 val_24 -1 248 val_248 -1 260 val_260 +1 244 val_244 +1 247 val_247 +1 252 val_252 +1 255 val_255 +1 256 val_256 +1 257 val_257 +1 266 val_266 +1 272 val_272 +1 274 val_274 +1 275 val_275 1 28 val_28 +1 284 val_284 1 286 val_286 -1 298 val_298 -1 305 val_305 +1 289 val_289 +1 296 val_296 +1 302 val_302 1 306 val_306 1 307 val_307 -1 308 val_308 -1 315 val_315 1 317 val_317 1 321 val_321 +1 323 val_323 1 33 val_33 -1 331 val_331 -1 356 val_356 +1 338 val_338 +1 34 val_34 +1 35 val_35 1 360 val_360 -1 366 val_366 -1 367 val_367 -1 368 val_368 -1 37 val_37 -1 378 val_378 -1 379 val_379 -1 382 val_382 -1 389 val_389 -1 395 val_395 -1 400 val_400 -1 402 val_402 +1 365 val_365 +1 374 val_374 +1 377 val_377 +1 393 val_393 +1 399 val_399 +1 404 val_404 1 406 val_406 -1 407 val_407 +1 409 val_409 +1 41 val_41 +1 417 val_417 +1 418 val_418 1 42 val_42 -1 430 val_430 -1 436 val_436 +1 431 val_431 +1 439 val_439 1 44 val_44 -1 452 val_452 -1 466 val_466 -1 467 val_467 -1 472 val_472 -1 480 val_480 -1 484 val_484 -1 485 val_485 -1 487 val_487 -1 495 val_495 -1 496 val_496 -1 498 val_498 -1 51 val_51 -1 57 val_57 -1 58 val_58 -1 65 val_65 +1 443 val_443 +1 448 val_448 +1 455 val_455 +1 459 val_459 +1 462 val_462 +1 463 val_463 +1 470 val_470 +1 490 val_490 +1 491 val_491 +1 494 val_494 +1 5 val_5 +1 53 val_53 1 66 val_66 -1 69 val_69 -1 70 val_70 -1 78 val_78 -1 8 val_8 -1 92 val_92 -1 96 val_96 -1 104 val_104 +1 72 val_72 +1 76 val_76 +1 77 val_77 +1 80 val_80 +1 84 val_84 +1 90 val_90 +1 10 val_10 +1 105 val_105 1 111 val_111 -1 114 val_114 -1 118 val_118 -1 12 val_12 -1 133 val_133 -1 138 val_138 -1 153 val_153 -1 156 val_156 -1 162 val_162 -1 168 val_168 +1 113 val_113 +1 119 val_119 +1 129 val_129 +1 136 val_136 +1 143 val_143 +1 149 val_149 +1 163 val_163 +1 167 val_167 1 174 val_174 -1 176 val_176 -1 178 val_178 -1 181 val_181 -1 186 val_186 1 187 val_187 -1 192 val_192 1 197 val_197 -1 199 val_199 1 2 val_2 -1 201 val_201 -1 203 val_203 +1 200 val_200 1 208 val_208 -1 214 val_214 +1 209 val_209 +1 216 val_216 +1 217 val_217 1 218 val_218 -1 219 val_219 +1 221 val_221 1 230 val_230 -1 237 val_237 -1 249 val_249 -1 256 val_256 -1 257 val_257 +1 258 val_258 +1 26 val_26 +1 263 val_263 +1 273 val_273 1 277 val_277 -1 278 val_278 -1 284 val_284 -1 285 val_285 -1 310 val_310 -1 322 val_322 -1 327 val_327 -1 333 val_333 -1 336 val_336 -1 338 val_338 +1 281 val_281 +1 292 val_292 +1 30 val_30 +1 316 val_316 +1 335 val_335 1 341 val_341 +1 342 val_342 1 344 val_344 -1 348 val_348 -1 351 val_351 +1 345 val_345 1 362 val_362 -1 364 val_364 -1 374 val_374 +1 367 val_367 +1 368 val_368 +1 37 val_37 1 392 val_392 -1 397 val_397 +1 394 val_394 1 4 val_4 -1 403 val_403 -1 404 val_404 -1 419 val_419 -1 421 val_421 -1 427 val_427 -1 429 val_429 +1 413 val_413 1 437 val_437 -1 438 val_438 -1 439 val_439 -1 454 val_454 -1 455 val_455 +1 444 val_444 +1 446 val_446 +1 452 val_452 +1 453 val_453 +1 457 val_457 1 460 val_460 -1 463 val_463 -1 470 val_470 -1 478 val_478 +1 466 val_466 +1 468 val_468 +1 477 val_477 1 479 val_479 -1 489 val_489 -1 491 val_491 +1 483 val_483 +1 487 val_487 1 492 val_492 -1 53 val_53 -1 67 val_67 -1 82 val_82 -1 90 val_90 -1 97 val_97 -1 10 val_10 -1 125 val_125 -1 134 val_134 -1 143 val_143 +1 493 val_493 +1 498 val_498 +1 51 val_51 +1 54 val_54 +1 64 val_64 +1 65 val_65 +1 67 val_67 +1 82 val_82 +1 85 val_85 +1 87 val_87 +1 95 val_95 +1 96 val_96 +1 100 val_100 +1 103 val_103 +1 104 val_104 +1 11 val_11 +1 114 val_114 +1 137 val_137 1 145 val_145 -1 149 val_149 -1 150 val_150 -1 158 val_158 -1 163 val_163 -1 164 val_164 -1 166 val_166 +1 156 val_156 +1 157 val_157 +1 162 val_162 +1 168 val_168 1 17 val_17 1 170 val_170 -1 172 val_172 -1 189 val_189 +1 180 val_180 1 19 val_19 -1 195 val_195 +1 190 val_190 +1 192 val_192 1 196 val_196 +1 199 val_199 1 20 val_20 -1 209 val_209 -1 216 val_216 -1 217 val_217 -1 224 val_224 -1 228 val_228 -1 229 val_229 +1 207 val_207 +1 214 val_214 +1 219 val_219 +1 222 val_222 1 233 val_233 1 241 val_241 -1 244 val_244 -1 247 val_247 -1 255 val_255 -1 258 val_258 -1 26 val_26 -1 263 val_263 -1 265 val_265 -1 266 val_266 -1 272 val_272 -1 273 val_273 -1 274 val_274 -1 281 val_281 -1 291 val_291 -1 296 val_296 -1 30 val_30 -1 302 val_302 -1 309 val_309 -1 316 val_316 +1 260 val_260 +1 27 val_27 +1 278 val_278 +1 280 val_280 +1 285 val_285 +1 288 val_288 +1 305 val_305 +1 311 val_311 1 318 val_318 -1 325 val_325 -1 332 val_332 -1 335 val_335 -1 339 val_339 -1 342 val_342 -1 345 val_345 -1 353 val_353 +1 322 val_322 +1 327 val_327 +1 331 val_331 +1 336 val_336 +1 348 val_348 +1 351 val_351 +1 366 val_366 1 369 val_369 -1 373 val_373 1 375 val_375 -1 377 val_377 +1 379 val_379 +1 382 val_382 1 384 val_384 -1 386 val_386 -1 394 val_394 +1 389 val_389 +1 395 val_395 1 396 val_396 -1 399 val_399 +1 397 val_397 +1 400 val_400 1 401 val_401 -1 41 val_41 -1 413 val_413 +1 407 val_407 1 414 val_414 -1 431 val_431 -1 446 val_446 -1 448 val_448 -1 449 val_449 -1 459 val_459 -1 462 val_462 -1 468 val_468 +1 421 val_421 +1 427 val_427 +1 430 val_430 +1 435 val_435 +1 438 val_438 +1 454 val_454 1 47 val_47 -1 482 val_482 -1 490 val_490 -1 493 val_493 -1 494 val_494 -1 497 val_497 -1 5 val_5 -1 54 val_54 +1 472 val_472 +1 478 val_478 +1 480 val_480 +1 481 val_481 +1 485 val_485 +1 489 val_489 +1 57 val_57 +1 69 val_69 1 74 val_74 -1 77 val_77 -1 80 val_80 -1 84 val_84 -1 85 val_85 -1 87 val_87 +1 78 val_78 +1 8 val_8 +1 86 val_86 1 9 val_9 -1 95 val_95 -1 100 val_100 -1 11 val_11 -1 113 val_113 -1 119 val_119 +1 0 val_0 +1 12 val_12 +1 125 val_125 1 126 val_126 1 128 val_128 -1 137 val_137 +1 134 val_134 +1 138 val_138 1 146 val_146 -1 15 val_15 -1 152 val_152 +1 158 val_158 +1 164 val_164 1 165 val_165 -1 167 val_167 -1 169 val_169 -1 175 val_175 +1 166 val_166 +1 172 val_172 1 177 val_177 1 179 val_179 1 18 val_18 -1 194 val_194 -1 200 val_200 -1 202 val_202 -1 221 val_221 -1 222 val_222 -1 226 val_226 +1 181 val_181 +1 189 val_189 +1 191 val_191 +1 193 val_193 +1 195 val_195 +1 201 val_201 +1 205 val_205 +1 229 val_229 +1 235 val_235 +1 237 val_237 +1 238 val_238 +1 24 val_24 1 242 val_242 -1 252 val_252 +1 248 val_248 +1 249 val_249 1 262 val_262 -1 27 val_27 -1 275 val_275 -1 280 val_280 +1 265 val_265 1 282 val_282 1 283 val_283 1 287 val_287 -1 288 val_288 -1 289 val_289 -1 292 val_292 -1 311 val_311 -1 323 val_323 -1 34 val_34 -1 35 val_35 -1 365 val_365 -1 393 val_393 -1 409 val_409 +1 291 val_291 +1 298 val_298 +1 308 val_308 +1 309 val_309 +1 310 val_310 +1 315 val_315 +1 325 val_325 +1 332 val_332 +1 333 val_333 +1 339 val_339 +1 353 val_353 +1 356 val_356 +1 364 val_364 +1 373 val_373 +1 378 val_378 +1 386 val_386 +1 402 val_402 +1 403 val_403 1 411 val_411 -1 417 val_417 -1 418 val_418 +1 419 val_419 1 424 val_424 +1 429 val_429 1 43 val_43 1 432 val_432 -1 435 val_435 -1 443 val_443 -1 444 val_444 -1 453 val_453 -1 457 val_457 +1 436 val_436 +1 449 val_449 1 458 val_458 +1 467 val_467 1 469 val_469 1 475 val_475 -1 477 val_477 -1 481 val_481 -1 483 val_483 -1 64 val_64 -1 72 val_72 -1 76 val_76 +1 482 val_482 +1 484 val_484 +1 495 val_495 +1 496 val_496 +1 497 val_497 +1 58 val_58 +1 70 val_70 1 83 val_83 -1 86 val_86 +1 92 val_92 +1 97 val_97 1 98 val_98 PREHOOK: query: create table jackson_sev_same as select * from src PREHOOK: type: CREATETABLE_AS_SELECT @@ -8960,9 +8989,9 @@ POSTHOOK: query: select * from union_out POSTHOOK: type: QUERY POSTHOOK: Input: default@union_out POSTHOOK: Output: hdfs://### HDFS PATH ### -4 -1 2 +1 +4 3 PREHOOK: query: create table union_subq_union30(key int, value string) PREHOOK: type: CREATETABLE @@ -11763,15 +11792,15 @@ POSTHOOK: Input: default@src10_2 POSTHOOK: Input: default@src10_3 POSTHOOK: Input: default@src10_4 POSTHOOK: Output: hdfs://### HDFS PATH ### -238 val_238 -484 val_484 -278 val_278 255 val_255 -165 val_165 +409 val_409 27 val_27 +278 val_278 311 val_311 -409 val_409 86 val_86 +165 val_165 +238 val_238 +484 val_484 98 val_98 PREHOOK: query: explain SELECT * FROM ( @@ -11962,13 +11991,13 @@ POSTHOOK: Input: default@src10_2 POSTHOOK: Input: default@src10_3 POSTHOOK: Input: default@src10_4 POSTHOOK: Output: hdfs://### HDFS PATH ### -238 val_238 -484 val_484 -278 val_278 255 val_255 -165 val_165 +409 val_409 27 val_27 +278 val_278 311 val_311 -409 val_409 86 val_86 +165 val_165 +238 val_238 +484 val_484 98 val_98 diff --git a/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out b/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out index 5cd5d41b09..4ca5f47a85 100644 --- a/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out +++ b/ql/src/test/results/clientpositive/llap/union_fast_stats.q.out @@ -176,6 +176,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 3 numRows 15 rawDataSize 3483 @@ -228,6 +229,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 3 numRows 15 rawDataSize 3483 @@ -292,6 +294,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numRows 20 rawDataSize 4552 @@ -506,10 +509,11 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 1069 - totalSize 3243 + totalSize 3245 #### A masked pattern was here #### # Storage Information @@ -558,10 +562,11 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 15 rawDataSize 3320 - totalSize 3243 + totalSize 3245 #### A masked pattern was here #### # Storage Information @@ -622,10 +627,11 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numRows 20 rawDataSize 4389 - totalSize 4616 + totalSize 4618 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/llap/union_stats.q.out b/ql/src/test/results/clientpositive/llap/union_stats.q.out index ba2700c80d..45c98db7b4 100644 --- a/ql/src/test/results/clientpositive/llap/union_stats.q.out +++ b/ql/src/test/results/clientpositive/llap/union_stats.q.out @@ -62,6 +62,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -83,6 +84,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -146,6 +148,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -167,6 +170,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -251,6 +255,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numRows 1000 rawDataSize 10624 @@ -299,6 +304,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numRows 1500 rawDataSize 15936 @@ -355,6 +361,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numRows 1500 rawDataSize 15936 diff --git a/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out b/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out index e8bb722080..451a6e12e5 100644 --- a/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_coalesce_2.q.out @@ -168,9 +168,9 @@ GROUP BY str2 POSTHOOK: type: QUERY POSTHOOK: Input: default@str_str_orc #### A masked pattern was here #### -y 0.0 -NULL 0.0 X 0.02 +NULL 0.0 +y 0.0 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION SELECT COALESCE(str1, 0) as result from str_str_orc @@ -393,9 +393,9 @@ GROUP BY str2 POSTHOOK: type: QUERY POSTHOOK: Input: default@str_str_orc #### A masked pattern was here #### -y 0.0 -NULL 0.0 X 0.02 +NULL 0.0 +y 0.0 PREHOOK: query: EXPLAIN VECTORIZATION EXPRESSION SELECT COALESCE(str1, 0) as result from str_str_orc diff --git a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out index f2277c1521..c33abf507f 100644 --- a/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_complex_all.q.out @@ -1113,8 +1113,8 @@ POSTHOOK: Input: default@orc_create_complex #### A masked pattern was here #### lst strct ["a","b","c"] {"a":"one","b":"two"} -["d","e","f"] {"a":"three","b":"four"} ["g","h","i"] {"a":"five","b":"six"} +["d","e","f"] {"a":"three","b":"four"} PREHOOK: query: EXPLAIN VECTORIZATION DETAIL SELECT str, count(val) FROM orc_create_complex GROUP BY str PREHOOK: type: QUERY @@ -1253,9 +1253,9 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@orc_create_complex #### A masked pattern was here #### str _c1 +line2 4501 line3 4501 line1 4501 -line2 4501 PREHOOK: query: EXPLAIN VECTORIZATION DETAIL SELECT strct.B, count(val) FROM orc_create_complex GROUP BY strct.B PREHOOK: type: QUERY @@ -1492,6 +1492,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@orc_create_complex #### A masked pattern was here #### strct mp lst str _c4 -{"a":"three","b":"four"} {"key21":"value21","key22":"value22","key23":"value23"} ["d","e","f"] line2 4501 -{"a":"one","b":"two"} {"key11":"value11","key12":"value12","key13":"value13"} ["a","b","c"] line1 4501 {"a":"five","b":"six"} {"key31":"value31","key32":"value32","key33":"value33"} ["g","h","i"] line3 4501 +{"a":"one","b":"two"} {"key11":"value11","key12":"value12","key13":"value13"} ["a","b","c"] line1 4501 +{"a":"three","b":"four"} {"key21":"value21","key22":"value22","key23":"value23"} ["d","e","f"] line2 4501 diff --git a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out b/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out index ec3e2b8631..e31de7d5dd 100644 --- a/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_grouping_sets.q.out @@ -247,13 +247,13 @@ POSTHOOK: query: select s_store_id POSTHOOK: type: QUERY POSTHOOK: Input: default@store #### A masked pattern was here #### +AAAAAAAACAAAAAAA +NULL AAAAAAAABAAAAAAA AAAAAAAAEAAAAAAA AAAAAAAAHAAAAAAA -NULL AAAAAAAAIAAAAAAA AAAAAAAAKAAAAAAA -AAAAAAAACAAAAAAA PREHOOK: query: explain vectorization expression select s_store_id, GROUPING__ID from store @@ -385,13 +385,13 @@ POSTHOOK: query: select s_store_id, GROUPING__ID POSTHOOK: type: QUERY POSTHOOK: Input: default@store #### A masked pattern was here #### +AAAAAAAACAAAAAAA 0 +NULL 1 AAAAAAAABAAAAAAA 0 AAAAAAAAEAAAAAAA 0 AAAAAAAAHAAAAAAA 0 -NULL 1 AAAAAAAAIAAAAAAA 0 AAAAAAAAKAAAAAAA 0 -AAAAAAAACAAAAAAA 0 PREHOOK: query: explain select s_store_id, GROUPING__ID from store diff --git a/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out b/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out index 595b0a8d36..09ecb7750e 100644 --- a/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_windowing_multipartitioning.q.out @@ -10724,36 +10724,36 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@over10k #### A masked pattern was here #### s _c1 sum_window_1 -bob steinbeck 722083 38.33000183105469 -tom allen 1248023 89.88999938964844 -tom allen 1248023 83.47000122070312 -bob steinbeck 722083 47.810001373291016 -bob steinbeck 722083 68.46999740600586 -tom allen 1248023 68.46999740600586 -bob steinbeck 722083 28.479999542236328 -tom allen 1248023 2.8499999046325684 -bob steinbeck 722083 26.290000915527344 -bob steinbeck 722083 36.209999084472656 +tom allen 1248023 47.16999816894531 +tom allen 1248023 77.77999877929688 bob steinbeck 722083 83.52999877929688 +tom allen 1248023 83.47000122070312 +tom allen 1248023 15.84000015258789 tom allen 1248023 39.4900016784668 bob steinbeck 722083 80.7300033569336 -tom allen 1248023 77.77999877929688 -tom allen 1248023 26.239999771118164 -tom allen 1248023 95.41000366210938 -tom allen 1248023 81.8499984741211 tom allen 1248023 11.300000190734863 +tom allen 1248023 2.8499999046325684 +tom allen 1248023 19.459999084472656 +bob steinbeck 722083 26.290000915527344 +tom allen 1248023 14.510000228881836 +bob steinbeck 722083 83.52999877929688 +tom allen 1248023 52.779998779296875 +bob steinbeck 722083 9.699999809265137 tom allen 1248023 55.38999938964844 tom allen 1248023 132.82000350952148 bob steinbeck 722083 132.82000350952148 -tom allen 1248023 47.16999816894531 tom allen 1248023 11.069999694824219 -bob steinbeck 722083 83.52999877929688 -tom allen 1248023 19.459999084472656 -tom allen 1248023 14.510000228881836 +bob steinbeck 722083 38.33000183105469 +tom allen 1248023 26.239999771118164 +bob steinbeck 722083 47.810001373291016 +bob steinbeck 722083 68.46999740600586 +tom allen 1248023 68.46999740600586 +bob steinbeck 722083 28.479999542236328 +bob steinbeck 722083 36.209999084472656 +tom allen 1248023 95.41000366210938 +tom allen 1248023 89.88999938964844 tom allen 1248023 38.93000030517578 -tom allen 1248023 15.84000015258789 -tom allen 1248023 52.779998779296875 -bob steinbeck 722083 9.699999809265137 +tom allen 1248023 81.8499984741211 PREHOOK: query: explain vectorization detail select s, rank() over (partition by s order by bo), rank() over (partition by si order by bin desc) from over10k where s = 'tom allen' or s = 'bob steinbeck' diff --git a/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out b/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out index 406bd93ef5..d27d1b0c38 100644 --- a/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_windowing_rank.q.out @@ -1569,16 +1569,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@over10k #### A masked pattern was here #### ts dec rnk -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 -2013-03-01 09:11:58.703124 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 +2013-03-01 09:11:58.703323 89.50 1 PREHOOK: query: explain vectorization detail select ts, `dec`, rnk from diff --git a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out index b2db5a5a9d..80da5a98c6 100644 --- a/ql/src/test/results/clientpositive/llap/vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorization_0.q.out @@ -1839,6 +1839,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -1860,6 +1861,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30660,6 +30662,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30681,6 +30684,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30775,6 +30779,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30796,6 +30801,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30890,6 +30896,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30911,6 +30918,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30996,6 +31004,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -31017,6 +31026,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments diff --git a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out index 15b62c9781..9abc1db50a 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_dynamic_partition_pruning.q.out @@ -14,8 +14,8 @@ 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 #### A masked pattern was here #### -2008-04-08 2008-04-09 +2008-04-08 PREHOOK: query: select distinct hr from srcpart PREHOOK: type: QUERY PREHOOK: Input: default@srcpart @@ -6729,8 +6729,8 @@ 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 #### A masked pattern was here #### -2008-04-08 2008-04-09 +2008-04-08 PREHOOK: query: create table srcpart_orc (key int, value string) partitioned by (ds string, hr int) stored as orc PREHOOK: type: CREATETABLE PREHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out b/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out index cd2f6e9c2e..63afcaa466 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_insert_into_bucketed_table.q.out @@ -125,11 +125,11 @@ POSTHOOK: query: select *, regexp_extract(INPUT__FILE__NAME, '.*/(.*)', 1) from POSTHOOK: type: QUERY POSTHOOK: Input: default@foo #### A masked pattern was here #### -4 000000_0 +2 000000_0 9 000001_0 +4 000001_0 1 000001_0 -2 000002_0 -3 000003_0 +3 000002_0 PREHOOK: query: drop table foo PREHOOK: type: DROPTABLE PREHOOK: Input: default@foo diff --git a/ql/src/test/results/clientpositive/load_dyn_part8.q.out b/ql/src/test/results/clientpositive/load_dyn_part8.q.out index 1d7e966a31..2162c3acb0 100644 --- a/ql/src/test/results/clientpositive/load_dyn_part8.q.out +++ b/ql/src/test/results/clientpositive/load_dyn_part8.q.out @@ -217,6 +217,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -265,6 +266,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -313,6 +315,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -361,6 +364,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/louter_join_ppr.q.out b/ql/src/test/results/clientpositive/louter_join_ppr.q.out index 95a5c1aa55..ba1fb0ec38 100644 --- a/ql/src/test/results/clientpositive/louter_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/louter_join_ppr.q.out @@ -77,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -98,6 +99,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -148,6 +150,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -196,6 +199,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -371,6 +375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -392,6 +397,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -442,6 +448,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -490,6 +497,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -669,6 +677,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -690,6 +699,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -740,6 +750,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -788,6 +799,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -963,6 +975,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -984,6 +997,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1034,6 +1048,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1082,6 +1097,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out index c2c514faa8..3edd187322 100644 --- a/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out +++ b/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out @@ -123,6 +123,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -144,6 +145,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -169,6 +171,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -190,6 +193,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -240,6 +244,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -288,6 +293,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -336,6 +342,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -384,6 +391,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/masking_5.q.out b/ql/src/test/results/clientpositive/masking_5.q.out index acb647197f..016ab975d7 100644 --- a/ql/src/test/results/clientpositive/masking_5.q.out +++ b/ql/src/test/results/clientpositive/masking_5.q.out @@ -182,8 +182,3 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@masking_test #### A masked pattern was here #### 2 2_lav -0 0_lav -0 0_lav -8 8_lav -4 4_lav -0 0_lav diff --git a/ql/src/test/results/clientpositive/materialized_view_create.q.out b/ql/src/test/results/clientpositive/materialized_view_create.q.out index 89523042a9..7cd24a8d3c 100644 --- a/ql/src/test/results/clientpositive/materialized_view_create.q.out +++ b/ql/src/test/results/clientpositive/materialized_view_create.q.out @@ -46,6 +46,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 1025 @@ -106,6 +107,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 5 rawDataSize 580 @@ -240,6 +242,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view5 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 key value numFiles 1 numRows 5 diff --git a/ql/src/test/results/clientpositive/materialized_view_create_rewrite.q.out b/ql/src/test/results/clientpositive/materialized_view_create_rewrite.q.out index e6e559f860..81768e4aeb 100644 --- a/ql/src/test/results/clientpositive/materialized_view_create_rewrite.q.out +++ b/ql/src/test/results/clientpositive/materialized_view_create_rewrite.q.out @@ -65,6 +65,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 408 @@ -97,6 +98,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view2 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 diff --git a/ql/src/test/results/clientpositive/materialized_view_create_rewrite_4.q.out b/ql/src/test/results/clientpositive/materialized_view_create_rewrite_4.q.out index 48c0ecb23f..70b434a7ff 100644 --- a/ql/src/test/results/clientpositive/materialized_view_create_rewrite_4.q.out +++ b/ql/src/test/results/clientpositive/materialized_view_create_rewrite_4.q.out @@ -239,6 +239,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 @@ -454,6 +455,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 @@ -786,6 +788,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"c\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 3 rawDataSize 348 diff --git a/ql/src/test/results/clientpositive/materialized_view_create_rewrite_multi_db.q.out b/ql/src/test/results/clientpositive/materialized_view_create_rewrite_multi_db.q.out index d7ee468b49..c9ee6a33bf 100644 --- a/ql/src/test/results/clientpositive/materialized_view_create_rewrite_multi_db.q.out +++ b/ql/src/test/results/clientpositive/materialized_view_create_rewrite_multi_db.q.out @@ -89,6 +89,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 408 @@ -121,6 +122,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view2 POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 numFiles 1 numRows 2 rawDataSize 232 diff --git a/ql/src/test/results/clientpositive/materialized_view_describe.q.out b/ql/src/test/results/clientpositive/materialized_view_describe.q.out index efd60d4345..bea8e9487c 100644 --- a/ql/src/test/results/clientpositive/materialized_view_describe.q.out +++ b/ql/src/test/results/clientpositive/materialized_view_describe.q.out @@ -67,6 +67,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the first view key foo numFiles 1 @@ -93,6 +94,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: show tblproperties cmv_mat_view POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} +bucketing_version 2 comment this is the first view key foo numFiles 1 @@ -154,6 +156,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the second view key alice key2 bob @@ -234,6 +237,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the third view numFiles 1 numRows 5 @@ -323,6 +327,7 @@ Retention: 0 Table Type: MATERIALIZED_VIEW Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment this is the last view numFiles 1 numRows 5 diff --git a/ql/src/test/results/clientpositive/merge3.q.out b/ql/src/test/results/clientpositive/merge3.q.out index 11e704308e..0d8e91b69b 100644 --- a/ql/src/test/results/clientpositive/merge3.q.out +++ b/ql/src/test/results/clientpositive/merge3.q.out @@ -112,6 +112,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -133,6 +134,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2336,6 +2338,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 2000 rawDataSize 21248 @@ -2475,6 +2478,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2522,6 +2526,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4916,6 +4921,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4963,6 +4969,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/mm_all.q.out b/ql/src/test/results/clientpositive/mm_all.q.out index a0cbdb557b..f1f4b799a7 100644 --- a/ql/src/test/results/clientpositive/mm_all.q.out +++ b/ql/src/test/results/clientpositive/mm_all.q.out @@ -1829,6 +1829,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 6 rawDataSize 13 @@ -1878,6 +1879,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numRows 12 rawDataSize 26 @@ -1936,6 +1938,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/mm_buckets.q.out b/ql/src/test/results/clientpositive/mm_buckets.q.out index fa25be760e..2b2c95913f 100644 --- a/ql/src/test/results/clientpositive/mm_buckets.q.out +++ b/ql/src/test/results/clientpositive/mm_buckets.q.out @@ -91,10 +91,9 @@ POSTHOOK: query: select * from bucket0_mm tablesample (bucket 1 out of 2) s POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket0_mm #### A masked pattern was here #### -100 100 10 10 -0 0 98 98 +97 97 PREHOOK: query: select * from bucket0_mm tablesample (bucket 2 out of 2) s PREHOOK: type: QUERY PREHOOK: Input: default@bucket0_mm @@ -103,8 +102,9 @@ POSTHOOK: query: select * from bucket0_mm tablesample (bucket 2 out of 2) s POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket0_mm #### A masked pattern was here #### +100 100 +0 0 103 103 -97 97 PREHOOK: query: insert into table bucket0_mm select key, key from intermediate PREHOOK: type: QUERY PREHOOK: Input: default@intermediate @@ -149,14 +149,12 @@ POSTHOOK: query: select * from bucket0_mm tablesample (bucket 1 out of 2) s POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket0_mm #### A masked pattern was here #### -100 100 10 10 -0 0 98 98 -100 100 10 10 -0 0 98 98 +97 97 +97 97 PREHOOK: query: select * from bucket0_mm tablesample (bucket 2 out of 2) s PREHOOK: type: QUERY PREHOOK: Input: default@bucket0_mm @@ -165,10 +163,12 @@ POSTHOOK: query: select * from bucket0_mm tablesample (bucket 2 out of 2) s POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket0_mm #### A masked pattern was here #### +100 100 +0 0 +100 100 +0 0 103 103 -97 97 103 103 -97 97 PREHOOK: query: drop table bucket0_mm PREHOOK: type: DROPTABLE PREHOOK: Input: default@bucket0_mm @@ -318,9 +318,11 @@ POSTHOOK: Input: default@bucket1_mm@key2=98 POSTHOOK: Input: default@bucket1_mm@key2=99 #### A masked pattern was here #### 96 97 98 +97 98 99 98 97 96 -102 103 104 -104 103 102 +99 98 97 +99 100 101 +101 100 99 PREHOOK: query: select * from bucket1_mm tablesample (bucket 2 out of 2) s order by key, id PREHOOK: type: QUERY PREHOOK: Input: default@bucket1_mm @@ -355,10 +357,8 @@ POSTHOOK: Input: default@bucket1_mm@key2=99 1 0 -1 9 10 11 11 10 9 -97 98 99 -99 98 97 -99 100 101 -101 100 99 +102 103 104 +104 103 102 PREHOOK: query: drop table bucket1_mm PREHOOK: type: DROPTABLE PREHOOK: Input: default@bucket1_mm @@ -416,7 +416,6 @@ POSTHOOK: query: select * from bucket2_mm tablesample (bucket 1 out of 10) s ord POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket2_mm #### A masked pattern was here #### -0 0 PREHOOK: query: select * from bucket2_mm tablesample (bucket 4 out of 10) s order by key, id PREHOOK: type: QUERY PREHOOK: Input: default@bucket2_mm @@ -460,8 +459,6 @@ POSTHOOK: query: select * from bucket2_mm tablesample (bucket 1 out of 10) s ord POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket2_mm #### A masked pattern was here #### -0 0 -0 0 PREHOOK: query: select * from bucket2_mm tablesample (bucket 4 out of 10) s order by key, id PREHOOK: type: QUERY PREHOOK: Input: default@bucket2_mm @@ -470,7 +467,6 @@ POSTHOOK: query: select * from bucket2_mm tablesample (bucket 4 out of 10) s ord POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket2_mm #### A masked pattern was here #### -103 103 PREHOOK: query: drop table bucket2_mm PREHOOK: type: DROPTABLE PREHOOK: Input: default@bucket2_mm diff --git a/ql/src/test/results/clientpositive/mm_default.q.out b/ql/src/test/results/clientpositive/mm_default.q.out index f5341ed1a6..e08ec5fb53 100644 --- a/ql/src/test/results/clientpositive/mm_default.q.out +++ b/ql/src/test/results/clientpositive/mm_default.q.out @@ -181,6 +181,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 3 @@ -216,6 +217,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -251,6 +253,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1 rawDataSize 3 @@ -319,6 +322,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/named_column_join.q.out b/ql/src/test/results/clientpositive/named_column_join.q.out index 9a3f2715be..d32dc20c46 100644 --- a/ql/src/test/results/clientpositive/named_column_join.q.out +++ b/ql/src/test/results/clientpositive/named_column_join.q.out @@ -287,6 +287,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -353,6 +354,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -463,6 +465,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 13 rawDataSize 41 diff --git a/ql/src/test/results/clientpositive/nonmr_fetch.q.out b/ql/src/test/results/clientpositive/nonmr_fetch.q.out index 4c7716c2c1..54af2b7132 100644 --- a/ql/src/test/results/clientpositive/nonmr_fetch.q.out +++ b/ql/src/test/results/clientpositive/nonmr_fetch.q.out @@ -600,13 +600,19 @@ POSTHOOK: query: select *, BLOCK__OFFSET__INSIDE__FILE from src TABLESAMPLE (BUC POSTHOOK: type: QUERY POSTHOOK: Input: default@src #### A masked pattern was here #### -484 val_484 102 -286 val_286 1404 -187 val_187 1416 -187 val_187 2492 -77 val_77 2622 -187 val_187 4516 -448 val_448 5636 +406 val_406 244 +219 val_219 478 +280 val_280 1226 +306 val_306 2880 +458 val_458 3356 +219 val_219 3710 +280 val_280 3992 +2 val_2 4004 +406 val_406 4220 +406 val_406 4256 +70 val_70 4548 +406 val_406 5152 +458 val_458 5442 PREHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from srcpart TABLESAMPLE (BUCKET 1 OUT OF 40 ON key) PREHOOK: type: QUERY POSTHOOK: query: explain select *, BLOCK__OFFSET__INSIDE__FILE from srcpart TABLESAMPLE (BUCKET 1 OUT OF 40 ON key) @@ -647,34 +653,58 @@ 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 #### A masked pattern was here #### -484 val_484 2008-04-08 11 102 -286 val_286 2008-04-08 11 1404 -187 val_187 2008-04-08 11 1416 -187 val_187 2008-04-08 11 2492 -77 val_77 2008-04-08 11 2622 -187 val_187 2008-04-08 11 4516 -448 val_448 2008-04-08 11 5636 -484 val_484 2008-04-08 12 102 -286 val_286 2008-04-08 12 1404 -187 val_187 2008-04-08 12 1416 -187 val_187 2008-04-08 12 2492 -77 val_77 2008-04-08 12 2622 -187 val_187 2008-04-08 12 4516 -448 val_448 2008-04-08 12 5636 -484 val_484 2008-04-09 11 102 -286 val_286 2008-04-09 11 1404 -187 val_187 2008-04-09 11 1416 -187 val_187 2008-04-09 11 2492 -77 val_77 2008-04-09 11 2622 -187 val_187 2008-04-09 11 4516 -448 val_448 2008-04-09 11 5636 -484 val_484 2008-04-09 12 102 -286 val_286 2008-04-09 12 1404 -187 val_187 2008-04-09 12 1416 -187 val_187 2008-04-09 12 2492 -77 val_77 2008-04-09 12 2622 -187 val_187 2008-04-09 12 4516 -448 val_448 2008-04-09 12 5636 +406 val_406 2008-04-08 11 244 +219 val_219 2008-04-08 11 478 +280 val_280 2008-04-08 11 1226 +306 val_306 2008-04-08 11 2880 +458 val_458 2008-04-08 11 3356 +219 val_219 2008-04-08 11 3710 +280 val_280 2008-04-08 11 3992 +2 val_2 2008-04-08 11 4004 +406 val_406 2008-04-08 11 4220 +406 val_406 2008-04-08 11 4256 +70 val_70 2008-04-08 11 4548 +406 val_406 2008-04-08 11 5152 +458 val_458 2008-04-08 11 5442 +406 val_406 2008-04-08 12 244 +219 val_219 2008-04-08 12 478 +280 val_280 2008-04-08 12 1226 +306 val_306 2008-04-08 12 2880 +458 val_458 2008-04-08 12 3356 +219 val_219 2008-04-08 12 3710 +280 val_280 2008-04-08 12 3992 +2 val_2 2008-04-08 12 4004 +406 val_406 2008-04-08 12 4220 +406 val_406 2008-04-08 12 4256 +70 val_70 2008-04-08 12 4548 +406 val_406 2008-04-08 12 5152 +458 val_458 2008-04-08 12 5442 +406 val_406 2008-04-09 11 244 +219 val_219 2008-04-09 11 478 +280 val_280 2008-04-09 11 1226 +306 val_306 2008-04-09 11 2880 +458 val_458 2008-04-09 11 3356 +219 val_219 2008-04-09 11 3710 +280 val_280 2008-04-09 11 3992 +2 val_2 2008-04-09 11 4004 +406 val_406 2008-04-09 11 4220 +406 val_406 2008-04-09 11 4256 +70 val_70 2008-04-09 11 4548 +406 val_406 2008-04-09 11 5152 +458 val_458 2008-04-09 11 5442 +406 val_406 2008-04-09 12 244 +219 val_219 2008-04-09 12 478 +280 val_280 2008-04-09 12 1226 +306 val_306 2008-04-09 12 2880 +458 val_458 2008-04-09 12 3356 +219 val_219 2008-04-09 12 3710 +280 val_280 2008-04-09 12 3992 +2 val_2 2008-04-09 12 4004 +406 val_406 2008-04-09 12 4220 +406 val_406 2008-04-09 12 4256 +70 val_70 2008-04-09 12 4548 +406 val_406 2008-04-09 12 5152 +458 val_458 2008-04-09 12 5442 PREHOOK: query: explain select * from src TABLESAMPLE (0.25 PERCENT) PREHOOK: type: QUERY POSTHOOK: query: explain select * from src TABLESAMPLE (0.25 PERCENT) diff --git a/ql/src/test/results/clientpositive/nullformat.q.out b/ql/src/test/results/clientpositive/nullformat.q.out index b5821b7fcc..49a840b078 100644 --- a/ql/src/test/results/clientpositive/nullformat.q.out +++ b/ql/src/test/results/clientpositive/nullformat.q.out @@ -89,6 +89,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: INSERT OVERWRITE TABLE null_tab1 SELECT a,b FROM base_tab PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/nullformatCTAS.q.out b/ql/src/test/results/clientpositive/nullformatCTAS.q.out index 109047e85e..498c5b90c6 100644 --- a/ql/src/test/results/clientpositive/nullformatCTAS.q.out +++ b/ql/src/test/results/clientpositive/nullformatCTAS.q.out @@ -173,6 +173,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### 1.01 1.01 diff --git a/ql/src/test/results/clientpositive/offset_limit_global_optimizer.q.out b/ql/src/test/results/clientpositive/offset_limit_global_optimizer.q.out index dbb4fa360c..f39a12bf4e 100644 --- a/ql/src/test/results/clientpositive/offset_limit_global_optimizer.q.out +++ b/ql/src/test/results/clientpositive/offset_limit_global_optimizer.q.out @@ -82,6 +82,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -216,6 +217,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -264,6 +266,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -312,6 +315,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -360,6 +364,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -497,6 +502,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -545,6 +551,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -593,6 +600,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -641,6 +649,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -788,6 +797,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -836,6 +846,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -884,6 +895,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -932,6 +944,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1659,6 +1672,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1793,6 +1807,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1841,6 +1856,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1889,6 +1905,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1937,6 +1954,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2074,6 +2092,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2122,6 +2141,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2170,6 +2190,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2218,6 +2239,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2365,6 +2387,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2413,6 +2436,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2461,6 +2485,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -2509,6 +2534,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/outer_join_ppr.q.out b/ql/src/test/results/clientpositive/outer_join_ppr.q.out index e087ac5f02..f785f7539c 100644 --- a/ql/src/test/results/clientpositive/outer_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/outer_join_ppr.q.out @@ -77,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -98,6 +99,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -148,6 +150,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -196,6 +199,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -371,6 +375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -392,6 +397,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -442,6 +448,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -490,6 +497,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/outer_reference_windowed.q.out b/ql/src/test/results/clientpositive/outer_reference_windowed.q.out index aef80c5aed..067bb83880 100644 --- a/ql/src/test/results/clientpositive/outer_reference_windowed.q.out +++ b/ql/src/test/results/clientpositive/outer_reference_windowed.q.out @@ -138,6 +138,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 4 rawDataSize 12 diff --git a/ql/src/test/results/clientpositive/parallel_orderby.q.out b/ql/src/test/results/clientpositive/parallel_orderby.q.out index 571362d15c..5c1b1a0601 100644 --- a/ql/src/test/results/clientpositive/parallel_orderby.q.out +++ b/ql/src/test/results/clientpositive/parallel_orderby.q.out @@ -112,6 +112,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numRows 48 rawDataSize 512 @@ -222,6 +223,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 48 rawDataSize 512 diff --git a/ql/src/test/results/clientpositive/parquet_analyze.q.out b/ql/src/test/results/clientpositive/parquet_analyze.q.out index d07a093950..7a024f9c9e 100644 --- a/ql/src/test/results/clientpositive/parquet_analyze.q.out +++ b/ql/src/test/results/clientpositive/parquet_analyze.q.out @@ -90,6 +90,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\",\"state\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 100 rawDataSize 700 @@ -137,6 +138,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\",\"state\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 100 rawDataSize 5952 diff --git a/ql/src/test/results/clientpositive/parquet_array_null_element.q.out b/ql/src/test/results/clientpositive/parquet_array_null_element.q.out index 142f1c305c..94d834461b 100644 --- a/ql/src/test/results/clientpositive/parquet_array_null_element.q.out +++ b/ql/src/test/results/clientpositive/parquet_array_null_element.q.out @@ -70,6 +70,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"id\":\"true\",\"lstint\":\"true\",\"lststr\":\"true\",\"mp\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/parquet_create.q.out b/ql/src/test/results/clientpositive/parquet_create.q.out index fa76111c60..a37309e24b 100644 --- a/ql/src/test/results/clientpositive/parquet_create.q.out +++ b/ql/src/test/results/clientpositive/parquet_create.q.out @@ -73,6 +73,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"id\":\"true\",\"lst\":\"true\",\"mp\":\"true\",\"str\":\"true\",\"strct\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out b/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out index e931aaa335..97c69e947c 100644 --- a/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out +++ b/ql/src/test/results/clientpositive/parquet_mixed_partition_formats.q.out @@ -189,6 +189,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numPartitions 1 diff --git a/ql/src/test/results/clientpositive/parquet_partitioned.q.out b/ql/src/test/results/clientpositive/parquet_partitioned.q.out index 8e13834199..c74b52ed6e 100644 --- a/ql/src/test/results/clientpositive/parquet_partitioned.q.out +++ b/ql/src/test/results/clientpositive/parquet_partitioned.q.out @@ -62,6 +62,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 0 numPartitions 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/parquet_serde.q.out b/ql/src/test/results/clientpositive/parquet_serde.q.out index 90dc6a5ef2..7d0ca32ef4 100644 --- a/ql/src/test/results/clientpositive/parquet_serde.q.out +++ b/ql/src/test/results/clientpositive/parquet_serde.q.out @@ -126,6 +126,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numPartitions 1 diff --git a/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out b/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out index fbb78b10c0..35253a837f 100644 --- a/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/parquet_vectorization_0.q.out @@ -1726,6 +1726,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -1747,6 +1748,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30541,6 +30543,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30562,6 +30565,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30651,6 +30655,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30672,6 +30677,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30762,6 +30768,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30783,6 +30790,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30861,6 +30869,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30882,6 +30891,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments diff --git a/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out b/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out index dbbfd00430..dae8e0eb42 100644 --- a/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out +++ b/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out @@ -35,6 +35,7 @@ Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\"}} a myval b yourval + bucketing_version 2 c noval numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/pcr.q.out b/ql/src/test/results/clientpositive/pcr.q.out index f9a0c4b66a..f7242762a0 100644 --- a/ql/src/test/results/clientpositive/pcr.q.out +++ b/ql/src/test/results/clientpositive/pcr.q.out @@ -115,6 +115,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -162,6 +163,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -304,6 +306,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -351,6 +354,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -398,6 +402,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -578,6 +583,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -625,6 +631,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -769,6 +776,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -816,6 +824,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -962,6 +971,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1009,6 +1019,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1056,6 +1067,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1213,6 +1225,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1260,6 +1273,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1307,6 +1321,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1471,6 +1486,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1518,6 +1534,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1645,6 +1662,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1692,6 +1710,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1859,6 +1878,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1906,6 +1926,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1953,6 +1974,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2147,6 +2169,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2194,6 +2217,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2350,6 +2374,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2613,6 +2638,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2660,6 +2686,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2912,6 +2939,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2959,6 +2987,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3006,6 +3035,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3053,6 +3083,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3232,6 +3263,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3279,6 +3311,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3326,6 +3359,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3499,6 +3533,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3551,6 +3586,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3632,6 +3668,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3699,6 +3736,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3742,6 +3780,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3772,6 +3811,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3793,6 +3833,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3829,6 +3870,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3859,6 +3901,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3880,6 +3923,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3917,6 +3961,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4085,6 +4130,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4141,6 +4187,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4222,6 +4269,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4289,6 +4337,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4332,6 +4381,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4362,6 +4412,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4383,6 +4434,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4419,6 +4471,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4449,6 +4502,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4470,6 +4524,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4507,6 +4562,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4689,6 +4745,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -4820,6 +4877,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -4868,6 +4926,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -5003,6 +5062,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -5051,6 +5111,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/pcs.q.out b/ql/src/test/results/clientpositive/pcs.q.out index bbda3829e9..e50253e064 100644 --- a/ql/src/test/results/clientpositive/pcs.q.out +++ b/ql/src/test/results/clientpositive/pcs.q.out @@ -152,6 +152,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -199,6 +200,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -346,6 +348,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -393,6 +396,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -512,6 +516,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -559,6 +564,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -670,6 +676,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -717,6 +724,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -875,6 +883,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -922,6 +931,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1216,6 +1226,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1357,6 +1368,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1404,6 +1416,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1510,6 +1523,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1557,6 +1571,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1604,6 +1619,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1728,6 +1744,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1775,6 +1792,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1822,6 +1840,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/pointlookup2.q.out b/ql/src/test/results/clientpositive/pointlookup2.q.out index 7391b08541..c7bac2c485 100644 --- a/ql/src/test/results/clientpositive/pointlookup2.q.out +++ b/ql/src/test/results/clientpositive/pointlookup2.q.out @@ -160,6 +160,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -207,6 +208,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -358,6 +360,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -581,6 +584,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -628,6 +632,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -845,6 +850,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -892,6 +898,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -915,6 +922,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments @@ -936,6 +944,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments @@ -1160,6 +1169,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1207,6 +1217,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1254,6 +1265,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1277,6 +1289,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments @@ -1298,6 +1311,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments @@ -1680,6 +1694,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1727,6 +1742,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1878,6 +1894,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2101,6 +2118,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2148,6 +2166,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2365,6 +2384,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2412,6 +2432,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2435,6 +2456,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments @@ -2456,6 +2478,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments @@ -2680,6 +2703,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2727,6 +2751,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2774,6 +2799,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2797,6 +2823,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments @@ -2818,6 +2845,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ds,key,value columns.comments diff --git a/ql/src/test/results/clientpositive/pointlookup3.q.out b/ql/src/test/results/clientpositive/pointlookup3.q.out index 3085693dfb..ec17b4bde7 100644 --- a/ql/src/test/results/clientpositive/pointlookup3.q.out +++ b/ql/src/test/results/clientpositive/pointlookup3.q.out @@ -115,6 +115,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -163,6 +164,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -291,6 +293,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -442,6 +445,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -666,6 +670,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -714,6 +719,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -932,6 +938,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -980,6 +987,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1028,6 +1036,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1456,6 +1465,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1504,6 +1514,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1632,6 +1643,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1783,6 +1795,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2007,6 +2020,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2055,6 +2069,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2273,6 +2288,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2321,6 +2337,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2369,6 +2386,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/pointlookup4.q.out b/ql/src/test/results/clientpositive/pointlookup4.q.out index a9eb7133c5..ea1923ab5d 100644 --- a/ql/src/test/results/clientpositive/pointlookup4.q.out +++ b/ql/src/test/results/clientpositive/pointlookup4.q.out @@ -115,6 +115,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -163,6 +164,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -310,6 +312,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -358,6 +361,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/ppd_join_filter.q.out b/ql/src/test/results/clientpositive/ppd_join_filter.q.out index dd916bcdd4..f23fb8e7f9 100644 --- a/ql/src/test/results/clientpositive/ppd_join_filter.q.out +++ b/ql/src/test/results/clientpositive/ppd_join_filter.q.out @@ -67,6 +67,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -88,6 +89,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -209,6 +211,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -230,6 +233,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -396,6 +400,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -417,6 +422,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -538,6 +544,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -559,6 +566,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -725,6 +733,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -746,6 +755,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -867,6 +877,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -888,6 +899,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1054,6 +1066,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1075,6 +1088,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1196,6 +1210,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1217,6 +1232,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/ppd_vc.q.out b/ql/src/test/results/clientpositive/ppd_vc.q.out index 58b36cf6eb..af70feecbb 100644 --- a/ql/src/test/results/clientpositive/ppd_vc.q.out +++ b/ql/src/test/results/clientpositive/ppd_vc.q.out @@ -82,6 +82,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -130,6 +131,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -178,6 +180,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -226,6 +229,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -376,6 +380,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -397,6 +402,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -447,6 +453,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -495,6 +502,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -543,6 +551,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -591,6 +600,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out b/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out index d191d04192..e2271b44e5 100644 --- a/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out +++ b/ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out @@ -94,6 +94,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -142,6 +143,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -287,6 +289,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -335,6 +338,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -383,6 +387,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -431,6 +436,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/push_or.q.out b/ql/src/test/results/clientpositive/push_or.q.out index 913fc6728b..a7d17a8d99 100644 --- a/ql/src/test/results/clientpositive/push_or.q.out +++ b/ql/src/test/results/clientpositive/push_or.q.out @@ -97,6 +97,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -144,6 +145,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/quotedid_stats.q.out b/ql/src/test/results/clientpositive/quotedid_stats.q.out index b82543e4c3..8f1464a1fe 100644 --- a/ql/src/test/results/clientpositive/quotedid_stats.q.out +++ b/ql/src/test/results/clientpositive/quotedid_stats.q.out @@ -24,6 +24,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x+1`\":\"true\",\"y&y\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -68,6 +69,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"x+1`\":\"true\",\"y&y\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out b/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out index b5abb3d2b8..05e9b1f60e 100644 --- a/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out +++ b/ql/src/test/results/clientpositive/rand_partitionpruner1.q.out @@ -55,6 +55,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -76,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out b/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out index e0bf5a29ac..7a925a3433 100644 --- a/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out +++ b/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out @@ -53,6 +53,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -124,6 +125,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +174,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -240,6 +243,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -283,6 +287,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -313,6 +318,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -334,6 +340,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -370,6 +377,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -400,6 +408,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -421,6 +430,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments diff --git a/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out b/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out index ed9635fc95..426d09d6cd 100644 --- a/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out +++ b/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out @@ -41,6 +41,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -129,6 +130,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/rcfile_default_format.q.out b/ql/src/test/results/clientpositive/rcfile_default_format.q.out index 7eed769042..e552adf5cc 100644 --- a/ql/src/test/results/clientpositive/rcfile_default_format.q.out +++ b/ql/src/test/results/clientpositive/rcfile_default_format.q.out @@ -23,6 +23,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -69,6 +70,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 4812 @@ -119,6 +121,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 1406 @@ -165,6 +168,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 @@ -211,6 +215,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 4812 @@ -252,6 +257,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -298,6 +304,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 4812 @@ -339,6 +346,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/regexp_extract.q.out b/ql/src/test/results/clientpositive/regexp_extract.q.out index 56fed9e35d..b76f0ffe7d 100644 --- a/ql/src/test/results/clientpositive/regexp_extract.q.out +++ b/ql/src/test/results/clientpositive/regexp_extract.q.out @@ -70,6 +70,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -91,6 +92,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -321,6 +323,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -342,6 +345,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/rename_external_partition_location.q.out b/ql/src/test/results/clientpositive/rename_external_partition_location.q.out index 8e3c17728e..85a4739bad 100644 --- a/ql/src/test/results/clientpositive/rename_external_partition_location.q.out +++ b/ql/src/test/results/clientpositive/rename_external_partition_location.q.out @@ -102,6 +102,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} EXTERNAL TRUE + bucketing_version 2 numFiles 1 numPartitions 1 numRows 10 @@ -264,6 +265,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} EXTERNAL TRUE + bucketing_version 2 numFiles 1 numPartitions 1 numRows 10 diff --git a/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out b/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out index 7f5802a176..b2bcd51310 100644 --- a/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out +++ b/ql/src/test/results/clientpositive/repl_2_exim_basic.q.out @@ -182,6 +182,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: select * from managed_t_imported PREHOOK: type: QUERY @@ -261,6 +262,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', 'repl.last.id'='0', #### A masked pattern was here #### PREHOOK: query: select * from managed_t_r_imported @@ -342,6 +344,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: select * from ext_t_imported PREHOOK: type: QUERY @@ -422,6 +425,7 @@ LOCATION #### A masked pattern was here #### TBLPROPERTIES ( 'EXTERNAL'='FALSE', + 'bucketing_version'='2', 'repl.last.id'='0', #### A masked pattern was here #### PREHOOK: query: select * from ext_t_r_imported diff --git a/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out b/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out index 96297ff77a..e0daed5942 100644 --- a/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out +++ b/ql/src/test/results/clientpositive/repl_3_exim_metadata.q.out @@ -116,6 +116,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', 'repl.last.id'='0', #### A masked pattern was here #### PREHOOK: query: select * from repldst @@ -190,6 +191,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', 'repl.last.id'='0', #### A masked pattern was here #### PREHOOK: query: select * from repldst_md diff --git a/ql/src/test/results/clientpositive/router_join_ppr.q.out b/ql/src/test/results/clientpositive/router_join_ppr.q.out index b59930072c..4b69b0d1d4 100644 --- a/ql/src/test/results/clientpositive/router_join_ppr.q.out +++ b/ql/src/test/results/clientpositive/router_join_ppr.q.out @@ -77,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -98,6 +99,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -148,6 +150,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -196,6 +199,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -371,6 +375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -392,6 +397,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -442,6 +448,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -490,6 +497,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -669,6 +677,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -690,6 +699,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -740,6 +750,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -788,6 +799,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -963,6 +975,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -984,6 +997,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1034,6 +1048,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1082,6 +1097,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/sample1.q.out b/ql/src/test/results/clientpositive/sample1.q.out index 6d586585f5..09b9ac74f3 100644 --- a/ql/src/test/results/clientpositive/sample1.q.out +++ b/ql/src/test/results/clientpositive/sample1.q.out @@ -55,6 +55,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -126,6 +127,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -193,6 +195,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -236,6 +239,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -266,6 +270,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -287,6 +292,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -323,6 +329,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -353,6 +360,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -374,6 +382,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments diff --git a/ql/src/test/results/clientpositive/sample2.q.out b/ql/src/test/results/clientpositive/sample2.q.out index 164ce43f79..17e5491644 100644 --- a/ql/src/test/results/clientpositive/sample2.q.out +++ b/ql/src/test/results/clientpositive/sample2.q.out @@ -54,6 +54,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -101,6 +102,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -123,6 +125,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -192,6 +195,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -235,6 +239,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -265,6 +270,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -286,6 +292,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -322,6 +329,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -352,6 +360,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -373,6 +382,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -421,88 +431,36 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 30 val_30 30 val_31 -32 val_33 -34 val_34 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 54 val_54 -56 val_57 58 val_58 58 val_58 58 val_59 58 val_59 60 val_61 -62 val_63 -62 val_63 64 val_64 -66 val_66 68 val_69 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 84 val_84 84 val_84 86 val_86 @@ -510,116 +468,41 @@ POSTHOOK: Input: default@dest1 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 96 val_96 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 156 val_156 156 val_157 156 val_157 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 178 val_178 178 val_179 178 val_179 -180 val_180 182 val_183 184 val_185 -186 val_186 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -631,37 +514,19 @@ POSTHOOK: Input: default@dest1 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 238 val_238 238 val_238 238 val_239 240 val_241 -242 val_242 -242 val_242 -242 val_243 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 252 val_252 @@ -670,53 +535,23 @@ POSTHOOK: Input: default@dest1 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 266 val_266 -268 val_269 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 308 val_308 308 val_309 308 val_309 @@ -724,29 +559,17 @@ POSTHOOK: Input: default@dest1 310 val_311 310 val_311 310 val_311 -314 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 324 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 332 val_332 334 val_335 336 val_336 336 val_337 338 val_338 338 val_339 -340 val_341 342 val_342 342 val_342 342 val_343 @@ -761,26 +584,14 @@ POSTHOOK: Input: default@dest1 348 val_349 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 368 val_368 -374 val_374 -374 val_375 -376 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -791,9 +602,6 @@ POSTHOOK: Input: default@dest1 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 392 val_392 392 val_393 392 val_393 @@ -801,8 +609,6 @@ POSTHOOK: Input: default@dest1 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 402 val_402 402 val_403 402 val_403 @@ -812,24 +618,12 @@ POSTHOOK: Input: default@dest1 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 408 val_409 408 val_409 410 val_411 -412 val_413 -412 val_413 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 426 val_427 428 val_429 430 val_430 @@ -838,24 +632,12 @@ POSTHOOK: Input: default@dest1 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 440 val_441 440 val_441 -442 val_443 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 452 val_452 454 val_454 454 val_454 @@ -864,22 +646,9 @@ POSTHOOK: Input: default@dest1 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 472 val_472 474 val_475 474 val_475 @@ -898,19 +667,9 @@ POSTHOOK: Input: default@dest1 482 val_483 484 val_484 484 val_485 -486 val_487 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 498 val_498 498 val_498 498 val_498 diff --git a/ql/src/test/results/clientpositive/sample3.q.out b/ql/src/test/results/clientpositive/sample3.q.out index bfa2c74341..3bbb729405 100644 --- a/ql/src/test/results/clientpositive/sample3.q.out +++ b/ql/src/test/results/clientpositive/sample3.q.out @@ -48,192 +48,221 @@ FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s SORT BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 -0 -0 -0 -0 -10 -10 -100 -100 -100 -100 -105 -105 -105 -110 -120 -120 -120 +1 +103 +103 +122 +122 +122 125 125 125 -135 -135 -135 -140 -145 -15 -15 -15 -15 -150 +133 +133 +147 +147 155 -160 -160 +16 +16 +161 +161 +161 +161 +162 +162 +163 165 165 165 -170 -170 -175 -175 -175 -175 -180 -185 -190 -195 -195 -20 -20 -20 -200 -200 -205 -205 -205 -215 +18 +18 +194 +196 +196 +196 +196 +21 +21 +21 +21 +222 +222 230 230 230 230 230 -235 -235 +237 +237 +238 +238 +238 +24 +24 240 -245 -245 -255 -255 +246 +246 +256 +256 +256 260 260 260 -265 -265 -265 +264 +264 +273 +273 +273 +273 275 275 275 -280 -280 -285 -285 -295 -295 -30 -30 -300 -300 +276 +278 +278 +278 +288 +288 +289 +289 +296 +296 +302 +302 305 305 -310 -310 -310 -310 -315 -325 -325 -330 +311 +311 +311 +32 +323 +323 +33 +33 +332 335 335 335 -340 -345 +344 +344 +344 35 35 35 35 35 35 +352 +352 355 355 -360 -360 -365 -375 -375 -375 -375 -375 -375 -385 -385 -390 -390 -390 -395 -395 -395 -395 -40 -40 -400 +362 +366 +369 +369 +369 +369 +37 +37 +373 +373 +379 +379 +391 +391 +393 +393 +393 +397 +397 405 +407 +407 +407 +407 +41 410 -415 +411 +411 +416 425 -430 -430 -430 -430 +43 +432 +432 435 435 -440 -440 +436 +436 +439 +439 +439 +439 +441 450 450 +453 +453 +454 +454 +454 +454 +454 455 455 455 460 +466 +466 +466 +469 +469 +469 +469 +469 +469 470 470 -475 -475 -480 -480 -480 -480 -480 -485 -485 -485 -490 -490 -495 -495 -5 -5 -5 -5 -50 -60 -65 -65 -65 -70 -70 -70 -70 -75 -80 -80 -85 -85 -90 -90 -90 -95 -95 +481 +481 +484 +484 +492 +492 +492 +492 +493 +494 +494 +494 +498 +498 +498 +51 +51 +51 +52 +52 +52 +52 +53 +53 +54 +61 +68 +69 +69 +72 +72 +8 +8 +87 +87 +87 +89 +89 +89 +91 +93 +93 +93 +96 diff --git a/ql/src/test/results/clientpositive/sample4.q.out b/ql/src/test/results/clientpositive/sample4.q.out index ff97dd0d6c..6c993c8320 100644 --- a/ql/src/test/results/clientpositive/sample4.q.out +++ b/ql/src/test/results/clientpositive/sample4.q.out @@ -54,6 +54,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -101,6 +102,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -123,6 +125,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -192,6 +195,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -235,6 +239,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -265,6 +270,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -286,6 +292,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -322,6 +329,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -352,6 +360,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -373,6 +382,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -421,88 +431,36 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 30 val_30 30 val_31 -32 val_33 -34 val_34 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 54 val_54 -56 val_57 58 val_58 58 val_58 58 val_59 58 val_59 60 val_61 -62 val_63 -62 val_63 64 val_64 -66 val_66 68 val_69 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 84 val_84 84 val_84 86 val_86 @@ -510,116 +468,41 @@ POSTHOOK: Input: default@dest1 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 96 val_96 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 156 val_156 156 val_157 156 val_157 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 178 val_178 178 val_179 178 val_179 -180 val_180 182 val_183 184 val_185 -186 val_186 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -631,37 +514,19 @@ POSTHOOK: Input: default@dest1 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 238 val_238 238 val_238 238 val_239 240 val_241 -242 val_242 -242 val_242 -242 val_243 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 252 val_252 @@ -670,53 +535,23 @@ POSTHOOK: Input: default@dest1 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 266 val_266 -268 val_269 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 308 val_308 308 val_309 308 val_309 @@ -724,29 +559,17 @@ POSTHOOK: Input: default@dest1 310 val_311 310 val_311 310 val_311 -314 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 324 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 332 val_332 334 val_335 336 val_336 336 val_337 338 val_338 338 val_339 -340 val_341 342 val_342 342 val_342 342 val_343 @@ -761,26 +584,14 @@ POSTHOOK: Input: default@dest1 348 val_349 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 368 val_368 -374 val_374 -374 val_375 -376 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -791,9 +602,6 @@ POSTHOOK: Input: default@dest1 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 392 val_392 392 val_393 392 val_393 @@ -801,8 +609,6 @@ POSTHOOK: Input: default@dest1 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 402 val_402 402 val_403 402 val_403 @@ -812,24 +618,12 @@ POSTHOOK: Input: default@dest1 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 408 val_409 408 val_409 410 val_411 -412 val_413 -412 val_413 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 426 val_427 428 val_429 430 val_430 @@ -838,24 +632,12 @@ POSTHOOK: Input: default@dest1 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 440 val_441 440 val_441 -442 val_443 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 452 val_452 454 val_454 454 val_454 @@ -864,22 +646,9 @@ POSTHOOK: Input: default@dest1 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 472 val_472 474 val_475 474 val_475 @@ -898,19 +667,9 @@ POSTHOOK: Input: default@dest1 482 val_483 484 val_484 484 val_485 -486 val_487 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 498 val_498 498 val_498 498 val_498 diff --git a/ql/src/test/results/clientpositive/sample5.q.out b/ql/src/test/results/clientpositive/sample5.q.out index 6d50ff5588..6bfb36629a 100644 --- a/ql/src/test/results/clientpositive/sample5.q.out +++ b/ql/src/test/results/clientpositive/sample5.q.out @@ -55,6 +55,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -102,6 +103,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +126,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -193,6 +196,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -236,6 +240,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -266,6 +271,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -287,6 +293,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -323,6 +330,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -353,6 +361,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -374,6 +383,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -422,192 +432,221 @@ POSTHOOK: query: SELECT dest1.* FROM dest1 SORT BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 -10 val_10 -10 val_11 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -105 val_105 -105 val_106 -105 val_106 -110 val_111 -120 val_120 -120 val_120 -120 val_121 +1 val_2 +103 val_103 +103 val_103 +122 val_123 +122 val_123 +122 val_123 125 val_125 125 val_125 125 val_126 -135 val_136 -135 val_136 -135 val_136 -140 val_141 -145 val_145 -15 val_15 -15 val_15 -15 val_16 -15 val_16 -150 val_150 +133 val_133 +133 val_134 +147 val_148 +147 val_148 155 val_155 -160 val_160 -160 val_161 +16 val_17 +16 val_17 +161 val_162 +161 val_162 +161 val_162 +161 val_162 +162 val_162 +162 val_163 +163 val_163 165 val_165 165 val_165 165 val_166 -170 val_170 -170 val_171 -175 val_175 -175 val_175 -175 val_176 -175 val_176 -180 val_180 -185 val_186 -190 val_190 -195 val_195 -195 val_195 -20 val_20 -20 val_21 -20 val_21 -200 val_200 -200 val_200 -205 val_205 -205 val_205 -205 val_206 -215 val_216 +18 val_18 +18 val_18 +194 val_194 +196 val_196 +196 val_197 +196 val_197 +196 val_197 +21 val_22 +21 val_22 +21 val_22 +21 val_22 +222 val_222 +222 val_223 230 val_230 230 val_230 230 val_230 230 val_230 230 val_230 -235 val_235 -235 val_236 +237 val_237 +237 val_237 +238 val_238 +238 val_238 +238 val_239 +24 val_24 +24 val_24 240 val_241 -245 val_246 -245 val_246 -255 val_255 -255 val_255 +246 val_247 +246 val_247 +256 val_256 +256 val_256 +256 val_257 260 val_260 260 val_261 260 val_261 -265 val_265 -265 val_265 -265 val_266 +264 val_265 +264 val_265 +273 val_273 +273 val_273 +273 val_273 +273 val_274 275 val_275 275 val_276 275 val_276 -280 val_280 -280 val_280 -285 val_285 -285 val_286 -295 val_296 -295 val_296 -30 val_30 -30 val_31 -300 val_301 -300 val_301 +276 val_277 +278 val_278 +278 val_278 +278 val_279 +288 val_288 +288 val_288 +289 val_289 +289 val_290 +296 val_296 +296 val_297 +302 val_302 +302 val_303 305 val_305 305 val_306 -310 val_310 -310 val_311 -310 val_311 -310 val_311 -315 val_315 -325 val_325 -325 val_325 -330 val_331 +311 val_311 +311 val_311 +311 val_311 +32 val_33 +323 val_323 +323 val_324 +33 val_33 +33 val_34 +332 val_332 335 val_335 335 val_336 335 val_336 -340 val_341 -345 val_345 +344 val_344 +344 val_344 +344 val_345 35 val_35 35 val_35 35 val_35 35 val_36 35 val_36 35 val_36 +352 val_353 +352 val_353 355 val_356 355 val_356 -360 val_360 -360 val_361 -365 val_365 -375 val_375 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -385 val_386 -385 val_386 -390 val_391 -390 val_391 -390 val_391 -395 val_395 -395 val_395 -395 val_396 -395 val_396 -40 val_41 -40 val_41 -400 val_400 +362 val_362 +366 val_366 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +37 val_37 +37 val_37 +373 val_373 +373 val_374 +379 val_379 +379 val_380 +391 val_392 +391 val_392 +393 val_393 +393 val_394 +393 val_394 +397 val_397 +397 val_397 405 val_406 +407 val_407 +407 val_408 +407 val_408 +407 val_408 +41 val_41 410 val_411 -415 val_416 +411 val_411 +411 val_412 +416 val_417 425 val_426 -430 val_430 -430 val_430 -430 val_430 -430 val_431 +43 val_43 +432 val_432 +432 val_433 435 val_435 435 val_436 -440 val_441 -440 val_441 +436 val_436 +436 val_437 +439 val_439 +439 val_439 +439 val_440 +439 val_440 +441 val_442 450 val_451 450 val_451 +453 val_453 +453 val_454 +454 val_454 +454 val_454 +454 val_454 +454 val_455 +454 val_455 455 val_455 455 val_456 455 val_456 460 val_460 +466 val_466 +466 val_466 +466 val_466 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_470 470 val_470 470 val_471 -475 val_475 -475 val_476 -480 val_480 -480 val_480 -480 val_480 -480 val_481 -480 val_481 -485 val_485 -485 val_486 -485 val_486 -490 val_490 -490 val_491 -495 val_495 -495 val_496 -5 val_5 -5 val_5 -5 val_5 -5 val_6 -50 val_51 -60 val_61 -65 val_65 -65 val_66 -65 val_66 -70 val_70 -70 val_70 -70 val_70 -70 val_71 -75 val_76 -80 val_80 -80 val_81 -85 val_85 -85 val_86 -90 val_90 -90 val_90 -90 val_90 -95 val_95 -95 val_95 +481 val_481 +481 val_482 +484 val_484 +484 val_485 +492 val_492 +492 val_492 +492 val_493 +492 val_493 +493 val_493 +494 val_494 +494 val_495 +494 val_495 +498 val_498 +498 val_498 +498 val_498 +51 val_51 +51 val_51 +51 val_52 +52 val_53 +52 val_53 +52 val_53 +52 val_53 +53 val_53 +53 val_54 +54 val_54 +61 val_62 +68 val_69 +69 val_69 +69 val_70 +72 val_72 +72 val_72 +8 val_8 +8 val_9 +87 val_87 +87 val_88 +87 val_88 +89 val_90 +89 val_90 +89 val_90 +91 val_92 +93 val_94 +93 val_94 +93 val_94 +96 val_96 diff --git a/ql/src/test/results/clientpositive/sample6.q.out b/ql/src/test/results/clientpositive/sample6.q.out index af8537741a..b748e8d806 100644 --- a/ql/src/test/results/clientpositive/sample6.q.out +++ b/ql/src/test/results/clientpositive/sample6.q.out @@ -54,6 +54,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -101,6 +102,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -123,6 +125,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -192,6 +195,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -235,6 +239,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -265,6 +270,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -286,6 +292,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -322,6 +329,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -352,6 +360,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -373,6 +382,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -421,158 +431,76 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 -4 val_4 -4 val_5 -8 val_8 -8 val_9 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -20 val_20 -20 val_21 -20 val_21 -24 val_24 -24 val_24 -28 val_28 -32 val_33 +2 val_2 +2 val_3 +6 val_7 +6 val_7 +10 val_10 +10 val_11 +30 val_30 +30 val_31 40 val_41 40 val_41 -44 val_44 -48 val_49 -48 val_49 -52 val_53 -52 val_53 -52 val_53 -52 val_53 -56 val_57 -60 val_61 +58 val_58 +58 val_58 +58 val_59 +58 val_59 64 val_64 -68 val_69 -72 val_72 -72 val_72 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 +70 val_70 +70 val_70 +70 val_70 +70 val_71 80 val_80 80 val_81 -84 val_84 -84 val_84 -92 val_92 -96 val_96 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +86 val_86 +86 val_87 +90 val_90 +90 val_90 +90 val_90 +98 val_98 +98 val_98 +110 val_111 116 val_116 116 val_117 -120 val_120 -120 val_120 -120 val_121 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 -132 val_133 -132 val_133 -136 val_136 -136 val_137 -140 val_141 -144 val_145 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +126 val_126 +126 val_127 +126 val_127 +134 val_134 +134 val_134 +134 val_135 156 val_156 156 val_157 156 val_157 -160 val_160 -160 val_161 -164 val_164 -164 val_164 -164 val_165 -164 val_165 -168 val_168 -168 val_169 -172 val_172 -172 val_172 -172 val_173 -176 val_176 -176 val_176 -180 val_180 +158 val_158 +178 val_178 +178 val_179 +178 val_179 184 val_185 -192 val_192 -192 val_193 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 -204 val_205 +206 val_207 +206 val_207 +206 val_207 208 val_208 208 val_208 208 val_208 -212 val_213 -216 val_216 -216 val_216 -216 val_217 -224 val_224 -224 val_224 -224 val_225 -228 val_228 -228 val_229 -240 val_241 244 val_244 244 val_245 244 val_245 244 val_245 -248 val_248 -248 val_249 252 val_252 252 val_253 +254 val_255 256 val_256 256 val_256 256 val_257 -260 val_260 -260 val_261 -260 val_261 -264 val_265 -264 val_265 -268 val_269 +266 val_266 272 val_272 272 val_272 272 val_273 -276 val_277 -280 val_280 -280 val_280 -284 val_284 -284 val_285 -284 val_285 -288 val_288 -288 val_288 +286 val_286 +286 val_287 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -300 val_301 -300 val_301 304 val_305 308 val_308 308 val_309 @@ -580,13 +508,15 @@ POSTHOOK: Input: default@dest1 316 val_316 316 val_316 316 val_316 -324 val_325 -328 val_329 -328 val_329 -332 val_332 +326 val_327 +334 val_335 336 val_336 336 val_337 -340 val_341 +338 val_338 +338 val_339 +342 val_342 +342 val_342 +342 val_343 344 val_344 344 val_344 344 val_345 @@ -598,29 +528,23 @@ POSTHOOK: Input: default@dest1 348 val_349 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 360 val_360 360 val_361 +362 val_362 364 val_364 364 val_365 -368 val_368 -376 val_377 -384 val_384 -384 val_384 -384 val_384 -384 val_385 -384 val_385 -384 val_385 -388 val_389 +378 val_378 +378 val_379 392 val_392 392 val_393 392 val_393 396 val_396 396 val_396 396 val_396 -400 val_400 +402 val_402 +402 val_403 +402 val_403 +402 val_403 404 val_404 404 val_404 404 val_405 @@ -628,48 +552,27 @@ POSTHOOK: Input: default@dest1 404 val_405 408 val_409 408 val_409 -412 val_413 -412 val_413 -416 val_417 -424 val_424 -424 val_424 -424 val_425 -428 val_429 -432 val_432 -432 val_433 -436 val_436 -436 val_437 +410 val_411 +426 val_427 440 val_441 440 val_441 -444 val_444 -448 val_448 -448 val_449 452 val_452 -460 val_460 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 +458 val_458 +458 val_458 +466 val_466 +466 val_466 +466 val_466 472 val_472 476 val_477 476 val_477 -480 val_480 -480 val_480 -480 val_480 -480 val_481 -480 val_481 +478 val_478 +478 val_478 +478 val_479 +478 val_479 +482 val_482 +482 val_483 484 val_484 484 val_485 -488 val_489 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -496 val_496 -496 val_497 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 4 OUT OF 4 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -716,6 +619,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -738,6 +642,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -802,147 +707,105 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -3 val_4 -11 val_11 -11 val_12 -11 val_12 -11 val_12 +5 val_5 +5 val_5 +5 val_5 +5 val_6 15 val_15 15 val_15 15 val_16 15 val_16 -19 val_19 -19 val_20 23 val_24 -27 val_27 -31 val_32 +33 val_33 +33 val_34 35 val_35 35 val_35 35 val_35 35 val_36 35 val_36 35 val_36 -43 val_43 47 val_47 47 val_48 -51 val_51 -51 val_51 -51 val_52 -59 val_60 +49 val_50 +49 val_50 +53 val_53 +53 val_54 63 val_64 -67 val_67 -67 val_67 -71 val_72 75 val_76 -83 val_83 -83 val_83 87 val_87 87 val_88 87 val_88 -91 val_92 95 val_95 95 val_95 -99 val_100 -103 val_103 -103 val_103 111 val_111 -119 val_119 -119 val_119 -119 val_119 -119 val_120 -119 val_120 -119 val_120 -123 val_124 -123 val_124 -131 val_131 -135 val_136 -135 val_136 -135 val_136 -143 val_143 -143 val_144 +125 val_125 +125 val_125 +125 val_126 +129 val_129 +129 val_129 +129 val_130 +129 val_130 +145 val_145 147 val_148 147 val_148 151 val_152 151 val_152 -155 val_155 -163 val_163 +161 val_162 +161 val_162 +161 val_162 +161 val_162 167 val_167 167 val_167 167 val_167 167 val_168 -175 val_175 -175 val_175 -175 val_176 -175 val_176 -179 val_179 -179 val_179 -179 val_180 -183 val_183 -183 val_184 -187 val_187 -187 val_187 -187 val_187 -191 val_191 -191 val_191 -191 val_192 -195 val_195 -195 val_195 -199 val_199 -199 val_199 -199 val_199 -199 val_200 +193 val_193 +193 val_193 +193 val_193 203 val_203 203 val_203 207 val_207 207 val_207 -215 val_216 +209 val_209 +209 val_209 +209 val_210 +209 val_210 +213 val_213 +213 val_213 +213 val_214 219 val_219 219 val_219 -223 val_223 -223 val_223 227 val_228 -231 val_232 -235 val_235 -235 val_236 -239 val_239 -239 val_239 -239 val_240 -239 val_240 -243 val_244 -243 val_244 -247 val_247 -255 val_255 -255 val_255 +241 val_241 +241 val_242 +241 val_242 +241 val_242 +241 val_242 +245 val_246 +245 val_246 +257 val_257 +257 val_258 +257 val_258 259 val_260 259 val_260 263 val_263 +265 val_265 +265 val_265 +265 val_266 267 val_268 -271 val_272 -275 val_275 -275 val_276 -275 val_276 +273 val_273 +273 val_273 +273 val_273 +273 val_274 +281 val_281 +281 val_281 +281 val_282 +281 val_282 +281 val_282 283 val_283 -287 val_287 -287 val_288 -287 val_288 -291 val_291 -291 val_292 -291 val_292 -295 val_296 -295 val_296 +293 val_294 +293 val_294 303 val_304 303 val_304 -307 val_307 -307 val_307 -311 val_311 -311 val_311 -311 val_311 -315 val_315 -323 val_323 -323 val_324 -327 val_327 -327 val_327 -327 val_327 331 val_331 331 val_331 331 val_332 @@ -950,97 +813,51 @@ POSTHOOK: Input: default@srcbucket 335 val_335 335 val_336 335 val_336 -339 val_339 -343 val_344 -347 val_348 -347 val_348 -351 val_351 -351 val_352 -351 val_352 -355 val_356 -355 val_356 -363 val_364 -363 val_364 -363 val_364 367 val_367 367 val_367 367 val_368 367 val_368 -371 val_372 -371 val_372 -371 val_372 -371 val_372 -375 val_375 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -375 val_376 +373 val_373 +373 val_374 379 val_379 379 val_380 -391 val_392 -391 val_392 +381 val_382 +385 val_386 +385 val_386 395 val_395 395 val_395 395 val_396 395 val_396 -399 val_399 -399 val_399 -399 val_400 -399 val_400 +401 val_401 +401 val_401 +401 val_401 +401 val_401 +401 val_401 +401 val_402 403 val_403 403 val_403 403 val_403 -407 val_407 -407 val_408 -407 val_408 -407 val_408 -411 val_411 -411 val_412 +405 val_406 415 val_416 -419 val_419 -423 val_424 -427 val_427 -427 val_428 -427 val_428 +429 val_429 +429 val_429 +429 val_430 +429 val_430 431 val_431 431 val_431 431 val_431 431 val_432 -435 val_435 -435 val_436 -439 val_439 -439 val_439 -439 val_440 -439 val_440 -443 val_443 -443 val_444 -443 val_444 -443 val_444 +441 val_442 447 val_448 -451 val_452 -455 val_455 -455 val_456 -455 val_456 -459 val_459 -459 val_459 -459 val_460 -463 val_463 -463 val_463 -463 val_464 -467 val_467 -467 val_468 475 val_475 475 val_476 -479 val_479 -483 val_483 -487 val_487 -487 val_488 -491 val_491 -491 val_492 -491 val_492 -495 val_495 -495 val_496 +481 val_481 +481 val_482 +489 val_489 +489 val_489 +489 val_489 +489 val_489 +489 val_490 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -1087,6 +904,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1109,6 +927,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1173,88 +992,36 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 30 val_30 30 val_31 -32 val_33 -34 val_34 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 54 val_54 -56 val_57 58 val_58 58 val_58 58 val_59 58 val_59 60 val_61 -62 val_63 -62 val_63 64 val_64 -66 val_66 68 val_69 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 84 val_84 84 val_84 86 val_86 @@ -1262,116 +1029,41 @@ POSTHOOK: Input: default@srcbucket 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 96 val_96 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 156 val_156 156 val_157 156 val_157 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 178 val_178 178 val_179 178 val_179 -180 val_180 182 val_183 184 val_185 -186 val_186 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -1383,37 +1075,19 @@ POSTHOOK: Input: default@srcbucket 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 238 val_238 238 val_238 238 val_239 240 val_241 -242 val_242 -242 val_242 -242 val_243 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 252 val_252 @@ -1422,53 +1096,23 @@ POSTHOOK: Input: default@srcbucket 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 266 val_266 -268 val_269 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 308 val_308 308 val_309 308 val_309 @@ -1476,29 +1120,17 @@ POSTHOOK: Input: default@srcbucket 310 val_311 310 val_311 310 val_311 -314 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 324 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 332 val_332 334 val_335 336 val_336 336 val_337 338 val_338 338 val_339 -340 val_341 342 val_342 342 val_342 342 val_343 @@ -1513,26 +1145,14 @@ POSTHOOK: Input: default@srcbucket 348 val_349 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 368 val_368 -374 val_374 -374 val_375 -376 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -1543,9 +1163,6 @@ POSTHOOK: Input: default@srcbucket 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 392 val_392 392 val_393 392 val_393 @@ -1553,8 +1170,6 @@ POSTHOOK: Input: default@srcbucket 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 402 val_402 402 val_403 402 val_403 @@ -1564,24 +1179,12 @@ POSTHOOK: Input: default@srcbucket 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 408 val_409 408 val_409 410 val_411 -412 val_413 -412 val_413 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 426 val_427 428 val_429 430 val_430 @@ -1590,24 +1193,12 @@ POSTHOOK: Input: default@srcbucket 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 440 val_441 440 val_441 -442 val_443 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 452 val_452 454 val_454 454 val_454 @@ -1616,22 +1207,9 @@ POSTHOOK: Input: default@srcbucket 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 472 val_472 474 val_475 474 val_475 @@ -1650,19 +1228,9 @@ POSTHOOK: Input: default@srcbucket 482 val_483 484 val_484 484 val_485 -486 val_487 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 498 val_498 498 val_498 498 val_498 @@ -1711,6 +1279,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1733,6 +1302,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1797,24 +1367,16 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 -3 val_4 -6 val_7 -6 val_7 9 val_9 -12 val_12 -12 val_12 -12 val_13 -15 val_15 -15 val_15 -15 val_16 -15 val_16 +16 val_17 +16 val_17 18 val_18 18 val_18 +19 val_19 +19 val_20 +20 val_20 +20 val_21 +20 val_21 21 val_22 21 val_22 21 val_22 @@ -1822,265 +1384,302 @@ POSTHOOK: Input: default@srcbucket 24 val_24 24 val_24 27 val_27 +29 val_30 +29 val_30 30 val_30 30 val_31 -33 val_33 -33 val_34 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -48 val_49 -48 val_49 -51 val_51 -51 val_51 -51 val_52 +31 val_32 +32 val_33 +40 val_41 +40 val_41 +41 val_41 +43 val_43 +44 val_44 +47 val_47 +47 val_48 +49 val_50 +49 val_50 +50 val_51 54 val_54 -57 val_57 -60 val_61 -63 val_64 -66 val_66 -69 val_69 -69 val_70 -72 val_72 -72 val_72 +61 val_62 +64 val_64 +67 val_67 +67 val_67 +70 val_70 +70 val_70 +70 val_70 +70 val_71 +71 val_72 +74 val_74 75 val_76 -78 val_78 -78 val_79 -84 val_84 -84 val_84 +76 val_76 +76 val_76 +76 val_77 +76 val_77 +76 val_77 +77 val_77 +77 val_78 +77 val_78 +82 val_82 +82 val_83 +82 val_83 +85 val_85 +85 val_86 87 val_87 87 val_88 87 val_88 +89 val_90 +89 val_90 +89 val_90 90 val_90 90 val_90 90 val_90 -93 val_94 -93 val_94 -93 val_94 -96 val_96 -99 val_100 -102 val_103 +92 val_92 105 val_105 105 val_106 105 val_106 -111 val_111 114 val_114 114 val_115 114 val_115 114 val_115 +116 val_116 +116 val_117 117 val_118 117 val_118 +118 val_118 +118 val_118 +118 val_119 +118 val_119 +118 val_119 120 val_120 120 val_120 120 val_121 -123 val_124 -123 val_124 -126 val_126 -126 val_127 -126 val_127 -129 val_129 -129 val_129 -129 val_130 -129 val_130 -132 val_133 -132 val_133 +122 val_123 +122 val_123 +122 val_123 +134 val_134 +134 val_134 +134 val_135 135 val_136 135 val_136 135 val_136 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 +143 val_143 +143 val_144 144 val_145 -147 val_148 -147 val_148 -150 val_150 -153 val_153 -153 val_154 -153 val_154 -156 val_156 -156 val_157 -156 val_157 -162 val_162 -162 val_163 +145 val_145 +146 val_146 +146 val_146 +149 val_149 +149 val_149 +149 val_150 +157 val_157 +157 val_158 +157 val_158 +158 val_158 +161 val_162 +161 val_162 +161 val_162 +161 val_162 165 val_165 165 val_165 165 val_166 +166 val_166 168 val_168 168 val_169 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -177 val_177 -177 val_178 -177 val_178 +170 val_170 +170 val_171 +179 val_179 +179 val_179 +179 val_180 180 val_180 +181 val_181 183 val_183 183 val_184 -186 val_186 -189 val_189 -189 val_190 192 val_192 192 val_193 +193 val_193 +193 val_193 +193 val_193 195 val_195 195 val_195 -201 val_201 +197 val_197 +197 val_197 +197 val_198 +203 val_203 +203 val_203 204 val_205 -207 val_207 -207 val_207 -213 val_213 -213 val_213 -213 val_214 -216 val_216 -216 val_216 -216 val_217 -219 val_219 -219 val_219 +209 val_209 +209 val_209 +209 val_210 +209 val_210 +214 val_214 222 val_222 222 val_223 +226 val_226 +226 val_227 +226 val_227 +226 val_227 +226 val_227 228 val_228 228 val_229 -231 val_232 -237 val_237 -237 val_237 -240 val_241 -243 val_244 -243 val_244 -246 val_247 -246 val_247 -249 val_249 -249 val_250 -249 val_250 -252 val_252 -252 val_253 -255 val_255 -255 val_255 -258 val_258 -258 val_259 +235 val_235 +235 val_236 +238 val_238 +238 val_238 +238 val_239 +241 val_241 +241 val_242 +241 val_242 +241 val_242 +241 val_242 +242 val_242 +242 val_242 +242 val_243 +245 val_246 +245 val_246 +254 val_255 +256 val_256 +256 val_256 +256 val_257 261 val_262 -264 val_265 -264 val_265 -267 val_268 +262 val_262 +262 val_263 +262 val_263 +266 val_266 +268 val_269 +271 val_272 273 val_273 273 val_273 273 val_273 273 val_274 276 val_277 -282 val_282 -282 val_282 +278 val_278 +278 val_278 +278 val_279 +280 val_280 +280 val_280 +284 val_284 +284 val_285 +284 val_285 285 val_285 285 val_286 -288 val_288 -288 val_288 -291 val_291 -291 val_292 -291 val_292 -300 val_301 -300 val_301 -303 val_304 -303 val_304 +286 val_286 +286 val_287 +287 val_287 +287 val_288 +287 val_288 +288 val_288 +288 val_288 +292 val_292 +292 val_293 +292 val_293 +293 val_294 +293 val_294 +295 val_296 +295 val_296 +298 val_298 +298 val_298 +298 val_298 +300 val_301 +300 val_301 306 val_306 306 val_307 +308 val_308 +308 val_309 +308 val_309 309 val_309 309 val_309 309 val_310 -315 val_315 +316 val_316 +316 val_316 +316 val_316 318 val_318 318 val_318 318 val_318 318 val_319 -321 val_321 -321 val_321 -324 val_325 -327 val_327 -327 val_327 -327 val_327 -330 val_331 -333 val_333 -333 val_333 -333 val_334 -336 val_336 -336 val_337 -339 val_339 -342 val_342 -342 val_342 -342 val_343 -345 val_345 +323 val_323 +323 val_324 +325 val_325 +325 val_325 +326 val_327 +331 val_331 +331 val_331 +331 val_332 +331 val_332 +332 val_332 +341 val_341 +341 val_342 +341 val_342 +341 val_342 +343 val_344 +344 val_344 +344 val_344 +344 val_345 +347 val_348 +347 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_349 -351 val_351 -351 val_352 -351 val_352 -360 val_360 -360 val_361 -363 val_364 -363 val_364 -363 val_364 +364 val_364 +364 val_365 366 val_366 369 val_369 369 val_369 369 val_369 369 val_370 -375 val_375 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -378 val_378 -378 val_379 -381 val_382 +373 val_373 +373 val_374 +374 val_374 +374 val_375 +379 val_379 +379 val_380 384 val_384 384 val_384 384 val_384 384 val_385 384 val_385 384 val_385 -390 val_391 -390 val_391 -390 val_391 -393 val_393 -393 val_394 -393 val_394 -396 val_396 -396 val_396 -396 val_396 +391 val_392 +391 val_392 +392 val_392 +392 val_393 +392 val_393 +395 val_395 +395 val_395 +395 val_396 +395 val_396 +397 val_397 +397 val_397 399 val_399 399 val_399 399 val_400 399 val_400 -402 val_402 -402 val_403 -402 val_403 -402 val_403 -405 val_406 -408 val_409 -408 val_409 -411 val_411 -411 val_412 +407 val_407 +407 val_408 +407 val_408 +407 val_408 +409 val_409 +409 val_409 +409 val_409 +409 val_410 +409 val_410 +410 val_411 414 val_414 414 val_414 414 val_415 +415 val_416 417 val_417 417 val_417 417 val_417 423 val_424 426 val_427 -429 val_429 -429 val_429 -429 val_430 -429 val_430 -432 val_432 -432 val_433 +430 val_430 +430 val_430 +430 val_430 +430 val_431 435 val_435 435 val_436 438 val_438 @@ -2088,19 +1687,24 @@ POSTHOOK: Input: default@srcbucket 438 val_438 438 val_439 438 val_439 -441 val_442 +439 val_439 +439 val_439 +439 val_440 +439 val_440 +440 val_441 +440 val_441 +443 val_443 +443 val_444 +443 val_444 +443 val_444 444 val_444 447 val_448 -450 val_451 -450 val_451 -453 val_453 -453 val_454 +448 val_448 +448 val_449 +452 val_452 459 val_459 459 val_459 459 val_460 -462 val_462 -462 val_462 -462 val_463 468 val_468 468 val_468 468 val_468 @@ -2108,31 +1712,39 @@ POSTHOOK: Input: default@srcbucket 468 val_469 468 val_469 468 val_469 -474 val_475 -474 val_475 -477 val_477 -477 val_478 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_470 +470 val_470 +470 val_471 +472 val_472 +478 val_478 +478 val_478 +478 val_479 +478 val_479 480 val_480 480 val_480 480 val_480 480 val_481 480 val_481 -483 val_483 -486 val_487 -489 val_489 -489 val_489 -489 val_489 -489 val_489 -489 val_490 +485 val_485 +485 val_486 +485 val_486 +491 val_491 +491 val_492 +491 val_492 492 val_492 492 val_492 492 val_493 492 val_493 495 val_495 495 val_496 -498 val_498 -498 val_498 -498 val_498 +497 val_497 +497 val_498 +497 val_498 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 2 OUT OF 3 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -2178,6 +1790,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2200,6 +1813,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2264,91 +1878,125 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### +0 val_0 +0 val_0 +0 val_0 +0 val_1 +0 val_1 1 val_2 -4 val_4 -4 val_5 +5 val_5 +5 val_5 +5 val_5 +5 val_6 +8 val_8 +8 val_9 10 val_10 10 val_11 -16 val_17 -16 val_17 -19 val_19 -19 val_20 -22 val_23 -28 val_28 -31 val_32 +15 val_15 +15 val_15 +15 val_16 +15 val_16 +17 val_17 +26 val_26 +26 val_26 +33 val_33 +33 val_34 34 val_34 37 val_37 37 val_37 -40 val_41 -40 val_41 -43 val_43 -46 val_47 -49 val_50 -49 val_50 +42 val_42 +42 val_42 +42 val_43 +42 val_43 +42 val_43 52 val_53 52 val_53 52 val_53 52 val_53 +53 val_53 +53 val_54 +56 val_57 58 val_58 58 val_58 58 val_59 58 val_59 -61 val_62 -64 val_64 -67 val_67 -67 val_67 -70 val_70 -70 val_70 -70 val_70 -70 val_71 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -82 val_82 -82 val_83 -82 val_83 -85 val_85 -85 val_86 +59 val_60 +60 val_61 +65 val_65 +65 val_66 +65 val_66 +66 val_66 +69 val_69 +69 val_70 +72 val_72 +72 val_72 +83 val_83 +83 val_83 +84 val_84 +84 val_84 91 val_92 94 val_95 97 val_97 97 val_97 97 val_98 97 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -103 val_103 -103 val_103 +99 val_100 +101 val_102 +102 val_103 +104 val_104 +104 val_104 +104 val_105 +104 val_105 +104 val_105 106 val_107 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 +110 val_111 +113 val_113 +113 val_113 121 val_122 121 val_122 +123 val_124 +123 val_124 +126 val_126 +126 val_127 +126 val_127 +128 val_128 +128 val_128 +128 val_128 +128 val_129 +128 val_129 +132 val_133 +132 val_133 133 val_133 133 val_134 -136 val_136 -136 val_137 -145 val_145 -151 val_152 -151 val_152 -157 val_157 -157 val_158 -157 val_158 +137 val_137 +137 val_137 +137 val_138 +138 val_138 +138 val_138 +138 val_138 +138 val_138 +138 val_139 +138 val_139 +150 val_150 +152 val_152 +152 val_152 +152 val_153 +152 val_153 +152 val_153 +153 val_153 +153 val_154 +153 val_154 160 val_160 160 val_161 163 val_163 -166 val_166 -169 val_169 -169 val_169 -169 val_169 -169 val_169 +164 val_164 +164 val_164 +164 val_165 +164 val_165 +167 val_167 +167 val_167 +167 val_167 +167 val_168 172 val_172 172 val_172 172 val_173 @@ -2356,197 +2004,154 @@ POSTHOOK: Input: default@srcbucket 175 val_175 175 val_176 175 val_176 -178 val_178 -178 val_179 -178 val_179 -181 val_181 +176 val_176 +176 val_176 +177 val_177 +177 val_178 +177 val_178 184 val_185 187 val_187 187 val_187 187 val_187 +189 val_189 +189 val_190 190 val_190 -193 val_193 -193 val_193 -193 val_193 -196 val_196 -196 val_197 -196 val_197 -196 val_197 +194 val_194 199 val_199 199 val_199 199 val_199 199 val_200 202 val_202 -205 val_205 -205 val_205 -205 val_206 -208 val_208 -208 val_208 -208 val_208 -214 val_214 -217 val_217 -217 val_217 -217 val_218 -217 val_218 -223 val_223 -223 val_223 -226 val_226 -226 val_227 -226 val_227 -226 val_227 -226 val_227 +212 val_213 +213 val_213 +213 val_213 +213 val_214 +215 val_216 +218 val_218 +219 val_219 +219 val_219 +224 val_224 +224 val_224 +224 val_225 +227 val_228 229 val_229 229 val_229 -235 val_235 -235 val_236 -238 val_238 -238 val_238 -238 val_239 -241 val_241 -241 val_242 -241 val_242 -241 val_242 -241 val_242 -244 val_244 -244 val_245 -244 val_245 -244 val_245 +233 val_233 +233 val_233 +243 val_244 +243 val_244 +246 val_247 +246 val_247 247 val_247 -256 val_256 -256 val_256 -256 val_257 +249 val_249 +249 val_250 +249 val_250 +252 val_252 +252 val_253 +255 val_255 +255 val_255 +257 val_257 +257 val_258 +257 val_258 259 val_260 259 val_260 -262 val_262 -262 val_263 -262 val_263 -265 val_265 -265 val_265 -265 val_266 -268 val_269 -271 val_272 -274 val_274 -274 val_275 +260 val_260 +260 val_261 +260 val_261 +267 val_268 +272 val_272 +272 val_272 +272 val_273 +275 val_275 +275 val_276 +275 val_276 277 val_277 277 val_277 277 val_277 277 val_277 277 val_278 277 val_278 -280 val_280 -280 val_280 -283 val_283 -286 val_286 -286 val_287 +282 val_282 +282 val_282 289 val_289 289 val_290 -292 val_292 -292 val_293 -292 val_293 -295 val_296 -295 val_296 -298 val_298 -298 val_298 -298 val_298 304 val_305 -307 val_307 -307 val_307 310 val_310 310 val_311 310 val_311 310 val_311 313 val_314 -316 val_316 -316 val_316 -316 val_316 -322 val_322 -322 val_322 -322 val_323 -325 val_325 -325 val_325 -328 val_329 -328 val_329 -331 val_331 -331 val_331 -331 val_332 -331 val_332 -334 val_335 -337 val_338 +314 val_315 +315 val_315 +324 val_325 +330 val_331 +333 val_333 +333 val_333 +333 val_334 340 val_341 -343 val_344 -349 val_350 -349 val_350 -349 val_350 -349 val_350 -352 val_353 -352 val_353 -355 val_356 -355 val_356 +351 val_351 +351 val_352 +351 val_352 +353 val_353 +353 val_353 +353 val_354 +356 val_356 +356 val_357 +356 val_357 358 val_359 -364 val_364 -364 val_365 -367 val_367 -367 val_367 -367 val_368 -367 val_368 -373 val_373 -373 val_374 -376 val_377 -379 val_379 -379 val_380 +363 val_364 +363 val_364 +363 val_364 +377 val_377 +378 val_378 +378 val_379 382 val_382 382 val_382 382 val_383 382 val_383 -385 val_386 -385 val_386 -388 val_389 -391 val_392 -391 val_392 -394 val_394 -397 val_397 -397 val_397 -400 val_400 -403 val_403 -403 val_403 -403 val_403 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 -409 val_409 -409 val_409 -409 val_409 -409 val_410 -409 val_410 +385 val_386 +385 val_386 +388 val_389 +393 val_393 +393 val_394 +393 val_394 +396 val_396 +396 val_396 +396 val_396 +402 val_402 +402 val_403 +402 val_403 +402 val_403 +405 val_406 +408 val_409 +408 val_409 412 val_413 412 val_413 -415 val_416 -418 val_418 +413 val_413 +413 val_413 +413 val_414 +416 val_417 +419 val_419 421 val_421 421 val_422 421 val_422 -424 val_424 -424 val_424 -424 val_425 -427 val_427 -427 val_428 -427 val_428 -430 val_430 -430 val_430 -430 val_430 -430 val_431 +429 val_429 +429 val_429 +429 val_430 +429 val_430 +432 val_432 +432 val_433 436 val_436 436 val_437 -439 val_439 -439 val_439 -439 val_440 -439 val_440 -442 val_443 -448 val_448 -448 val_449 +437 val_437 +437 val_438 +441 val_442 +446 val_446 +446 val_447 +446 val_447 451 val_452 +453 val_453 +453 val_454 454 val_454 454 val_454 454 val_454 @@ -2555,37 +2160,41 @@ POSTHOOK: Input: default@srcbucket 457 val_457 457 val_458 457 val_458 +458 val_458 +458 val_458 460 val_460 +461 val_462 463 val_463 463 val_463 463 val_464 466 val_466 466 val_466 466 val_466 -469 val_469 -469 val_469 -469 val_469 -469 val_469 -469 val_469 -469 val_470 -472 val_472 +474 val_475 +474 val_475 475 val_475 475 val_476 -478 val_478 -478 val_478 -478 val_479 -478 val_479 +476 val_477 +476 val_477 +477 val_477 +477 val_478 481 val_481 481 val_482 +482 val_482 +482 val_483 +483 val_483 484 val_484 484 val_485 +486 val_487 487 val_487 487 val_488 +489 val_489 +489 val_489 +489 val_489 +489 val_489 +489 val_490 490 val_490 490 val_491 -493 val_493 -496 val_496 -496 val_497 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket2 TABLESAMPLE (BUCKET 1 OUT OF 2 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -2632,6 +2241,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2654,6 +2264,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2680,6 +2291,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2702,6 +2314,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2767,104 +2380,40 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket2 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 2 val_2 -4 val_4 -8 val_8 10 val_10 -12 val_12 -12 val_12 -18 val_18 -18 val_18 20 val_20 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 30 val_30 -34 val_34 -42 val_42 -42 val_42 -44 val_44 54 val_54 58 val_58 58 val_58 64 val_64 -66 val_66 70 val_70 70 val_70 70 val_70 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -78 val_78 80 val_80 -82 val_82 84 val_84 84 val_84 86 val_86 90 val_90 90 val_90 90 val_90 -92 val_92 96 val_96 98 val_98 98 val_98 -100 val_100 -100 val_100 -104 val_104 -104 val_104 -114 val_114 116 val_116 -118 val_118 -118 val_118 -120 val_120 -120 val_120 126 val_126 -128 val_128 -128 val_128 -128 val_128 134 val_134 134 val_134 -136 val_136 -138 val_138 -138 val_138 -138 val_138 -138 val_138 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 156 val_156 158 val_158 -160 val_160 162 val_162 164 val_164 164 val_164 -166 val_166 -168 val_168 -170 val_170 -172 val_172 -172 val_172 -174 val_174 -174 val_174 -176 val_176 -176 val_176 178 val_178 -180 val_180 -186 val_186 190 val_190 -192 val_192 -194 val_194 -196 val_196 -200 val_200 -200 val_200 202 val_202 208 val_208 208 val_208 @@ -2872,60 +2421,26 @@ POSTHOOK: Input: default@srcbucket2 214 val_214 216 val_216 216 val_216 -218 val_218 -222 val_222 -224 val_224 -224 val_224 226 val_226 -228 val_228 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 238 val_238 238 val_238 -242 val_242 -242 val_242 244 val_244 248 val_248 252 val_252 256 val_256 256 val_256 -258 val_258 260 val_260 -262 val_262 266 val_266 272 val_272 272 val_272 -274 val_274 -278 val_278 -278 val_278 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 286 val_286 -288 val_288 -288 val_288 292 val_292 -296 val_296 -298 val_298 -298 val_298 -298 val_298 -302 val_302 -306 val_306 308 val_308 310 val_310 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -322 val_322 -322 val_322 332 val_332 336 val_336 338 val_338 @@ -2938,16 +2453,11 @@ POSTHOOK: Input: default@srcbucket2 348 val_348 348 val_348 348 val_348 -356 val_356 360 val_360 362 val_362 364 val_364 -366 val_366 368 val_368 -374 val_374 378 val_378 -382 val_382 -382 val_382 384 val_384 384 val_384 384 val_384 @@ -2957,47 +2467,26 @@ POSTHOOK: Input: default@srcbucket2 396 val_396 396 val_396 396 val_396 -400 val_400 402 val_402 404 val_404 404 val_404 -406 val_406 -406 val_406 -406 val_406 -406 val_406 414 val_414 414 val_414 -418 val_418 -424 val_424 -424 val_424 430 val_430 430 val_430 430 val_430 432 val_432 -436 val_436 -438 val_438 -438 val_438 -438 val_438 444 val_444 446 val_446 -448 val_448 452 val_452 454 val_454 454 val_454 454 val_454 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -470 val_470 472 val_472 478 val_478 478 val_478 @@ -3007,10 +2496,6 @@ POSTHOOK: Input: default@srcbucket2 482 val_482 484 val_484 490 val_490 -492 val_492 -492 val_492 -494 val_494 -496 val_496 498 val_498 498 val_498 498 val_498 @@ -3060,6 +2545,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3082,6 +2568,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3146,129 +2633,30 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket2 #### A masked pattern was here #### -5 val_5 -5 val_5 -5 val_5 9 val_9 -17 val_17 -33 val_33 37 val_37 37 val_37 -41 val_41 -53 val_53 -57 val_57 -65 val_65 -69 val_69 -77 val_77 -85 val_85 -97 val_97 -97 val_97 -105 val_105 -113 val_113 -113 val_113 -125 val_125 -125 val_125 -129 val_129 -129 val_129 -133 val_133 -137 val_137 -137 val_137 -145 val_145 -149 val_149 -149 val_149 -153 val_153 -157 val_157 -165 val_165 -165 val_165 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -177 val_177 -181 val_181 189 val_189 -193 val_193 -193 val_193 -193 val_193 -197 val_197 -197 val_197 -201 val_201 205 val_205 205 val_205 -209 val_209 -209 val_209 -213 val_213 -213 val_213 217 val_217 217 val_217 -221 val_221 -221 val_221 -229 val_229 -229 val_229 -233 val_233 -233 val_233 -237 val_237 -237 val_237 -241 val_241 -249 val_249 -257 val_257 -265 val_265 -265 val_265 -273 val_273 -273 val_273 -273 val_273 277 val_277 277 val_277 277 val_277 277 val_277 -281 val_281 -281 val_281 285 val_285 -289 val_289 305 val_305 309 val_309 309 val_309 -317 val_317 -317 val_317 321 val_321 321 val_321 -325 val_325 -325 val_325 333 val_333 333 val_333 -341 val_341 345 val_345 -353 val_353 -353 val_353 -365 val_365 -369 val_369 -369 val_369 -369 val_369 -373 val_373 -377 val_377 389 val_389 -393 val_393 -397 val_397 -397 val_397 -401 val_401 -401 val_401 -401 val_401 -401 val_401 -401 val_401 -409 val_409 -409 val_409 -409 val_409 413 val_413 413 val_413 -417 val_417 -417 val_417 -417 val_417 -421 val_421 -429 val_429 -429 val_429 -437 val_437 -449 val_449 -453 val_453 457 val_457 469 val_469 469 val_469 @@ -3276,14 +2664,7 @@ POSTHOOK: Input: default@srcbucket2 469 val_469 469 val_469 477 val_477 -481 val_481 -485 val_485 -489 val_489 -489 val_489 -489 val_489 -489 val_489 493 val_493 -497 val_497 PREHOOK: query: CREATE TABLE empty_bucket (key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/sample7.q.out b/ql/src/test/results/clientpositive/sample7.q.out index f24f297ebc..07b6f0efb0 100644 --- a/ql/src/test/results/clientpositive/sample7.q.out +++ b/ql/src/test/results/clientpositive/sample7.q.out @@ -55,6 +55,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -102,6 +103,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -124,6 +126,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -193,6 +196,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -236,6 +240,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -266,6 +271,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -287,6 +293,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -323,6 +330,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -353,6 +361,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -374,6 +383,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -424,107 +434,48 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +110 val_111 116 val_116 116 val_117 -120 val_120 -120 val_120 -120 val_121 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 -132 val_133 -132 val_133 -136 val_136 -136 val_137 -140 val_141 -144 val_145 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +126 val_126 +126 val_127 +126 val_127 +134 val_134 +134 val_134 +134 val_135 156 val_156 156 val_157 156 val_157 -160 val_160 -160 val_161 -164 val_164 -164 val_164 -164 val_165 -164 val_165 -168 val_168 -168 val_169 -172 val_172 -172 val_172 -172 val_173 -176 val_176 -176 val_176 -180 val_180 +158 val_158 +178 val_178 +178 val_179 +178 val_179 184 val_185 -192 val_192 -192 val_193 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 -204 val_205 +206 val_207 +206 val_207 +206 val_207 208 val_208 208 val_208 208 val_208 -212 val_213 -216 val_216 -216 val_216 -216 val_217 -224 val_224 -224 val_224 -224 val_225 -228 val_228 -228 val_229 -240 val_241 244 val_244 244 val_245 244 val_245 244 val_245 -248 val_248 -248 val_249 252 val_252 252 val_253 +254 val_255 256 val_256 256 val_256 256 val_257 -260 val_260 -260 val_261 -260 val_261 -264 val_265 -264 val_265 -268 val_269 +266 val_266 272 val_272 272 val_272 272 val_273 -276 val_277 -280 val_280 -280 val_280 -284 val_284 -284 val_285 -284 val_285 -288 val_288 -288 val_288 +286 val_286 +286 val_287 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -300 val_301 -300 val_301 304 val_305 308 val_308 308 val_309 @@ -532,13 +483,15 @@ POSTHOOK: Input: default@dest1 316 val_316 316 val_316 316 val_316 -324 val_325 -328 val_329 -328 val_329 -332 val_332 +326 val_327 +334 val_335 336 val_336 336 val_337 -340 val_341 +338 val_338 +338 val_339 +342 val_342 +342 val_342 +342 val_343 344 val_344 344 val_344 344 val_345 @@ -550,29 +503,23 @@ POSTHOOK: Input: default@dest1 348 val_349 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 360 val_360 360 val_361 +362 val_362 364 val_364 364 val_365 -368 val_368 -376 val_377 -384 val_384 -384 val_384 -384 val_384 -384 val_385 -384 val_385 -384 val_385 -388 val_389 +378 val_378 +378 val_379 392 val_392 392 val_393 392 val_393 396 val_396 396 val_396 396 val_396 -400 val_400 +402 val_402 +402 val_403 +402 val_403 +402 val_403 404 val_404 404 val_404 404 val_405 @@ -580,45 +527,24 @@ POSTHOOK: Input: default@dest1 404 val_405 408 val_409 408 val_409 -412 val_413 -412 val_413 -416 val_417 -424 val_424 -424 val_424 -424 val_425 -428 val_429 -432 val_432 -432 val_433 -436 val_436 -436 val_437 +410 val_411 +426 val_427 440 val_441 440 val_441 -444 val_444 -448 val_448 -448 val_449 452 val_452 -460 val_460 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 +458 val_458 +458 val_458 +466 val_466 +466 val_466 +466 val_466 472 val_472 476 val_477 476 val_477 -480 val_480 -480 val_480 -480 val_480 -480 val_481 -480 val_481 +478 val_478 +478 val_478 +478 val_479 +478 val_479 +482 val_482 +482 val_483 484 val_484 484 val_485 -488 val_489 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -496 val_496 -496 val_497 diff --git a/ql/src/test/results/clientpositive/sample8.q.out b/ql/src/test/results/clientpositive/sample8.q.out index 365b7cfa31..789962fe67 100644 --- a/ql/src/test/results/clientpositive/sample8.q.out +++ b/ql/src/test/results/clientpositive/sample8.q.out @@ -86,6 +86,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -134,6 +135,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -182,6 +184,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -230,6 +233,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -319,122 +323,22 @@ 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 #### A masked pattern was here #### -105 val_105 -105 val_105 -105 val_105 -105 val_105 -114 val_114 -114 val_114 -114 val_114 -114 val_114 -150 val_150 -150 val_150 -150 val_150 -150 val_150 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -178 val_178 -178 val_178 -178 val_178 -178 val_178 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 196 val_196 196 val_196 196 val_196 @@ -443,234 +347,282 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 2 val_2 2 val_2 2 val_2 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -222 val_222 -222 val_222 -222 val_222 -222 val_222 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -286 val_286 -286 val_286 -286 val_286 -286 val_286 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +258 val_258 +258 val_258 +258 val_258 +258 val_258 +28 val_28 +28 val_28 +28 val_28 +28 val_28 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +285 val_285 +285 val_285 +285 val_285 +285 val_285 +291 val_291 +291 val_291 +291 val_291 +291 val_291 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +30 val_30 +30 val_30 +30 val_30 +30 val_30 +306 val_306 +306 val_306 +306 val_306 +306 val_306 +374 val_374 +374 val_374 +374 val_374 +374 val_374 +377 val_377 +377 val_377 +377 val_377 +377 val_377 394 val_394 394 val_394 394 val_394 394 val_394 -402 val_402 -402 val_402 -402 val_402 -402 val_402 -411 val_411 -411 val_411 -411 val_411 -411 val_411 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -448 val_448 -448 val_448 -448 val_448 -448 val_448 -457 val_457 -457 val_457 -457 val_457 -457 val_457 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -475 val_475 -475 val_475 -475 val_475 -475 val_475 -484 val_484 -484 val_484 -484 val_484 -484 val_484 -493 val_493 -493 val_493 -493 val_493 -493 val_493 -77 val_77 -77 val_77 -77 val_77 -77 val_77 -86 val_86 -86 val_86 -86 val_86 -86 val_86 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +444 val_444 +444 val_444 +444 val_444 +444 val_444 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +485 val_485 +485 val_485 +485 val_485 +485 val_485 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +5 val_5 +5 val_5 +5 val_5 +5 val_5 +67 val_67 +67 val_67 +67 val_67 +67 val_67 +70 val_70 +70 val_70 +70 val_70 +70 val_70 +83 val_83 +83 val_83 +83 val_83 +83 val_83 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +97 val_97 +97 val_97 +97 val_97 +97 val_97 PREHOOK: query: EXPLAIN SELECT * FROM src TABLESAMPLE(100 ROWS) a JOIN src1 TABLESAMPLE(10 ROWS) b ON a.key=b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/sample9.q.out b/ql/src/test/results/clientpositive/sample9.q.out index dd7d93f83f..0ccaf44a43 100644 --- a/ql/src/test/results/clientpositive/sample9.q.out +++ b/ql/src/test/results/clientpositive/sample9.q.out @@ -61,6 +61,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -83,6 +84,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -121,88 +123,36 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 30 val_30 30 val_31 -32 val_33 -34 val_34 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 54 val_54 -56 val_57 58 val_58 58 val_58 58 val_59 58 val_59 60 val_61 -62 val_63 -62 val_63 64 val_64 -66 val_66 68 val_69 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 84 val_84 84 val_84 86 val_86 @@ -210,116 +160,41 @@ POSTHOOK: Input: default@srcbucket 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 96 val_96 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 156 val_156 156 val_157 156 val_157 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 178 val_178 178 val_179 178 val_179 -180 val_180 182 val_183 184 val_185 -186 val_186 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -331,37 +206,19 @@ POSTHOOK: Input: default@srcbucket 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 238 val_238 238 val_238 238 val_239 240 val_241 -242 val_242 -242 val_242 -242 val_243 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 252 val_252 @@ -370,53 +227,23 @@ POSTHOOK: Input: default@srcbucket 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 266 val_266 -268 val_269 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 308 val_308 308 val_309 308 val_309 @@ -424,29 +251,17 @@ POSTHOOK: Input: default@srcbucket 310 val_311 310 val_311 310 val_311 -314 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 324 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 332 val_332 334 val_335 336 val_336 336 val_337 338 val_338 338 val_339 -340 val_341 342 val_342 342 val_342 342 val_343 @@ -461,26 +276,14 @@ POSTHOOK: Input: default@srcbucket 348 val_349 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 368 val_368 -374 val_374 -374 val_375 -376 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -491,9 +294,6 @@ POSTHOOK: Input: default@srcbucket 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 392 val_392 392 val_393 392 val_393 @@ -501,8 +301,6 @@ POSTHOOK: Input: default@srcbucket 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 402 val_402 402 val_403 402 val_403 @@ -512,24 +310,12 @@ POSTHOOK: Input: default@srcbucket 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 408 val_409 408 val_409 410 val_411 -412 val_413 -412 val_413 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 426 val_427 428 val_429 430 val_430 @@ -538,24 +324,12 @@ POSTHOOK: Input: default@srcbucket 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 440 val_441 440 val_441 -442 val_443 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 452 val_452 454 val_454 454 val_454 @@ -564,22 +338,9 @@ POSTHOOK: Input: default@srcbucket 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 472 val_472 474 val_475 474 val_475 @@ -598,19 +359,9 @@ POSTHOOK: Input: default@srcbucket 482 val_483 484 val_484 484 val_485 -486 val_487 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 498 val_498 498 val_498 498 val_498 diff --git a/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out b/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out index 24a1f66daf..b51cd5c9df 100644 --- a/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out +++ b/ql/src/test/results/clientpositive/sample_islocalmode_hook_use_metadata.q.out @@ -81,6 +81,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1500 rawDataSize 18124 diff --git a/ql/src/test/results/clientpositive/serde_user_properties.q.out b/ql/src/test/results/clientpositive/serde_user_properties.q.out index c7269ccde8..964328f8c0 100644 --- a/ql/src/test/results/clientpositive/serde_user_properties.q.out +++ b/ql/src/test/results/clientpositive/serde_user_properties.q.out @@ -99,6 +99,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -120,6 +121,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -227,6 +229,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -249,6 +252,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -357,6 +361,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -379,6 +384,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/show_create_table_alter.q.out b/ql/src/test/results/clientpositive/show_create_table_alter.q.out index 6023f47871..74be374ff7 100644 --- a/ql/src/test/results/clientpositive/show_create_table_alter.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_alter.q.out @@ -31,6 +31,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='temporary table', 'EXTERNAL'='FALSE') PREHOOK: type: ALTERTABLE_PROPERTIES @@ -65,6 +66,7 @@ LOCATION #### A masked pattern was here #### TBLPROPERTIES ( 'EXTERNAL'='FALSE', + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('comment'='changed comment', 'EXTERNAL'='TRUE') PREHOOK: type: ALTERTABLE_PROPERTIES @@ -98,6 +100,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('SORTBUCKETCOLSPREFIX'='FALSE') PREHOOK: type: ALTERTABLE_PROPERTIES @@ -131,6 +134,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: ALTER TABLE tmp_showcrt1 SET TBLPROPERTIES ('storage_handler'='org.apache.hadoop.hive.ql.metadata.DefaultStorageHandler') PREHOOK: type: ALTERTABLE_PROPERTIES @@ -164,6 +168,7 @@ WITH SERDEPROPERTIES ( LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_showcrt1 PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_db_table.q.out b/ql/src/test/results/clientpositive/show_create_table_db_table.q.out index f31da65a62..33410c8582 100644 --- a/ql/src/test/results/clientpositive/show_create_table_db_table.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_db_table.q.out @@ -58,6 +58,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: SHOW CREATE TABLE tmp_feng.tmp_showcrt2 PREHOOK: type: SHOW_CREATETABLE @@ -79,6 +80,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: SHOW CREATE TABLE tmp_feng.tmp_showcrt3 PREHOOK: type: SHOW_CREATETABLE @@ -101,6 +103,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_feng.tmp_showcrt1 PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_delimited.q.out b/ql/src/test/results/clientpositive/show_create_table_delimited.q.out index 9fb35c5dda..ad58bf62d3 100644 --- a/ql/src/test/results/clientpositive/show_create_table_delimited.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_delimited.q.out @@ -39,6 +39,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_showcrt1 PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out b/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out index 3e850aaf01..bb2c6c7073 100644 --- a/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_partitioned.q.out @@ -31,6 +31,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_showcrt1 PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_serde.q.out b/ql/src/test/results/clientpositive/show_create_table_serde.q.out index d98bf00710..aa93fa16d7 100644 --- a/ql/src/test/results/clientpositive/show_create_table_serde.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_serde.q.out @@ -36,6 +36,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_showcrt1 PREHOOK: type: DROPTABLE @@ -81,6 +82,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_showcrt1 PREHOOK: type: DROPTABLE @@ -128,6 +130,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_showcrt1 PREHOOK: type: DROPTABLE @@ -170,6 +173,7 @@ WITH SERDEPROPERTIES ( LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: DROP TABLE tmp_showcrt1 PREHOOK: type: DROPTABLE diff --git a/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out b/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out index d98225afa1..bf25602ae3 100644 --- a/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out +++ b/ql/src/test/results/clientpositive/show_create_table_temp_table.q.out @@ -30,7 +30,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( -) + 'bucketing_version'='2') PREHOOK: query: drop table tmp1 PREHOOK: type: DROPTABLE POSTHOOK: query: drop table tmp1 diff --git a/ql/src/test/results/clientpositive/show_functions.q.out b/ql/src/test/results/clientpositive/show_functions.q.out index 4df555ba8c..02b956bd4a 100644 --- a/ql/src/test/results/clientpositive/show_functions.q.out +++ b/ql/src/test/results/clientpositive/show_functions.q.out @@ -164,6 +164,7 @@ minute mod month months_between +murmur_hash named_struct negative next_day @@ -422,6 +423,7 @@ minute mod month months_between +murmur_hash xpath xpath_boolean xpath_double diff --git a/ql/src/test/results/clientpositive/show_tblproperties.q.out b/ql/src/test/results/clientpositive/show_tblproperties.q.out index 1ef1b9bc80..e4bda1de4a 100644 --- a/ql/src/test/results/clientpositive/show_tblproperties.q.out +++ b/ql/src/test/results/clientpositive/show_tblproperties.q.out @@ -38,6 +38,7 @@ POSTHOOK: query: show tblproperties tmpfoo POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"a":"true"}} bar bar value +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -56,6 +57,7 @@ POSTHOOK: query: show tblproperties default.tmpfoo POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"a":"true"}} bar bar value +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -110,6 +112,7 @@ POSTHOOK: query: show tblproperties default.tmpfoo POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"a":"true"}} bar bar value +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -128,6 +131,7 @@ POSTHOOK: query: show tblproperties tmpfoo POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"b":"true"}} bar bar value1 +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -152,6 +156,7 @@ POSTHOOK: query: show tblproperties db1.tmpfoo POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"b":"true"}} bar bar value1 +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out index 1182e5680b..8e43c88fc0 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out @@ -64,6 +64,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: SORTBUCKETCOLSPREFIX TRUE + bucketing_version 2 numFiles 1 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out index ef48acb653..004f5f4763 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out @@ -121,6 +121,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -156,6 +157,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -213,6 +215,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1959,6 +1962,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2067,6 +2071,7 @@ STAGE PLANS: properties: bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2101,47 +2106,38 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -17 val_17 1 -33 val_33 1 -65 val_65 1 -97 val_97 1 -97 val_97 1 -113 val_113 1 -113 val_113 1 -129 val_129 1 -129 val_129 1 -145 val_145 1 -177 val_177 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -209 val_209 1 -209 val_209 1 -241 val_241 1 -257 val_257 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -289 val_289 1 -305 val_305 1 +8 val_8 1 +26 val_26 1 +26 val_26 1 +82 val_82 1 +103 val_103 1 +103 val_103 1 +118 val_118 1 +118 val_118 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +176 val_176 1 +176 val_176 1 +194 val_194 1 +275 val_275 1 +280 val_280 1 +280 val_280 1 +282 val_282 1 +282 val_282 1 +309 val_309 1 +309 val_309 1 321 val_321 1 321 val_321 1 -353 val_353 1 -353 val_353 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -449 val_449 1 -481 val_481 1 -497 val_497 1 +400 val_400 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +439 val_439 1 +439 val_439 1 +455 val_455 1 +462 val_462 1 +462 val_462 1 PREHOOK: query: SELECT * FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16) PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -2152,103 +2148,70 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -497 val_497 1 -481 val_481 1 -449 val_449 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -417 val_417 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -401 val_401 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -369 val_369 1 -353 val_353 1 -353 val_353 1 -353 val_353 1 -353 val_353 1 +462 val_462 1 +462 val_462 1 +462 val_462 1 +462 val_462 1 +455 val_455 1 +439 val_439 1 +439 val_439 1 +439 val_439 1 +439 val_439 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +438 val_438 1 +400 val_400 1 321 val_321 1 321 val_321 1 321 val_321 1 321 val_321 1 -305 val_305 1 -289 val_289 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -273 val_273 1 -257 val_257 1 -241 val_241 1 -209 val_209 1 -209 val_209 1 -209 val_209 1 -209 val_209 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -193 val_193 1 -177 val_177 1 -145 val_145 1 -129 val_129 1 -129 val_129 1 -129 val_129 1 -129 val_129 1 -113 val_113 1 -113 val_113 1 -113 val_113 1 -113 val_113 1 -97 val_97 1 -97 val_97 1 -97 val_97 1 -97 val_97 1 -65 val_65 1 -33 val_33 1 -17 val_17 1 +309 val_309 1 +309 val_309 1 +309 val_309 1 +309 val_309 1 +282 val_282 1 +282 val_282 1 +282 val_282 1 +282 val_282 1 +280 val_280 1 +280 val_280 1 +280 val_280 1 +280 val_280 1 +275 val_275 1 +194 val_194 1 +176 val_176 1 +176 val_176 1 +176 val_176 1 +176 val_176 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +128 val_128 1 +118 val_118 1 +118 val_118 1 +118 val_118 1 +118 val_118 1 +103 val_103 1 +103 val_103 1 +103 val_103 1 +103 val_103 1 +82 val_82 1 +26 val_26 1 +26 val_26 1 +26 val_26 1 +26 val_26 1 +8 val_8 1 PREHOOK: query: SELECT COUNT(*) FROM test_table3 TABLESAMPLE(BUCKET 2 OUT OF 16) a JOIN test_table1 TABLESAMPLE(BUCKET 2 OUT OF 16) b ON a.key = b.key AND a.ds = '1' AND b.ds='1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table1 @@ -2263,4 +2226,4 @@ POSTHOOK: Input: default@test_table1@ds=1 POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -293 +140 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out index 0c1f4cf1f9..cfe641b3c6 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out @@ -101,6 +101,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -156,6 +157,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -188,6 +190,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -247,7 +250,7 @@ POSTHOOK: Input: default@test_table1@ds=1 POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -879 +420 PREHOOK: query: explain extended INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '2') SELECT /*+mapjoin(b)*/ a.key, concat(a.value, b.value) FROM test_table3 a JOIN test_table1 b ON a.key = b.key AND a.ds = '1' AND b.ds='1' @@ -332,6 +335,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -368,6 +372,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -426,6 +431,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -551,4 +557,4 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=2 #### A masked pattern was here #### -879 +420 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out index 3bc00c8973..f85dcafe05 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out @@ -116,6 +116,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -139,6 +140,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -296,6 +298,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -319,6 +322,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out index f52a679022..5c334c2b71 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_20.q.out @@ -362,7 +362,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -373,7 +373,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select * from test_table3 PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -384,104 +384,93 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -val_0 0 val_0 1 -val_0 0 val_0 1 -val_0 0 val_0 1 val_2 2 val_2 1 -val_4 4 val_4 1 -val_8 8 val_8 1 val_10 10 val_10 1 -val_12 12 val_12 1 -val_12 12 val_12 1 -val_18 18 val_18 1 -val_18 18 val_18 1 +val_17 17 val_17 1 +val_19 19 val_19 1 val_20 20 val_20 1 -val_24 24 val_24 1 -val_24 24 val_24 1 -val_26 26 val_26 1 -val_26 26 val_26 1 -val_28 28 val_28 1 +val_27 27 val_27 1 val_30 30 val_30 1 -val_34 34 val_34 1 -val_42 42 val_42 1 -val_42 42 val_42 1 -val_44 44 val_44 1 +val_41 41 val_41 1 +val_43 43 val_43 1 +val_51 51 val_51 1 +val_51 51 val_51 1 val_54 54 val_54 1 +val_57 57 val_57 1 val_58 58 val_58 1 val_58 58 val_58 1 val_64 64 val_64 1 -val_66 66 val_66 1 +val_65 65 val_65 1 +val_67 67 val_67 1 +val_67 67 val_67 1 +val_69 69 val_69 1 val_70 70 val_70 1 val_70 70 val_70 1 val_70 70 val_70 1 -val_72 72 val_72 1 -val_72 72 val_72 1 -val_74 74 val_74 1 -val_76 76 val_76 1 -val_76 76 val_76 1 -val_78 78 val_78 1 +val_77 77 val_77 1 val_80 80 val_80 1 -val_82 82 val_82 1 +val_83 83 val_83 1 +val_83 83 val_83 1 val_84 84 val_84 1 val_84 84 val_84 1 +val_85 85 val_85 1 val_86 86 val_86 1 val_90 90 val_90 1 val_90 90 val_90 1 val_90 90 val_90 1 -val_92 92 val_92 1 val_96 96 val_96 1 +val_97 97 val_97 1 +val_97 97 val_97 1 val_98 98 val_98 1 val_98 98 val_98 1 -val_100 100 val_100 1 -val_100 100 val_100 1 -val_104 104 val_104 1 -val_104 104 val_104 1 -val_114 114 val_114 1 +val_105 105 val_105 1 +val_113 113 val_113 1 +val_113 113 val_113 1 val_116 116 val_116 1 -val_118 118 val_118 1 -val_118 118 val_118 1 -val_120 120 val_120 1 -val_120 120 val_120 1 +val_119 119 val_119 1 +val_119 119 val_119 1 +val_119 119 val_119 1 val_126 126 val_126 1 -val_128 128 val_128 1 -val_128 128 val_128 1 -val_128 128 val_128 1 +val_133 133 val_133 1 val_134 134 val_134 1 val_134 134 val_134 1 -val_136 136 val_136 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 +val_137 137 val_137 1 +val_137 137 val_137 1 val_146 146 val_146 1 val_146 146 val_146 1 -val_150 150 val_150 1 -val_152 152 val_152 1 -val_152 152 val_152 1 +val_149 149 val_149 1 +val_149 149 val_149 1 +val_153 153 val_153 1 val_156 156 val_156 1 +val_157 157 val_157 1 val_158 158 val_158 1 -val_160 160 val_160 1 val_162 162 val_162 1 +val_163 163 val_163 1 val_164 164 val_164 1 val_164 164 val_164 1 -val_166 166 val_166 1 -val_168 168 val_168 1 -val_170 170 val_170 1 -val_172 172 val_172 1 -val_172 172 val_172 1 -val_174 174 val_174 1 -val_174 174 val_174 1 -val_176 176 val_176 1 -val_176 176 val_176 1 +val_165 165 val_165 1 +val_165 165 val_165 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_177 177 val_177 1 val_178 178 val_178 1 -val_180 180 val_180 1 -val_186 186 val_186 1 +val_181 181 val_181 1 +val_187 187 val_187 1 +val_187 187 val_187 1 +val_187 187 val_187 1 val_190 190 val_190 1 -val_192 192 val_192 1 -val_194 194 val_194 1 -val_196 196 val_196 1 -val_200 200 val_200 1 -val_200 200 val_200 1 +val_191 191 val_191 1 +val_191 191 val_191 1 +val_195 195 val_195 1 +val_195 195 val_195 1 +val_197 197 val_197 1 +val_197 197 val_197 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_201 201 val_201 1 val_202 202 val_202 1 val_208 208 val_208 1 val_208 208 val_208 1 @@ -489,63 +478,60 @@ val_208 208 val_208 1 val_214 214 val_214 1 val_216 216 val_216 1 val_216 216 val_216 1 -val_218 218 val_218 1 -val_222 222 val_222 1 -val_224 224 val_224 1 -val_224 224 val_224 1 +val_221 221 val_221 1 +val_221 221 val_221 1 val_226 226 val_226 1 -val_228 228 val_228 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 +val_229 229 val_229 1 +val_229 229 val_229 1 +val_233 233 val_233 1 +val_233 233 val_233 1 +val_237 237 val_237 1 +val_237 237 val_237 1 val_238 238 val_238 1 val_238 238 val_238 1 -val_242 242 val_242 1 -val_242 242 val_242 1 +val_239 239 val_239 1 +val_239 239 val_239 1 val_244 244 val_244 1 val_248 248 val_248 1 +val_249 249 val_249 1 val_252 252 val_252 1 +val_255 255 val_255 1 +val_255 255 val_255 1 val_256 256 val_256 1 val_256 256 val_256 1 -val_258 258 val_258 1 val_260 260 val_260 1 -val_262 262 val_262 1 val_266 266 val_266 1 val_272 272 val_272 1 val_272 272 val_272 1 -val_274 274 val_274 1 -val_278 278 val_278 1 -val_278 278 val_278 1 -val_280 280 val_280 1 -val_280 280 val_280 1 -val_282 282 val_282 1 -val_282 282 val_282 1 val_284 284 val_284 1 val_286 286 val_286 1 -val_288 288 val_288 1 -val_288 288 val_288 1 +val_287 287 val_287 1 +val_289 289 val_289 1 +val_291 291 val_291 1 val_292 292 val_292 1 -val_296 296 val_296 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_302 302 val_302 1 -val_306 306 val_306 1 +val_307 307 val_307 1 +val_307 307 val_307 1 val_308 308 val_308 1 val_310 310 val_310 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_315 315 val_315 1 val_316 316 val_316 1 val_316 316 val_316 1 val_316 316 val_316 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_322 322 val_322 1 -val_322 322 val_322 1 +val_317 317 val_317 1 +val_317 317 val_317 1 +val_325 325 val_325 1 +val_325 325 val_325 1 +val_327 327 val_327 1 +val_327 327 val_327 1 +val_327 327 val_327 1 val_332 332 val_332 1 val_336 336 val_336 1 val_338 338 val_338 1 +val_339 339 val_339 1 +val_341 341 val_341 1 val_342 342 val_342 1 val_342 342 val_342 1 val_344 344 val_344 1 @@ -555,176 +541,197 @@ val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 -val_356 356 val_356 1 +val_351 351 val_351 1 +val_353 353 val_353 1 +val_353 353 val_353 1 val_360 360 val_360 1 val_362 362 val_362 1 val_364 364 val_364 1 -val_366 366 val_366 1 +val_365 365 val_365 1 val_368 368 val_368 1 -val_374 374 val_374 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_377 377 val_377 1 val_378 378 val_378 1 -val_382 382 val_382 1 -val_382 382 val_382 1 val_384 384 val_384 1 val_384 384 val_384 1 val_384 384 val_384 1 val_386 386 val_386 1 val_392 392 val_392 1 +val_393 393 val_393 1 val_394 394 val_394 1 val_396 396 val_396 1 val_396 396 val_396 1 val_396 396 val_396 1 -val_400 400 val_400 1 +val_397 397 val_397 1 +val_397 397 val_397 1 +val_399 399 val_399 1 +val_399 399 val_399 1 val_402 402 val_402 1 val_404 404 val_404 1 val_404 404 val_404 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 +val_407 407 val_407 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_411 411 val_411 1 val_414 414 val_414 1 val_414 414 val_414 1 -val_418 418 val_418 1 -val_424 424 val_424 1 -val_424 424 val_424 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_419 419 val_419 1 +val_421 421 val_421 1 +val_427 427 val_427 1 val_430 430 val_430 1 val_430 430 val_430 1 val_430 430 val_430 1 val_432 432 val_432 1 -val_436 436 val_436 1 -val_438 438 val_438 1 -val_438 438 val_438 1 -val_438 438 val_438 1 +val_435 435 val_435 1 +val_437 437 val_437 1 +val_443 443 val_443 1 val_444 444 val_444 1 val_446 446 val_446 1 -val_448 448 val_448 1 +val_449 449 val_449 1 val_452 452 val_452 1 +val_453 453 val_453 1 val_454 454 val_454 1 val_454 454 val_454 1 val_454 454 val_454 1 val_458 458 val_458 1 val_458 458 val_458 1 -val_460 460 val_460 1 -val_462 462 val_462 1 -val_462 462 val_462 1 +val_459 459 val_459 1 +val_459 459 val_459 1 +val_463 463 val_463 1 +val_463 463 val_463 1 val_466 466 val_466 1 val_466 466 val_466 1 val_466 466 val_466 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_470 470 val_470 1 +val_467 467 val_467 1 val_472 472 val_472 1 val_478 478 val_478 1 val_478 478 val_478 1 +val_479 479 val_479 1 val_480 480 val_480 1 val_480 480 val_480 1 val_480 480 val_480 1 val_482 482 val_482 1 +val_483 483 val_483 1 val_484 484 val_484 1 +val_485 485 val_485 1 val_490 490 val_490 1 -val_492 492 val_492 1 -val_492 492 val_492 1 -val_494 494 val_494 1 -val_496 496 val_496 1 +val_491 491 val_491 1 +val_495 495 val_495 1 +val_497 497 val_497 1 val_498 498 val_498 1 val_498 498 val_498 1 val_498 498 val_498 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_4 4 val_4 1 val_5 5 val_5 1 -val_5 5 val_5 1 -val_5 5 val_5 1 +val_5 5 val_5 1 +val_5 5 val_5 1 +val_8 8 val_8 1 val_9 9 val_9 1 val_11 11 val_11 1 +val_12 12 val_12 1 +val_12 12 val_12 1 val_15 15 val_15 1 val_15 15 val_15 1 -val_17 17 val_17 1 -val_19 19 val_19 1 -val_27 27 val_27 1 +val_18 18 val_18 1 +val_18 18 val_18 1 +val_24 24 val_24 1 +val_24 24 val_24 1 +val_26 26 val_26 1 +val_26 26 val_26 1 +val_28 28 val_28 1 val_33 33 val_33 1 +val_34 34 val_34 1 val_35 35 val_35 1 val_35 35 val_35 1 val_35 35 val_35 1 val_37 37 val_37 1 val_37 37 val_37 1 -val_41 41 val_41 1 -val_43 43 val_43 1 +val_42 42 val_42 1 +val_42 42 val_42 1 +val_44 44 val_44 1 val_47 47 val_47 1 -val_51 51 val_51 1 -val_51 51 val_51 1 val_53 53 val_53 1 -val_57 57 val_57 1 -val_65 65 val_65 1 -val_67 67 val_67 1 -val_67 67 val_67 1 -val_69 69 val_69 1 -val_77 77 val_77 1 -val_83 83 val_83 1 -val_83 83 val_83 1 -val_85 85 val_85 1 +val_66 66 val_66 1 +val_72 72 val_72 1 +val_72 72 val_72 1 +val_74 74 val_74 1 +val_76 76 val_76 1 +val_76 76 val_76 1 +val_78 78 val_78 1 +val_82 82 val_82 1 val_87 87 val_87 1 +val_92 92 val_92 1 val_95 95 val_95 1 val_95 95 val_95 1 -val_97 97 val_97 1 -val_97 97 val_97 1 +val_100 100 val_100 1 +val_100 100 val_100 1 val_103 103 val_103 1 val_103 103 val_103 1 -val_105 105 val_105 1 +val_104 104 val_104 1 +val_104 104 val_104 1 val_111 111 val_111 1 -val_113 113 val_113 1 -val_113 113 val_113 1 -val_119 119 val_119 1 -val_119 119 val_119 1 -val_119 119 val_119 1 +val_114 114 val_114 1 +val_118 118 val_118 1 +val_118 118 val_118 1 +val_120 120 val_120 1 +val_120 120 val_120 1 val_125 125 val_125 1 val_125 125 val_125 1 +val_128 128 val_128 1 +val_128 128 val_128 1 +val_128 128 val_128 1 val_129 129 val_129 1 val_129 129 val_129 1 val_131 131 val_131 1 -val_133 133 val_133 1 -val_137 137 val_137 1 -val_137 137 val_137 1 +val_136 136 val_136 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 val_143 143 val_143 1 val_145 145 val_145 1 -val_149 149 val_149 1 -val_149 149 val_149 1 -val_153 153 val_153 1 +val_150 150 val_150 1 +val_152 152 val_152 1 +val_152 152 val_152 1 val_155 155 val_155 1 -val_157 157 val_157 1 -val_163 163 val_163 1 -val_165 165 val_165 1 -val_165 165 val_165 1 +val_160 160 val_160 1 +val_166 166 val_166 1 val_167 167 val_167 1 val_167 167 val_167 1 val_167 167 val_167 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 +val_168 168 val_168 1 +val_170 170 val_170 1 +val_172 172 val_172 1 +val_172 172 val_172 1 +val_174 174 val_174 1 +val_174 174 val_174 1 val_175 175 val_175 1 val_175 175 val_175 1 -val_177 177 val_177 1 +val_176 176 val_176 1 +val_176 176 val_176 1 val_179 179 val_179 1 val_179 179 val_179 1 -val_181 181 val_181 1 +val_180 180 val_180 1 val_183 183 val_183 1 -val_187 187 val_187 1 -val_187 187 val_187 1 -val_187 187 val_187 1 +val_186 186 val_186 1 val_189 189 val_189 1 -val_191 191 val_191 1 -val_191 191 val_191 1 +val_192 192 val_192 1 val_193 193 val_193 1 val_193 193 val_193 1 val_193 193 val_193 1 -val_195 195 val_195 1 -val_195 195 val_195 1 -val_197 197 val_197 1 -val_197 197 val_197 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_201 201 val_201 1 +val_194 194 val_194 1 +val_196 196 val_196 1 +val_200 200 val_200 1 +val_200 200 val_200 1 val_203 203 val_203 1 val_203 203 val_203 1 val_205 205 val_205 1 @@ -737,93 +744,89 @@ val_213 213 val_213 1 val_213 213 val_213 1 val_217 217 val_217 1 val_217 217 val_217 1 +val_218 218 val_218 1 val_219 219 val_219 1 val_219 219 val_219 1 -val_221 221 val_221 1 -val_221 221 val_221 1 +val_222 222 val_222 1 val_223 223 val_223 1 val_223 223 val_223 1 -val_229 229 val_229 1 -val_229 229 val_229 1 -val_233 233 val_233 1 -val_233 233 val_233 1 +val_224 224 val_224 1 +val_224 224 val_224 1 +val_228 228 val_228 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 val_235 235 val_235 1 -val_237 237 val_237 1 -val_237 237 val_237 1 -val_239 239 val_239 1 -val_239 239 val_239 1 val_241 241 val_241 1 +val_242 242 val_242 1 +val_242 242 val_242 1 val_247 247 val_247 1 -val_249 249 val_249 1 -val_255 255 val_255 1 -val_255 255 val_255 1 val_257 257 val_257 1 +val_258 258 val_258 1 +val_262 262 val_262 1 val_263 263 val_263 1 val_265 265 val_265 1 val_265 265 val_265 1 val_273 273 val_273 1 val_273 273 val_273 1 val_273 273 val_273 1 +val_274 274 val_274 1 val_275 275 val_275 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 +val_278 278 val_278 1 +val_278 278 val_278 1 +val_280 280 val_280 1 +val_280 280 val_280 1 val_281 281 val_281 1 val_281 281 val_281 1 +val_282 282 val_282 1 +val_282 282 val_282 1 val_283 283 val_283 1 val_285 285 val_285 1 -val_287 287 val_287 1 -val_289 289 val_289 1 -val_291 291 val_291 1 +val_288 288 val_288 1 +val_288 288 val_288 1 +val_296 296 val_296 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_302 302 val_302 1 val_305 305 val_305 1 -val_307 307 val_307 1 -val_307 307 val_307 1 +val_306 306 val_306 1 val_309 309 val_309 1 val_309 309 val_309 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_315 315 val_315 1 -val_317 317 val_317 1 -val_317 317 val_317 1 +val_318 318 val_318 1 +val_318 318 val_318 1 +val_318 318 val_318 1 val_321 321 val_321 1 val_321 321 val_321 1 +val_322 322 val_322 1 +val_322 322 val_322 1 val_323 323 val_323 1 -val_325 325 val_325 1 -val_325 325 val_325 1 -val_327 327 val_327 1 -val_327 327 val_327 1 -val_327 327 val_327 1 val_331 331 val_331 1 val_331 331 val_331 1 val_333 333 val_333 1 val_333 333 val_333 1 val_335 335 val_335 1 -val_339 339 val_339 1 -val_341 341 val_341 1 val_345 345 val_345 1 -val_351 351 val_351 1 -val_353 353 val_353 1 -val_353 353 val_353 1 -val_365 365 val_365 1 +val_356 356 val_356 1 +val_366 366 val_366 1 val_367 367 val_367 1 val_367 367 val_367 1 -val_369 369 val_369 1 -val_369 369 val_369 1 -val_369 369 val_369 1 val_373 373 val_373 1 +val_374 374 val_374 1 val_375 375 val_375 1 -val_377 377 val_377 1 val_379 379 val_379 1 +val_382 382 val_382 1 +val_382 382 val_382 1 val_389 389 val_389 1 -val_393 393 val_393 1 val_395 395 val_395 1 val_395 395 val_395 1 -val_397 397 val_397 1 -val_397 397 val_397 1 -val_399 399 val_399 1 -val_399 399 val_399 1 +val_400 400 val_400 1 val_401 401 val_401 1 val_401 401 val_401 1 val_401 401 val_401 1 @@ -832,58 +835,55 @@ val_401 401 val_401 1 val_403 403 val_403 1 val_403 403 val_403 1 val_403 403 val_403 1 -val_407 407 val_407 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_411 411 val_411 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 val_413 413 val_413 1 val_413 413 val_413 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_419 419 val_419 1 -val_421 421 val_421 1 -val_427 427 val_427 1 +val_418 418 val_418 1 +val_424 424 val_424 1 +val_424 424 val_424 1 val_429 429 val_429 1 val_429 429 val_429 1 val_431 431 val_431 1 val_431 431 val_431 1 val_431 431 val_431 1 -val_435 435 val_435 1 -val_437 437 val_437 1 +val_436 436 val_436 1 +val_438 438 val_438 1 +val_438 438 val_438 1 +val_438 438 val_438 1 val_439 439 val_439 1 val_439 439 val_439 1 -val_443 443 val_443 1 -val_449 449 val_449 1 -val_453 453 val_453 1 +val_448 448 val_448 1 val_455 455 val_455 1 val_457 457 val_457 1 -val_459 459 val_459 1 -val_459 459 val_459 1 -val_463 463 val_463 1 -val_463 463 val_463 1 -val_467 467 val_467 1 +val_460 460 val_460 1 +val_462 462 val_462 1 +val_462 462 val_462 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 +val_470 470 val_470 1 val_475 475 val_475 1 val_477 477 val_477 1 -val_479 479 val_479 1 val_481 481 val_481 1 -val_483 483 val_483 1 -val_485 485 val_485 1 val_487 487 val_487 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 -val_491 491 val_491 1 +val_492 492 val_492 1 +val_492 492 val_492 1 val_493 493 val_493 1 -val_495 495 val_495 1 -val_497 497 val_497 1 +val_494 494 val_494 1 +val_496 496 val_496 1 PREHOOK: query: INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') SELECT a.value, a.key, a.value FROM test_table1 a WHERE a.ds = '1' PREHOOK: type: QUERY @@ -909,104 +909,93 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -val_0 0 val_0 1 -val_0 0 val_0 1 -val_0 0 val_0 1 val_2 2 val_2 1 -val_4 4 val_4 1 -val_8 8 val_8 1 val_10 10 val_10 1 -val_12 12 val_12 1 -val_12 12 val_12 1 -val_18 18 val_18 1 -val_18 18 val_18 1 +val_17 17 val_17 1 +val_19 19 val_19 1 val_20 20 val_20 1 -val_24 24 val_24 1 -val_24 24 val_24 1 -val_26 26 val_26 1 -val_26 26 val_26 1 -val_28 28 val_28 1 +val_27 27 val_27 1 val_30 30 val_30 1 -val_34 34 val_34 1 -val_42 42 val_42 1 -val_42 42 val_42 1 -val_44 44 val_44 1 +val_41 41 val_41 1 +val_43 43 val_43 1 +val_51 51 val_51 1 +val_51 51 val_51 1 val_54 54 val_54 1 +val_57 57 val_57 1 val_58 58 val_58 1 val_58 58 val_58 1 val_64 64 val_64 1 -val_66 66 val_66 1 +val_65 65 val_65 1 +val_67 67 val_67 1 +val_67 67 val_67 1 +val_69 69 val_69 1 val_70 70 val_70 1 val_70 70 val_70 1 val_70 70 val_70 1 -val_72 72 val_72 1 -val_72 72 val_72 1 -val_74 74 val_74 1 -val_76 76 val_76 1 -val_76 76 val_76 1 -val_78 78 val_78 1 +val_77 77 val_77 1 val_80 80 val_80 1 -val_82 82 val_82 1 +val_83 83 val_83 1 +val_83 83 val_83 1 val_84 84 val_84 1 val_84 84 val_84 1 +val_85 85 val_85 1 val_86 86 val_86 1 val_90 90 val_90 1 val_90 90 val_90 1 val_90 90 val_90 1 -val_92 92 val_92 1 val_96 96 val_96 1 +val_97 97 val_97 1 +val_97 97 val_97 1 val_98 98 val_98 1 val_98 98 val_98 1 -val_100 100 val_100 1 -val_100 100 val_100 1 -val_104 104 val_104 1 -val_104 104 val_104 1 -val_114 114 val_114 1 +val_105 105 val_105 1 +val_113 113 val_113 1 +val_113 113 val_113 1 val_116 116 val_116 1 -val_118 118 val_118 1 -val_118 118 val_118 1 -val_120 120 val_120 1 -val_120 120 val_120 1 +val_119 119 val_119 1 +val_119 119 val_119 1 +val_119 119 val_119 1 val_126 126 val_126 1 -val_128 128 val_128 1 -val_128 128 val_128 1 -val_128 128 val_128 1 +val_133 133 val_133 1 val_134 134 val_134 1 val_134 134 val_134 1 -val_136 136 val_136 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 +val_137 137 val_137 1 +val_137 137 val_137 1 val_146 146 val_146 1 val_146 146 val_146 1 -val_150 150 val_150 1 -val_152 152 val_152 1 -val_152 152 val_152 1 +val_149 149 val_149 1 +val_149 149 val_149 1 +val_153 153 val_153 1 val_156 156 val_156 1 +val_157 157 val_157 1 val_158 158 val_158 1 -val_160 160 val_160 1 val_162 162 val_162 1 +val_163 163 val_163 1 val_164 164 val_164 1 val_164 164 val_164 1 -val_166 166 val_166 1 -val_168 168 val_168 1 -val_170 170 val_170 1 -val_172 172 val_172 1 -val_172 172 val_172 1 -val_174 174 val_174 1 -val_174 174 val_174 1 -val_176 176 val_176 1 -val_176 176 val_176 1 +val_165 165 val_165 1 +val_165 165 val_165 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_177 177 val_177 1 val_178 178 val_178 1 -val_180 180 val_180 1 -val_186 186 val_186 1 +val_181 181 val_181 1 +val_187 187 val_187 1 +val_187 187 val_187 1 +val_187 187 val_187 1 val_190 190 val_190 1 -val_192 192 val_192 1 -val_194 194 val_194 1 -val_196 196 val_196 1 -val_200 200 val_200 1 -val_200 200 val_200 1 +val_191 191 val_191 1 +val_191 191 val_191 1 +val_195 195 val_195 1 +val_195 195 val_195 1 +val_197 197 val_197 1 +val_197 197 val_197 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_201 201 val_201 1 val_202 202 val_202 1 val_208 208 val_208 1 val_208 208 val_208 1 @@ -1014,63 +1003,60 @@ val_208 208 val_208 1 val_214 214 val_214 1 val_216 216 val_216 1 val_216 216 val_216 1 -val_218 218 val_218 1 -val_222 222 val_222 1 -val_224 224 val_224 1 -val_224 224 val_224 1 +val_221 221 val_221 1 +val_221 221 val_221 1 val_226 226 val_226 1 -val_228 228 val_228 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 +val_229 229 val_229 1 +val_229 229 val_229 1 +val_233 233 val_233 1 +val_233 233 val_233 1 +val_237 237 val_237 1 +val_237 237 val_237 1 val_238 238 val_238 1 val_238 238 val_238 1 -val_242 242 val_242 1 -val_242 242 val_242 1 +val_239 239 val_239 1 +val_239 239 val_239 1 val_244 244 val_244 1 val_248 248 val_248 1 +val_249 249 val_249 1 val_252 252 val_252 1 +val_255 255 val_255 1 +val_255 255 val_255 1 val_256 256 val_256 1 val_256 256 val_256 1 -val_258 258 val_258 1 val_260 260 val_260 1 -val_262 262 val_262 1 val_266 266 val_266 1 val_272 272 val_272 1 val_272 272 val_272 1 -val_274 274 val_274 1 -val_278 278 val_278 1 -val_278 278 val_278 1 -val_280 280 val_280 1 -val_280 280 val_280 1 -val_282 282 val_282 1 -val_282 282 val_282 1 val_284 284 val_284 1 val_286 286 val_286 1 -val_288 288 val_288 1 -val_288 288 val_288 1 +val_287 287 val_287 1 +val_289 289 val_289 1 +val_291 291 val_291 1 val_292 292 val_292 1 -val_296 296 val_296 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_302 302 val_302 1 -val_306 306 val_306 1 +val_307 307 val_307 1 +val_307 307 val_307 1 val_308 308 val_308 1 val_310 310 val_310 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_315 315 val_315 1 val_316 316 val_316 1 val_316 316 val_316 1 val_316 316 val_316 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_322 322 val_322 1 -val_322 322 val_322 1 +val_317 317 val_317 1 +val_317 317 val_317 1 +val_325 325 val_325 1 +val_325 325 val_325 1 +val_327 327 val_327 1 +val_327 327 val_327 1 +val_327 327 val_327 1 val_332 332 val_332 1 val_336 336 val_336 1 val_338 338 val_338 1 +val_339 339 val_339 1 +val_341 341 val_341 1 val_342 342 val_342 1 val_342 342 val_342 1 val_344 344 val_344 1 @@ -1080,176 +1066,197 @@ val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 -val_356 356 val_356 1 +val_351 351 val_351 1 +val_353 353 val_353 1 +val_353 353 val_353 1 val_360 360 val_360 1 val_362 362 val_362 1 val_364 364 val_364 1 -val_366 366 val_366 1 +val_365 365 val_365 1 val_368 368 val_368 1 -val_374 374 val_374 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_377 377 val_377 1 val_378 378 val_378 1 -val_382 382 val_382 1 -val_382 382 val_382 1 val_384 384 val_384 1 val_384 384 val_384 1 val_384 384 val_384 1 val_386 386 val_386 1 val_392 392 val_392 1 +val_393 393 val_393 1 val_394 394 val_394 1 val_396 396 val_396 1 val_396 396 val_396 1 val_396 396 val_396 1 -val_400 400 val_400 1 +val_397 397 val_397 1 +val_397 397 val_397 1 +val_399 399 val_399 1 +val_399 399 val_399 1 val_402 402 val_402 1 val_404 404 val_404 1 val_404 404 val_404 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 +val_407 407 val_407 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_411 411 val_411 1 val_414 414 val_414 1 val_414 414 val_414 1 -val_418 418 val_418 1 -val_424 424 val_424 1 -val_424 424 val_424 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_419 419 val_419 1 +val_421 421 val_421 1 +val_427 427 val_427 1 val_430 430 val_430 1 val_430 430 val_430 1 val_430 430 val_430 1 val_432 432 val_432 1 -val_436 436 val_436 1 -val_438 438 val_438 1 -val_438 438 val_438 1 -val_438 438 val_438 1 +val_435 435 val_435 1 +val_437 437 val_437 1 +val_443 443 val_443 1 val_444 444 val_444 1 val_446 446 val_446 1 -val_448 448 val_448 1 +val_449 449 val_449 1 val_452 452 val_452 1 +val_453 453 val_453 1 val_454 454 val_454 1 val_454 454 val_454 1 val_454 454 val_454 1 val_458 458 val_458 1 val_458 458 val_458 1 -val_460 460 val_460 1 -val_462 462 val_462 1 -val_462 462 val_462 1 +val_459 459 val_459 1 +val_459 459 val_459 1 +val_463 463 val_463 1 +val_463 463 val_463 1 val_466 466 val_466 1 val_466 466 val_466 1 val_466 466 val_466 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_470 470 val_470 1 +val_467 467 val_467 1 val_472 472 val_472 1 val_478 478 val_478 1 val_478 478 val_478 1 +val_479 479 val_479 1 val_480 480 val_480 1 val_480 480 val_480 1 val_480 480 val_480 1 val_482 482 val_482 1 +val_483 483 val_483 1 val_484 484 val_484 1 +val_485 485 val_485 1 val_490 490 val_490 1 -val_492 492 val_492 1 -val_492 492 val_492 1 -val_494 494 val_494 1 -val_496 496 val_496 1 +val_491 491 val_491 1 +val_495 495 val_495 1 +val_497 497 val_497 1 val_498 498 val_498 1 val_498 498 val_498 1 val_498 498 val_498 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_4 4 val_4 1 val_5 5 val_5 1 val_5 5 val_5 1 val_5 5 val_5 1 +val_8 8 val_8 1 val_9 9 val_9 1 val_11 11 val_11 1 +val_12 12 val_12 1 +val_12 12 val_12 1 val_15 15 val_15 1 val_15 15 val_15 1 -val_17 17 val_17 1 -val_19 19 val_19 1 -val_27 27 val_27 1 +val_18 18 val_18 1 +val_18 18 val_18 1 +val_24 24 val_24 1 +val_24 24 val_24 1 +val_26 26 val_26 1 +val_26 26 val_26 1 +val_28 28 val_28 1 val_33 33 val_33 1 +val_34 34 val_34 1 val_35 35 val_35 1 val_35 35 val_35 1 val_35 35 val_35 1 val_37 37 val_37 1 val_37 37 val_37 1 -val_41 41 val_41 1 -val_43 43 val_43 1 +val_42 42 val_42 1 +val_42 42 val_42 1 +val_44 44 val_44 1 val_47 47 val_47 1 -val_51 51 val_51 1 -val_51 51 val_51 1 val_53 53 val_53 1 -val_57 57 val_57 1 -val_65 65 val_65 1 -val_67 67 val_67 1 -val_67 67 val_67 1 -val_69 69 val_69 1 -val_77 77 val_77 1 -val_83 83 val_83 1 -val_83 83 val_83 1 -val_85 85 val_85 1 +val_66 66 val_66 1 +val_72 72 val_72 1 +val_72 72 val_72 1 +val_74 74 val_74 1 +val_76 76 val_76 1 +val_76 76 val_76 1 +val_78 78 val_78 1 +val_82 82 val_82 1 val_87 87 val_87 1 +val_92 92 val_92 1 val_95 95 val_95 1 val_95 95 val_95 1 -val_97 97 val_97 1 -val_97 97 val_97 1 +val_100 100 val_100 1 +val_100 100 val_100 1 val_103 103 val_103 1 val_103 103 val_103 1 -val_105 105 val_105 1 +val_104 104 val_104 1 +val_104 104 val_104 1 val_111 111 val_111 1 -val_113 113 val_113 1 -val_113 113 val_113 1 -val_119 119 val_119 1 -val_119 119 val_119 1 -val_119 119 val_119 1 +val_114 114 val_114 1 +val_118 118 val_118 1 +val_118 118 val_118 1 +val_120 120 val_120 1 +val_120 120 val_120 1 val_125 125 val_125 1 val_125 125 val_125 1 +val_128 128 val_128 1 +val_128 128 val_128 1 +val_128 128 val_128 1 val_129 129 val_129 1 val_129 129 val_129 1 val_131 131 val_131 1 -val_133 133 val_133 1 -val_137 137 val_137 1 -val_137 137 val_137 1 +val_136 136 val_136 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 val_143 143 val_143 1 val_145 145 val_145 1 -val_149 149 val_149 1 -val_149 149 val_149 1 -val_153 153 val_153 1 +val_150 150 val_150 1 +val_152 152 val_152 1 +val_152 152 val_152 1 val_155 155 val_155 1 -val_157 157 val_157 1 -val_163 163 val_163 1 -val_165 165 val_165 1 -val_165 165 val_165 1 +val_160 160 val_160 1 +val_166 166 val_166 1 val_167 167 val_167 1 val_167 167 val_167 1 val_167 167 val_167 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 +val_168 168 val_168 1 +val_170 170 val_170 1 +val_172 172 val_172 1 +val_172 172 val_172 1 +val_174 174 val_174 1 +val_174 174 val_174 1 val_175 175 val_175 1 val_175 175 val_175 1 -val_177 177 val_177 1 +val_176 176 val_176 1 +val_176 176 val_176 1 val_179 179 val_179 1 val_179 179 val_179 1 -val_181 181 val_181 1 +val_180 180 val_180 1 val_183 183 val_183 1 -val_187 187 val_187 1 -val_187 187 val_187 1 -val_187 187 val_187 1 +val_186 186 val_186 1 val_189 189 val_189 1 -val_191 191 val_191 1 -val_191 191 val_191 1 +val_192 192 val_192 1 val_193 193 val_193 1 val_193 193 val_193 1 val_193 193 val_193 1 -val_195 195 val_195 1 -val_195 195 val_195 1 -val_197 197 val_197 1 -val_197 197 val_197 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_201 201 val_201 1 +val_194 194 val_194 1 +val_196 196 val_196 1 +val_200 200 val_200 1 +val_200 200 val_200 1 val_203 203 val_203 1 val_203 203 val_203 1 val_205 205 val_205 1 @@ -1262,93 +1269,89 @@ val_213 213 val_213 1 val_213 213 val_213 1 val_217 217 val_217 1 val_217 217 val_217 1 +val_218 218 val_218 1 val_219 219 val_219 1 val_219 219 val_219 1 -val_221 221 val_221 1 -val_221 221 val_221 1 +val_222 222 val_222 1 val_223 223 val_223 1 val_223 223 val_223 1 -val_229 229 val_229 1 -val_229 229 val_229 1 -val_233 233 val_233 1 -val_233 233 val_233 1 +val_224 224 val_224 1 +val_224 224 val_224 1 +val_228 228 val_228 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 val_235 235 val_235 1 -val_237 237 val_237 1 -val_237 237 val_237 1 -val_239 239 val_239 1 -val_239 239 val_239 1 val_241 241 val_241 1 +val_242 242 val_242 1 +val_242 242 val_242 1 val_247 247 val_247 1 -val_249 249 val_249 1 -val_255 255 val_255 1 -val_255 255 val_255 1 val_257 257 val_257 1 +val_258 258 val_258 1 +val_262 262 val_262 1 val_263 263 val_263 1 val_265 265 val_265 1 val_265 265 val_265 1 val_273 273 val_273 1 val_273 273 val_273 1 val_273 273 val_273 1 +val_274 274 val_274 1 val_275 275 val_275 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 +val_278 278 val_278 1 +val_278 278 val_278 1 +val_280 280 val_280 1 +val_280 280 val_280 1 val_281 281 val_281 1 val_281 281 val_281 1 +val_282 282 val_282 1 +val_282 282 val_282 1 val_283 283 val_283 1 val_285 285 val_285 1 -val_287 287 val_287 1 -val_289 289 val_289 1 -val_291 291 val_291 1 +val_288 288 val_288 1 +val_288 288 val_288 1 +val_296 296 val_296 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_302 302 val_302 1 val_305 305 val_305 1 -val_307 307 val_307 1 -val_307 307 val_307 1 +val_306 306 val_306 1 val_309 309 val_309 1 val_309 309 val_309 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_315 315 val_315 1 -val_317 317 val_317 1 -val_317 317 val_317 1 +val_318 318 val_318 1 +val_318 318 val_318 1 +val_318 318 val_318 1 val_321 321 val_321 1 val_321 321 val_321 1 +val_322 322 val_322 1 +val_322 322 val_322 1 val_323 323 val_323 1 -val_325 325 val_325 1 -val_325 325 val_325 1 -val_327 327 val_327 1 -val_327 327 val_327 1 -val_327 327 val_327 1 val_331 331 val_331 1 val_331 331 val_331 1 val_333 333 val_333 1 val_333 333 val_333 1 val_335 335 val_335 1 -val_339 339 val_339 1 -val_341 341 val_341 1 val_345 345 val_345 1 -val_351 351 val_351 1 -val_353 353 val_353 1 -val_353 353 val_353 1 -val_365 365 val_365 1 +val_356 356 val_356 1 +val_366 366 val_366 1 val_367 367 val_367 1 val_367 367 val_367 1 -val_369 369 val_369 1 -val_369 369 val_369 1 -val_369 369 val_369 1 val_373 373 val_373 1 +val_374 374 val_374 1 val_375 375 val_375 1 -val_377 377 val_377 1 val_379 379 val_379 1 +val_382 382 val_382 1 +val_382 382 val_382 1 val_389 389 val_389 1 -val_393 393 val_393 1 val_395 395 val_395 1 val_395 395 val_395 1 -val_397 397 val_397 1 -val_397 397 val_397 1 -val_399 399 val_399 1 -val_399 399 val_399 1 +val_400 400 val_400 1 val_401 401 val_401 1 val_401 401 val_401 1 val_401 401 val_401 1 @@ -1357,58 +1360,55 @@ val_401 401 val_401 1 val_403 403 val_403 1 val_403 403 val_403 1 val_403 403 val_403 1 -val_407 407 val_407 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_411 411 val_411 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 val_413 413 val_413 1 val_413 413 val_413 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_419 419 val_419 1 -val_421 421 val_421 1 -val_427 427 val_427 1 +val_418 418 val_418 1 +val_424 424 val_424 1 +val_424 424 val_424 1 val_429 429 val_429 1 val_429 429 val_429 1 val_431 431 val_431 1 val_431 431 val_431 1 val_431 431 val_431 1 -val_435 435 val_435 1 -val_437 437 val_437 1 +val_436 436 val_436 1 +val_438 438 val_438 1 +val_438 438 val_438 1 +val_438 438 val_438 1 val_439 439 val_439 1 val_439 439 val_439 1 -val_443 443 val_443 1 -val_449 449 val_449 1 -val_453 453 val_453 1 +val_448 448 val_448 1 val_455 455 val_455 1 val_457 457 val_457 1 -val_459 459 val_459 1 -val_459 459 val_459 1 -val_463 463 val_463 1 -val_463 463 val_463 1 -val_467 467 val_467 1 +val_460 460 val_460 1 +val_462 462 val_462 1 +val_462 462 val_462 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 +val_470 470 val_470 1 val_475 475 val_475 1 val_477 477 val_477 1 -val_479 479 val_479 1 val_481 481 val_481 1 -val_483 483 val_483 1 -val_485 485 val_485 1 val_487 487 val_487 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 -val_491 491 val_491 1 +val_492 492 val_492 1 +val_492 492 val_492 1 val_493 493 val_493 1 -val_495 495 val_495 1 -val_497 497 val_497 1 +val_494 494 val_494 1 +val_496 496 val_496 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2') SELECT a.key+a.key, a.value, a.value FROM test_table1 a WHERE a.ds = '1' diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out index 5958232afa..2869db284d 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_22.q.out @@ -108,7 +108,7 @@ POSTHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select count(*) from test_table2 PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -126,7 +126,7 @@ POSTHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 #### A masked pattern was here #### -253 +257 PREHOOK: query: drop table test_table1 PREHOOK: type: DROPTABLE PREHOOK: Input: default@test_table1 @@ -253,7 +253,7 @@ POSTHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select count(*) from test_table2 PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -271,4 +271,4 @@ POSTHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 #### A masked pattern was here #### -253 +257 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out index 1302360c58..98687298a9 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_46.q.out @@ -143,11 +143,11 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None NULL NULL NULL NULL NULL None NULL NULL NULL -99 0 Alice NULL NULL NULL 101 2 Car 103 2 Ema 101 2 Car 102 2 Del 99 2 Mat 103 2 Ema 99 2 Mat 102 2 Del +99 0 Alice NULL NULL NULL 100 1 Bob NULL NULL NULL PREHOOK: query: EXPLAIN SELECT * @@ -221,9 +221,9 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None NULL NULL NULL NULL NULL None NULL NULL NULL -99 0 Alice NULL NULL NULL 101 2 Car 102 2 Del 99 2 Mat NULL NULL NULL +99 0 Alice NULL NULL NULL 100 1 Bob NULL NULL NULL Warning: Map Join MAPJOIN[11][bigTable=?] in task 'Stage-3:MAPRED' is a cross product PREHOOK: query: EXPLAIN @@ -326,9 +326,9 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None NULL NULL NULL NULL NULL None NULL NULL NULL -99 0 Alice NULL NULL NULL 101 2 Car 102 2 Del 99 2 Mat NULL NULL NULL +99 0 Alice NULL NULL NULL 100 1 Bob 102 2 Del PREHOOK: query: EXPLAIN SELECT * @@ -489,12 +489,12 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None NULL NULL NULL NULL NULL None NULL NULL NULL -99 0 Alice NULL NULL NULL 101 2 Car 105 NULL None 101 2 Car 103 2 Ema 101 2 Car 102 2 Del 101 2 Car 104 3 Fli 99 2 Mat NULL NULL NULL +99 0 Alice NULL NULL NULL 100 1 Bob 105 NULL None 100 1 Bob 103 2 Ema 100 1 Bob 102 2 Del @@ -596,13 +596,13 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None 102 2 Del NULL NULL None 102 2 Del -99 0 Alice 102 2 Del 101 2 Car 105 NULL None 101 2 Car 103 2 Ema 101 2 Car 102 2 Del 101 2 Car 104 3 Fli 99 2 Mat 103 2 Ema 99 2 Mat 102 2 Del +99 0 Alice 102 2 Del 100 1 Bob 105 NULL None 100 1 Bob 103 2 Ema 100 1 Bob 102 2 Del @@ -700,13 +700,13 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None NULL NULL NULL NULL NULL None NULL NULL NULL -99 0 Alice NULL NULL NULL 101 2 Car 105 NULL None 101 2 Car 103 2 Ema 101 2 Car 102 2 Del 101 2 Car 104 3 Fli 99 2 Mat 103 2 Ema 99 2 Mat 102 2 Del +99 0 Alice NULL NULL NULL 100 1 Bob 105 NULL None 100 1 Bob 103 2 Ema 100 1 Bob 102 2 Del @@ -804,11 +804,11 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None 102 2 Del NULL NULL None 102 2 Del -99 0 Alice 102 2 Del 101 2 Car 103 2 Ema 101 2 Car 102 2 Del 99 2 Mat 103 2 Ema 99 2 Mat 102 2 Del +99 0 Alice 102 2 Del 100 1 Bob 102 2 Del PREHOOK: query: EXPLAIN SELECT * @@ -880,10 +880,10 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None NULL NULL NULL NULL NULL None NULL NULL NULL -99 0 Alice NULL NULL NULL 101 2 Car 103 2 Ema 101 2 Car 102 2 Del 99 2 Mat 102 2 Del +99 0 Alice NULL NULL NULL 100 1 Bob NULL NULL NULL Warning: Map Join MAPJOIN[9][bigTable=?] in task 'Stage-3:MAPRED' is a cross product PREHOOK: query: EXPLAIN @@ -987,9 +987,9 @@ POSTHOOK: Input: default@test2 100 1 Bob 103 2 Ema 98 NULL None 102 2 Del NULL NULL None 102 2 Del -99 0 Alice 102 2 Del 101 2 Car 102 2 Del 99 2 Mat 102 2 Del +99 0 Alice 102 2 Del 100 1 Bob 102 2 Del 101 2 Car 104 3 Fli 100 1 Bob 104 3 Fli @@ -1190,9 +1190,9 @@ NULL NULL NULL 105 NULL None 99 2 Mat 103 2 Ema 98 NULL None 102 2 Del NULL NULL None 102 2 Del -99 0 Alice 102 2 Del 101 2 Car 102 2 Del 99 2 Mat 102 2 Del +99 0 Alice 102 2 Del 100 1 Bob 102 2 Del NULL NULL NULL 104 3 Fli PREHOOK: query: EXPLAIN @@ -1356,17 +1356,17 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test2 #### A masked pattern was here #### +100 1 Bob 104 3 Fli 100 1 Bob 102 2 Del 100 1 Bob 103 2 Ema 100 1 Bob 105 NULL None -100 1 Bob 104 3 Fli +99 0 Alice 102 2 Del 99 2 Mat 102 2 Del 99 2 Mat 103 2 Ema +101 2 Car 104 3 Fli 101 2 Car 102 2 Del 101 2 Car 103 2 Ema 101 2 Car 105 NULL None -101 2 Car 104 3 Fli -99 0 Alice 102 2 Del NULL NULL None 102 2 Del 98 NULL None 102 2 Del Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product @@ -1453,17 +1453,17 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test2 #### A masked pattern was here #### +100 1 Bob 104 3 Fli 100 1 Bob 102 2 Del 100 1 Bob 103 2 Ema 100 1 Bob 105 NULL None -100 1 Bob 104 3 Fli +99 0 Alice NULL NULL NULL 99 2 Mat 102 2 Del 99 2 Mat 103 2 Ema +101 2 Car 104 3 Fli 101 2 Car 102 2 Del 101 2 Car 103 2 Ema 101 2 Car 105 NULL None -101 2 Car 104 3 Fli -99 0 Alice NULL NULL NULL NULL NULL None NULL NULL NULL 98 NULL None NULL NULL NULL Warning: Shuffle Join JOIN[6][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product @@ -1551,15 +1551,15 @@ POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test2 #### A masked pattern was here #### 100 1 Bob 102 2 Del +99 0 Alice 102 2 Del 99 2 Mat 102 2 Del 99 2 Mat 103 2 Ema 101 2 Car 102 2 Del 101 2 Car 103 2 Ema -99 0 Alice 102 2 Del NULL NULL None 102 2 Del 98 NULL None 102 2 Del -NULL NULL NULL 105 NULL None NULL NULL NULL 104 3 Fli +NULL NULL NULL 105 NULL None PREHOOK: query: EXPLAIN SELECT * FROM test1 FULL OUTER JOIN test2 diff --git a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out index c7334a8295..9df4d47079 100644 --- a/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out +++ b/ql/src/test/results/clientpositive/smb_mapjoin_47.q.out @@ -444,13 +444,13 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### 98 NULL None 102 2 Del NULL NULL None 102 2 Del -99 0 Alice 102 2 Del 101 2 Car 105 NULL None 101 2 Car 103 2 Ema 101 2 Car 102 2 Del 101 2 Car 104 3 Fli 99 2 Mat 103 2 Ema 99 2 Mat 102 2 Del +99 0 Alice 102 2 Del 100 1 Bob 105 NULL None Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-3:MAPRED' is a cross product PREHOOK: query: EXPLAIN @@ -652,12 +652,12 @@ POSTHOOK: Input: default@test2 98 NULL None 103 2 Ema 98 NULL None 102 2 Del 98 NULL None 104 3 Fli -99 0 Alice 105 NULL None -99 0 Alice 103 2 Ema -99 0 Alice 102 2 Del -99 0 Alice 104 3 Fli 101 2 Car 105 NULL None 101 2 Car 103 2 Ema +101 2 Car 102 2 Del +101 2 Car 104 3 Fli +99 2 Mat 105 NULL None +99 2 Mat 103 2 Ema Warning: Map Join MAPJOIN[10][bigTable=?] in task 'Stage-3:MAPRED' is a cross product PREHOOK: query: EXPLAIN SELECT * @@ -849,16 +849,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test2 #### A masked pattern was here #### -104 3 Fli 99 2 Mat NULL NULL NULL -104 3 Fli 101 2 Car NULL NULL NULL -102 2 Del 99 2 Mat 99 2 Mat -102 2 Del 101 2 Car 99 2 Mat -103 2 Ema 99 2 Mat 99 2 Mat -103 2 Ema 101 2 Car 99 2 Mat -102 2 Del 99 2 Mat 101 2 Car -102 2 Del 101 2 Car 101 2 Car -103 2 Ema 99 2 Mat 101 2 Car -103 2 Ema 101 2 Car 101 2 Car +104 3 Fli 100 1 Bob NULL NULL NULL +104 3 Fli 99 0 Alice NULL NULL NULL +102 2 Del 100 1 Bob 99 2 Mat +102 2 Del 99 0 Alice 99 2 Mat +103 2 Ema 100 1 Bob 99 2 Mat +103 2 Ema 99 0 Alice 99 2 Mat +102 2 Del 100 1 Bob 101 2 Car +102 2 Del 99 0 Alice 101 2 Car +103 2 Ema 100 1 Bob 101 2 Car +103 2 Ema 99 0 Alice 101 2 Car Warning: Shuffle Join JOIN[11][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-1:MAPRED' is a cross product PREHOOK: query: EXPLAIN SELECT * @@ -1144,14 +1144,14 @@ POSTHOOK: Input: default@test2 #### A masked pattern was here #### NULL NULL NULL NULL NULL NULL 98 NULL None NULL NULL NULL NULL NULL NULL NULL NULL None -NULL NULL NULL NULL NULL NULL 99 0 Alice 103 2 Ema 98 NULL None 101 2 Car 102 2 Del 98 NULL None 101 2 Car -103 2 Ema 99 0 Alice 101 2 Car -102 2 Del 99 0 Alice 101 2 Car 103 2 Ema 101 2 Car 101 2 Car 102 2 Del 101 2 Car 101 2 Car 103 2 Ema 99 2 Mat 101 2 Car +102 2 Del 99 2 Mat 101 2 Car +103 2 Ema 99 0 Alice 101 2 Car +102 2 Del 99 0 Alice 101 2 Car Warning: Shuffle Join JOIN[11][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Stage 'Stage-1:MAPRED' is a cross product PREHOOK: query: EXPLAIN SELECT * @@ -1373,15 +1373,15 @@ POSTHOOK: Input: default@test1 POSTHOOK: Input: default@test2 #### A masked pattern was here #### 105 NULL None 100 1 Bob NULL NULL NULL -105 NULL None 101 2 Car NULL NULL NULL -105 NULL None 98 NULL None NULL NULL NULL -105 NULL None 99 2 Mat NULL NULL NULL 105 NULL None 99 0 Alice NULL NULL NULL -NULL NULL NULL NULL NULL NULL NULL NULL None +105 NULL None 99 2 Mat NULL NULL NULL +105 NULL None 98 NULL None NULL NULL NULL +105 NULL None 101 2 Car NULL NULL NULL NULL NULL NULL NULL NULL NULL 98 NULL None +NULL NULL NULL NULL NULL NULL NULL NULL None NULL NULL NULL NULL NULL NULL 99 0 Alice NULL NULL NULL NULL NULL NULL 100 1 Bob -102 2 Del 100 1 Bob 99 2 Mat +102 2 Del 100 1 Bob 101 2 Car Warning: Map Join MAPJOIN[17][bigTable=?] in task 'Stage-5:MAPRED' is a cross product PREHOOK: query: EXPLAIN SELECT * diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out index 5754a74478..38d2b96789 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out @@ -128,6 +128,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out index 5dc2426fe4..6c85b3588c 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out @@ -101,6 +101,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -211,6 +212,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out index 28501ab1d0..ec38762ad3 100644 --- a/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out +++ b/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out @@ -137,6 +137,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -184,6 +185,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -285,6 +287,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -334,6 +337,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out index 2b069ecec7..9337387e39 100644 --- a/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out +++ b/ql/src/test/results/clientpositive/spark/alter_merge_stats_orc.q.out @@ -89,6 +89,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 3 numRows 1500 rawDataSize 141000 @@ -139,6 +140,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1500 rawDataSize 141000 diff --git a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out index 04550eb84f..148deb0951 100644 --- a/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out @@ -128,6 +128,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -149,6 +150,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -201,6 +203,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -222,6 +225,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -274,6 +278,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -295,6 +300,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -347,6 +353,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -368,6 +375,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns dealid,date,time,cityid,userid columns.comments @@ -420,6 +428,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns userid columns.comments @@ -441,6 +450,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns userid columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out index baf3908532..fd2ef11db4 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out @@ -186,6 +186,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -235,6 +236,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -394,6 +396,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -443,6 +446,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -602,6 +606,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -651,6 +656,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out index 0a1d4cf148..b3287e60b3 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out @@ -211,6 +211,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -260,6 +261,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -337,6 +339,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -413,6 +416,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -481,6 +485,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out index 8cfa113794..eed6a93185 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out @@ -168,6 +168,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -217,6 +218,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -376,6 +378,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -425,6 +428,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out index b3a9bcfaec..c3df4bbd61 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out @@ -168,6 +168,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -326,6 +327,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -484,6 +486,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out index fce5e0cfc4..d64a152ff0 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out @@ -184,6 +184,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -342,6 +343,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -500,6 +502,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out index 15080445f5..3655010b11 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out @@ -124,6 +124,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -146,6 +147,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -275,6 +277,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -297,6 +300,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -426,6 +430,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -448,6 +453,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out index eb813c1734..78099d1716 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out @@ -201,6 +201,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -250,6 +251,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -411,6 +413,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -460,6 +463,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -621,6 +625,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -670,6 +675,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out index 03d4367961..636d35f388 100644 --- a/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out +++ b/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out @@ -201,6 +201,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -250,6 +251,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -411,6 +413,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -460,6 +463,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -621,6 +625,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -670,6 +675,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out index f50fd6452e..04c1e23480 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out @@ -87,6 +87,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -109,6 +110,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -181,6 +183,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -203,6 +206,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out index 50d8c2f457..c26a522fd2 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out @@ -87,6 +87,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -109,6 +110,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -181,6 +183,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -203,6 +206,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 1 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out index 5de2016724..dcbbcf47ea 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out @@ -189,6 +189,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -254,6 +255,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -316,6 +318,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -345,6 +348,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -492,6 +496,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -556,6 +561,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -613,6 +619,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -642,6 +649,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out index 22fa0cf182..2845b32401 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out @@ -173,6 +173,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -238,6 +239,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -300,6 +302,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -329,6 +332,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -481,6 +485,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -546,6 +551,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -608,6 +614,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -637,6 +644,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out index 71c28171d5..41add79afd 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out @@ -173,6 +173,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -238,6 +239,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -300,6 +302,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -329,6 +332,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -476,6 +480,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -540,6 +545,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -597,6 +603,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -626,6 +633,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out index 68889d306f..6ac9dd4200 100644 --- a/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out +++ b/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out @@ -110,6 +110,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -133,6 +134,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -186,6 +188,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -209,6 +212,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -310,6 +314,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -333,6 +338,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -483,6 +489,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -506,6 +513,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -559,6 +567,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -582,6 +591,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -683,6 +693,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -706,6 +717,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out index 15abce3ba6..3a062cae84 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out @@ -420,6 +420,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -441,6 +442,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -519,6 +521,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -564,6 +567,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -595,6 +599,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -776,6 +781,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -797,6 +803,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -875,6 +882,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -920,6 +928,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -951,6 +960,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out index 5189afd7ac..a1f78cedd8 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out @@ -199,6 +199,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -247,6 +248,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -342,6 +344,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -390,6 +393,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out index 0a65dc7e05..93ccb0ffb8 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out @@ -212,6 +212,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -260,6 +261,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -361,6 +363,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -409,6 +412,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -565,6 +569,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -613,6 +618,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -714,6 +720,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -762,6 +769,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out index 90ef33def8..8a0377df66 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out @@ -172,6 +172,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -272,6 +273,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -417,6 +419,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -511,6 +514,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out index 9e44d1a68d..4d887f58db 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out @@ -136,6 +136,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -231,6 +232,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -280,6 +282,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -435,6 +438,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -536,6 +540,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -696,6 +701,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -797,6 +803,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -957,6 +964,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1058,6 +1066,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out index ddef6fb136..a4fa2e2145 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out @@ -171,6 +171,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -247,6 +248,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -292,6 +294,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -323,6 +326,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -533,6 +537,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -609,6 +614,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -654,6 +660,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -685,6 +692,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -912,6 +920,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -988,6 +997,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1036,6 +1046,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1082,6 +1093,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -1113,6 +1125,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out index 95cc9e1440..3920bfb1c0 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out @@ -195,6 +195,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -271,6 +272,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -316,6 +318,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -347,6 +350,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -557,6 +561,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -633,6 +638,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -678,6 +684,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -709,6 +716,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin4.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin4.q.out index 7f68921911..26221a9556 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin4.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin4.q.out @@ -170,6 +170,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -191,6 +192,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -244,6 +246,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -265,6 +268,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -312,6 +316,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -343,6 +348,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -516,6 +522,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -537,6 +544,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -590,6 +598,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -611,6 +620,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -658,6 +668,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -689,6 +700,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin5.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin5.q.out index da24d870a5..de6aba9a43 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin5.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin5.q.out @@ -218,6 +218,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -239,6 +240,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -302,6 +304,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -364,6 +367,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -412,6 +416,7 @@ STAGE PLANS: properties: bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -442,6 +447,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -625,6 +631,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -646,6 +653,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -709,6 +717,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -771,6 +780,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -819,6 +829,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -849,6 +860,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out index d7967d1d10..041d28b257 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out @@ -135,6 +135,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -241,6 +242,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark index f67dec578b..e6d868d29a 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out_spark @@ -133,6 +133,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -236,6 +237,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out index 76ce9d300b..cdf1a0d7fe 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out @@ -138,6 +138,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -238,6 +239,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -397,6 +399,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -497,6 +500,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out index 1bfe4d2701..e7e424e876 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out @@ -141,6 +141,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -235,6 +236,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -422,6 +424,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -516,6 +519,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative.q.out index f7453d765b..e9b4ce0802 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative.q.out @@ -139,6 +139,7 @@ STAGE PLANS: properties: bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -199,6 +200,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -231,6 +233,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -252,6 +255,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -283,6 +287,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative2.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative2.q.out index eded3ae425..4c2acb1cae 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative2.q.out @@ -153,6 +153,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -201,6 +202,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -263,6 +265,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments @@ -300,6 +303,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -321,6 +325,7 @@ STAGE PLANS: properties: bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -352,6 +357,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value1,value2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out index 0cffcf6538..a9a3702b25 100644 --- a/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out @@ -190,6 +190,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -212,6 +213,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -303,6 +305,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -325,6 +328,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -399,6 +403,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -421,6 +426,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -512,6 +518,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -534,6 +541,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -603,6 +611,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -625,6 +634,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -710,6 +720,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -732,6 +743,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -801,6 +813,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -823,6 +836,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -908,6 +922,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -930,6 +945,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -999,6 +1015,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1021,6 +1038,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1106,6 +1124,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1128,6 +1147,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1197,6 +1217,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1219,6 +1240,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1304,6 +1326,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1326,6 +1349,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1395,6 +1419,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1417,6 +1442,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1502,6 +1528,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1524,6 +1551,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1593,6 +1621,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1615,6 +1644,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1700,6 +1730,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1722,6 +1753,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1791,6 +1823,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1813,6 +1846,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name value + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1898,6 +1932,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1920,6 +1955,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 3 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out index 3e8ea6f113..9b14b9298e 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out @@ -193,18 +193,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 2 val_2val_2 1 -4 val_4val_4 1 -8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -215,6 +204,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +4 val_4val_4 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -224,6 +223,7 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 +8 val_8val_8 1 9 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -344,6 +344,18 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +2 val_2val_2 1 +2 val_2val_2 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 @@ -362,22 +374,8 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 -2 val_2val_2 1 -2 val_2val_2 1 4 val_4val_4 1 4 val_4val_4 1 -8 val_8val_8 1 -8 val_8val_8 1 -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -396,6 +394,8 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 +8 val_8val_8 1 +8 val_8val_8 1 9 val_9val_9 1 9 val_9val_9 1 PREHOOK: query: EXPLAIN @@ -517,6 +517,18 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +2 val_2val_2 1 +2 val_2val_2 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 @@ -535,22 +547,8 @@ POSTHOOK: Input: default@test_table3@ds=1 0 val_0val_0 1 0 val_0val_0 1 0 val_0val_0 1 -2 val_2val_2 1 -2 val_2val_2 1 4 val_4val_4 1 4 val_4val_4 1 -8 val_8val_8 1 -8 val_8val_8 1 -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -569,6 +567,8 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 +8 val_8val_8 1 +8 val_8val_8 1 9 val_9val_9 1 9 val_9val_9 1 PREHOOK: query: EXPLAIN @@ -700,18 +700,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 2 val_2val_2 1 -4 val_4val_4 1 -8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -722,6 +711,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +4 val_4val_4 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -731,6 +730,7 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 +8 val_8val_8 1 9 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -861,18 +861,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 -0 val_0val_0val_0val_0 1 2 val_2val_2val_2val_2 1 -4 val_4val_4val_4val_4 1 -8 val_8val_8val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -883,6 +872,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +0 val_0val_0val_0val_0 1 +4 val_4val_4val_4val_4 1 5 val_5val_5val_5val_5 1 5 val_5val_5val_5val_5 1 5 val_5val_5val_5val_5 1 @@ -892,6 +891,7 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5val_5val_5val_5 1 5 val_5val_5val_5val_5 1 5 val_5val_5val_5val_5 1 +8 val_8val_8val_8val_8 1 9 val_9val_9val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -1022,17 +1022,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -4 val_2val_2 1 -8 val_4val_4 1 10 val_5val_5 1 10 val_5val_5 1 10 val_5val_5 1 @@ -1042,8 +1031,6 @@ POSTHOOK: Input: default@test_table3@ds=1 10 val_5val_5 1 10 val_5val_5 1 10 val_5val_5 1 -16 val_8val_8 1 -18 val_9val_9 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -1054,3 +1041,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +4 val_2val_2 1 +8 val_4val_4 1 +16 val_8val_8 1 +18 val_9val_9 1 diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out index faada6fff0..163345807e 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out @@ -190,18 +190,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 2 2 val_2val_2 1 -4 4 val_4val_4 1 -8 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -212,6 +201,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +4 4 val_4val_4 1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 @@ -221,6 +220,7 @@ POSTHOOK: Input: default@test_table3@ds=1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 +8 8 val_8val_8 1 9 9 val_9val_9 1 PREHOOK: query: DROP TABLE test_table3 PREHOOK: type: DROPTABLE @@ -393,6 +393,7 @@ POSTHOOK: Input: default@test_table3@ds=1 2 val_2 1 4 val_4 1 8 val_8 1 +9 val_9 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -412,7 +413,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 val_5 1 5 val_5 1 5 val_5 1 -9 val_9 1 PREHOOK: query: DROP TABLE test_table3 PREHOOK: type: DROPTABLE PREHOOK: Input: default@test_table3 diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out index 8282a5a33f..e4b6703bc1 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out @@ -200,16 +200,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -221,6 +211,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -230,7 +231,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -390,16 +390,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -411,6 +401,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -420,7 +421,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -824,16 +824,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -845,6 +835,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -854,7 +855,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -1026,16 +1026,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -PREHOOK: type: QUERY -PREHOOK: Input: default@test_table3 -PREHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### -POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' -POSTHOOK: type: QUERY -POSTHOOK: Input: default@test_table3 -POSTHOOK: Input: default@test_table3@ds=1 -#### A masked pattern was here #### 0 1 val_0val_0 1 0 1 val_0val_0 1 0 1 val_0val_0 1 @@ -1047,6 +1037,17 @@ POSTHOOK: Input: default@test_table3@ds=1 0 1 val_0val_0 1 2 3 val_2val_2 1 4 5 val_4val_4 1 +8 9 val_8val_8 1 +PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +PREHOOK: type: QUERY +PREHOOK: Input: default@test_table3 +PREHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### +POSTHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' +POSTHOOK: type: QUERY +POSTHOOK: Input: default@test_table3 +POSTHOOK: Input: default@test_table3@ds=1 +#### A masked pattern was here #### 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 @@ -1056,7 +1057,6 @@ POSTHOOK: Input: default@test_table3@ds=1 5 6 val_5val_5 1 5 6 val_5val_5 1 5 6 val_5val_5 1 -8 9 val_8val_8 1 9 10 val_9val_9 1 PREHOOK: query: CREATE TABLE test_table4 (key INT, key2 INT, value STRING) PARTITIONED BY (ds STRING) CLUSTERED BY (key, key2) SORTED BY (key DESC, key2 DESC) INTO 2 BUCKETS diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out index 192689a737..9b8e835308 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out @@ -173,15 +173,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -192,6 +183,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -330,15 +330,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -349,6 +340,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 @@ -491,15 +491,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 -0 val_0val_0 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -510,6 +501,15 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 +0 val_0val_0 1 5 val_5val_5 1 5 val_5val_5 1 5 val_5val_5 1 diff --git a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out index 2198dc2fa2..864c3ff017 100644 --- a/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out +++ b/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out @@ -198,18 +198,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 2 2 val_2val_2 1 -4 4 val_4val_4 1 -8 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -220,6 +209,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +4 4 val_4val_4 1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 @@ -229,6 +228,7 @@ POSTHOOK: Input: default@test_table3@ds=1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 +8 8 val_8val_8 1 9 9 val_9val_9 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') @@ -376,18 +376,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 -0 0 val_0val_0 1 2 2 val_2val_2 1 -4 4 val_4val_4 1 -8 8 val_8val_8 1 PREHOOK: query: select * from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -398,6 +387,16 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +0 0 val_0val_0 1 +4 4 val_4val_4 1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 @@ -407,4 +406,5 @@ POSTHOOK: Input: default@test_table3@ds=1 5 5 val_5val_5 1 5 5 val_5val_5 1 5 5 val_5val_5 1 +8 8 val_8val_8 1 9 9 val_9val_9 1 diff --git a/ql/src/test/results/clientpositive/spark/cbo_gby.q.out b/ql/src/test/results/clientpositive/spark/cbo_gby.q.out index d1fe9e9ed2..e47b8af5d1 100644 --- a/ql/src/test/results/clientpositive/spark/cbo_gby.q.out +++ b/ql/src/test/results/clientpositive/spark/cbo_gby.q.out @@ -43,7 +43,7 @@ POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 -1 2 6 +1 2 4 PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b % c asc, b desc) cbo_t1 left outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p left outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int % c asc, cbo_t3.c_int desc PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -61,7 +61,7 @@ POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 -1 2 6 +1 2 4 PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by b+c, a desc) cbo_t1 right outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p right outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 2) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -79,7 +79,7 @@ POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 -1 2 6 +1 2 4 PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by c+a desc) cbo_t1 full outer join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by p+q desc, r asc) cbo_t2 on cbo_t1.a=p full outer join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c having cbo_t3.c_int > 0 and (c_int >=1 or c >= 1) and (c_int + c) >= 0 order by cbo_t3.c_int PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -97,7 +97,7 @@ POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 -1 2 6 +1 2 4 PREHOOK: query: select cbo_t3.c_int, c, count(*) from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0) group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t1 join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0) group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0) cbo_t2 on cbo_t1.a=p join cbo_t3 on cbo_t1.a=key where (b + cbo_t2.q >= 0) and (b > 0 or c_int >= 0) group by cbo_t3.c_int, c PREHOOK: type: QUERY PREHOOK: Input: default@cbo_t1 @@ -115,4 +115,4 @@ POSTHOOK: Input: default@cbo_t2@dt=2014 POSTHOOK: Input: default@cbo_t3 #### A masked pattern was here #### 1 12 6 -1 2 6 +1 2 4 diff --git a/ql/src/test/results/clientpositive/spark/ctas.q.out b/ql/src/test/results/clientpositive/spark/ctas.q.out index 2ccd1ddfcf..9500eaa41c 100644 --- a/ql/src/test/results/clientpositive/spark/ctas.q.out +++ b/ql/src/test/results/clientpositive/spark/ctas.q.out @@ -145,6 +145,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 @@ -292,6 +293,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 @@ -439,6 +441,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 120 @@ -502,6 +505,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 120 @@ -650,6 +654,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 96 diff --git a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out index 320a52ee3d..45e9041516 100644 --- a/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out +++ b/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out @@ -97,6 +97,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -172,6 +173,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -246,6 +248,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/groupby3.q.out b/ql/src/test/results/clientpositive/spark/groupby3.q.out index 7bdc3a0b9c..32906096a2 100644 --- a/ql/src/test/results/clientpositive/spark/groupby3.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby3.q.out @@ -149,4 +149,4 @@ POSTHOOK: query: SELECT dest1.* FROM dest1 POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -130091.0 260.182 256.10355987055016 98.0 0.0 142.92680950752379 143.06995106518903 20428.07287599999 20469.010897795582 +130091.0 260.182 256.10355987055016 98.0 0.0 142.9268095075238 143.06995106518906 20428.072876000002 20469.010897795593 diff --git a/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out b/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out index d1fcd48084..4a073d95e9 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out @@ -93,6 +93,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -141,6 +142,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -185,6 +187,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments @@ -216,6 +219,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out index 30e5daa437..cdac070e81 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out @@ -93,6 +93,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -141,6 +142,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -185,6 +187,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -216,6 +219,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out b/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out index 2bbffaf77e..9eb7e5fd18 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out @@ -86,6 +86,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -134,6 +135,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -178,6 +180,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments @@ -209,6 +212,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out b/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out index 14c287f13d..d52cf157ec 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out @@ -86,6 +86,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -134,6 +135,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -178,6 +180,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -209,6 +212,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"c1":"true","c2":"true","c3":"true","c4":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -354,6 +358,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -402,6 +407,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -446,6 +452,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments @@ -477,6 +484,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,c1,c2,c3,c4 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out index d87ba73098..6efeb984fc 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out @@ -85,6 +85,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -117,6 +118,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -140,6 +142,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -171,6 +174,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -284,6 +288,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -307,6 +312,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -352,6 +358,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -383,6 +390,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -483,6 +491,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -515,6 +524,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -538,6 +548,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -569,6 +580,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -667,6 +679,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -699,6 +712,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -722,6 +736,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -753,6 +768,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -859,6 +875,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -891,6 +908,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -914,6 +932,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -945,6 +964,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1059,6 +1079,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1082,6 +1103,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1127,6 +1149,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -1158,6 +1181,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -1266,6 +1290,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1289,6 +1314,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1334,6 +1360,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1365,6 +1392,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1485,6 +1513,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1508,6 +1537,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1553,6 +1583,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1584,6 +1615,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1694,6 +1726,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1726,6 +1759,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1749,6 +1783,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1801,6 +1836,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1833,6 +1869,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1856,6 +1893,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1887,6 +1925,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2008,6 +2047,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2040,6 +2080,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2063,6 +2104,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2120,6 +2162,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2143,6 +2186,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2192,6 +2236,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2223,6 +2268,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2349,6 +2395,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2372,6 +2419,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2429,6 +2477,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2452,6 +2501,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2499,6 +2549,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2530,6 +2581,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2649,6 +2701,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2672,6 +2725,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2729,6 +2783,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2752,6 +2807,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2908,6 +2964,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2931,6 +2988,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2976,6 +3034,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3007,6 +3066,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3105,6 +3165,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3137,6 +3198,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3160,6 +3222,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3191,6 +3254,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3300,6 +3364,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -3332,6 +3397,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3355,6 +3421,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3386,6 +3453,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -3494,6 +3562,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3526,6 +3595,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3549,6 +3619,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3580,6 +3651,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3695,6 +3767,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3727,6 +3800,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3750,6 +3824,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3781,6 +3856,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out index 2fa8c3a228..54b08556b1 100644 --- a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out +++ b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out @@ -85,6 +85,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -117,6 +118,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -140,6 +142,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -171,6 +174,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -285,6 +289,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -308,6 +313,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -371,6 +377,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -402,6 +409,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -502,6 +510,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -534,6 +543,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -557,6 +567,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -588,6 +599,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -686,6 +698,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -718,6 +731,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -741,6 +755,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -772,6 +787,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -878,6 +894,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -910,6 +927,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -933,6 +951,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -964,6 +983,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1079,6 +1099,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1102,6 +1123,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1165,6 +1187,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -1196,6 +1219,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -1305,6 +1329,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1328,6 +1353,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1391,6 +1417,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1422,6 +1449,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,cnt columns.comments @@ -1543,6 +1571,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1566,6 +1595,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1629,6 +1659,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1660,6 +1691,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1770,6 +1802,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1802,6 +1835,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1825,6 +1859,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1877,6 +1912,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -1909,6 +1945,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1932,6 +1969,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -1963,6 +2001,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2085,6 +2124,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2117,6 +2157,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2140,6 +2181,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2197,6 +2239,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2220,6 +2263,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2287,6 +2331,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2318,6 +2363,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2444,6 +2490,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2467,6 +2514,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2524,6 +2572,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2547,6 +2596,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2594,6 +2644,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2625,6 +2676,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -2745,6 +2797,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2768,6 +2821,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2825,6 +2879,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -2848,6 +2903,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3023,6 +3079,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3046,6 +3103,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3109,6 +3167,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3140,6 +3199,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,cnt columns.comments @@ -3238,6 +3298,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3270,6 +3331,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3293,6 +3355,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3324,6 +3387,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3433,6 +3497,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -3465,6 +3530,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3488,6 +3554,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3519,6 +3586,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cnt":"true","key1":"true","key2":"true","key3":"true","key4":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,key4,cnt columns.comments @@ -3627,6 +3695,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3659,6 +3728,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3682,6 +3752,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3713,6 +3784,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3828,6 +3900,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments @@ -3860,6 +3933,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3883,6 +3957,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,val columns.comments @@ -3914,6 +3989,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key1,key2,key3,cnt columns.comments diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out index fbb1731956..231194c1cc 100644 --- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out +++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_bucketed_table.q.out @@ -67,7 +67,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 POSTHOOK: Output: hdfs://### HDFS PATH ### -31 +0 PREHOOK: query: SELECT COUNT(*) FROM test_table_bucketed TABLESAMPLE (BUCKET 2 OUT OF 3) WHERE part = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table_bucketed @@ -78,7 +78,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 POSTHOOK: Output: hdfs://### HDFS PATH ### -179 +0 PREHOOK: query: SELECT COUNT(*) FROM test_table_bucketed TABLESAMPLE (BUCKET 3 OUT OF 3) WHERE part = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table_bucketed @@ -89,7 +89,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 POSTHOOK: Output: hdfs://### HDFS PATH ### -99 +0 PREHOOK: query: SELECT cnt FROM (SELECT INPUT__FILE__NAME, COUNT(*) cnt FROM test_table_bucketed WHERE part = '1' GROUP BY INPUT__FILE__NAME ORDER BY INPUT__FILE__NAME ASC LIMIT 3) a PREHOOK: type: QUERY @@ -102,6 +102,6 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table_bucketed POSTHOOK: Input: default@test_table_bucketed@part=1 POSTHOOK: Output: hdfs://### HDFS PATH ### -31 -179 -99 +204 +101 +4 diff --git a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out index 1bdf64158b..9f69620a41 100644 --- a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out +++ b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out @@ -129,7 +129,7 @@ Table: test_table #### A masked pattern was here #### Partition Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} - numFiles 2 + numFiles 1 numRows 670 rawDataSize 5888 totalSize 6558 diff --git a/ql/src/test/results/clientpositive/spark/input_part2.q.out b/ql/src/test/results/clientpositive/spark/input_part2.q.out index 12a0afbfa5..bc0b489cca 100644 --- a/ql/src/test/results/clientpositive/spark/input_part2.q.out +++ b/ql/src/test/results/clientpositive/spark/input_part2.q.out @@ -63,6 +63,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -103,6 +104,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -158,6 +160,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -206,6 +209,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -236,6 +240,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments @@ -269,6 +274,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"ds":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,hr,ds columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join26.q.out b/ql/src/test/results/clientpositive/spark/join26.q.out index e8186abf24..34e93717ae 100644 --- a/ql/src/test/results/clientpositive/spark/join26.q.out +++ b/ql/src/test/results/clientpositive/spark/join26.q.out @@ -62,6 +62,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -83,6 +84,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -160,6 +162,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -227,6 +230,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -259,6 +263,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -280,6 +285,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -311,6 +317,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join32.q.out b/ql/src/test/results/clientpositive/spark/join32.q.out index 80e8f35f67..5ce23597a2 100644 --- a/ql/src/test/results/clientpositive/spark/join32.q.out +++ b/ql/src/test/results/clientpositive/spark/join32.q.out @@ -61,6 +61,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -82,6 +83,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -158,6 +160,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -233,6 +236,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -265,6 +269,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -286,6 +291,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -317,6 +323,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out index d3e648f9a6..09ab7e51d8 100644 --- a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out +++ b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out @@ -69,6 +69,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -90,6 +91,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -166,6 +168,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -241,6 +244,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -273,6 +277,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -294,6 +299,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -325,6 +331,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -521,6 +528,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -542,6 +550,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -609,6 +618,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -630,6 +640,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -681,6 +692,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -702,6 +714,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -779,6 +792,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -811,6 +825,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -832,6 +847,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -863,6 +879,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1079,6 +1096,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1128,6 +1146,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1149,6 +1168,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1230,6 +1250,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1262,6 +1283,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1283,6 +1305,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1314,6 +1337,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1532,6 +1556,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1577,6 +1602,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1598,6 +1624,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1679,6 +1706,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -1711,6 +1739,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1732,6 +1761,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1763,6 +1793,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join33.q.out b/ql/src/test/results/clientpositive/spark/join33.q.out index 80e8f35f67..5ce23597a2 100644 --- a/ql/src/test/results/clientpositive/spark/join33.q.out +++ b/ql/src/test/results/clientpositive/spark/join33.q.out @@ -61,6 +61,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -82,6 +83,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -158,6 +160,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -233,6 +236,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -265,6 +269,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -286,6 +291,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -317,6 +323,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join34.q.out b/ql/src/test/results/clientpositive/spark/join34.q.out index c2bdb9128d..d01e496df8 100644 --- a/ql/src/test/results/clientpositive/spark/join34.q.out +++ b/ql/src/test/results/clientpositive/spark/join34.q.out @@ -72,6 +72,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -93,6 +94,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -146,6 +148,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -167,6 +170,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -220,6 +224,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -241,6 +246,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -288,6 +294,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -319,6 +326,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join35.q.out b/ql/src/test/results/clientpositive/spark/join35.q.out index eec056d890..de8b8458fb 100644 --- a/ql/src/test/results/clientpositive/spark/join35.q.out +++ b/ql/src/test/results/clientpositive/spark/join35.q.out @@ -76,6 +76,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -97,6 +98,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -152,6 +154,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -173,6 +176,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -226,6 +230,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -247,6 +252,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -312,6 +318,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -361,6 +368,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out b/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out index 9b8b69c546..e0c54e328e 100644 --- a/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out +++ b/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out @@ -55,6 +55,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -76,6 +77,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -129,6 +131,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -150,6 +153,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -203,6 +207,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -224,6 +229,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -362,6 +368,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -383,6 +390,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -432,6 +440,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -453,6 +462,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -506,6 +516,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -527,6 +538,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -665,6 +677,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -686,6 +699,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -735,6 +749,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -756,6 +771,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -809,6 +825,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -830,6 +847,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -964,6 +982,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -985,6 +1004,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1034,6 +1054,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1055,6 +1076,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1108,6 +1130,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1129,6 +1152,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1182,6 +1206,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1203,6 +1228,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1332,6 +1358,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1353,6 +1380,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1406,6 +1434,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1427,6 +1456,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1480,6 +1510,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1501,6 +1532,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1554,6 +1586,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1575,6 +1608,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out b/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out index d2c674e7c1..9e4f7cd7c3 100644 --- a/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out @@ -60,6 +60,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -81,6 +82,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -129,6 +131,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -150,6 +153,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -215,6 +219,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -272,6 +277,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -301,6 +307,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","val2":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -553,6 +560,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -574,6 +582,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -622,6 +631,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -643,6 +653,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -708,6 +719,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments @@ -765,6 +777,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -794,6 +807,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,val2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out index 4bde96aa65..57425752e3 100644 --- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out +++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out @@ -55,6 +55,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -84,6 +85,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -106,6 +108,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -140,6 +143,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out index 10a3892f76..2d5ff4de67 100644 --- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out +++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out @@ -55,6 +55,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -108,6 +109,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -156,6 +158,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -188,6 +191,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -337,6 +341,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out b/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out index fea2d518ac..f92a8e4af5 100644 --- a/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out +++ b/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out @@ -172,6 +172,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -220,6 +221,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -268,6 +270,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -316,6 +319,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out index 95ac6c5d58..d3c4f022bb 100644 --- a/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out +++ b/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out @@ -173,6 +173,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -194,6 +195,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -271,6 +273,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -318,6 +321,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -365,6 +369,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -412,6 +417,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -558,6 +564,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -579,6 +586,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -656,6 +664,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -704,6 +713,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -752,6 +762,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -800,6 +811,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -957,6 +969,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -978,6 +991,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1055,6 +1069,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1102,6 +1117,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1149,6 +1165,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1196,6 +1213,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1356,6 +1374,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1377,6 +1396,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1424,6 +1444,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1445,6 +1466,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1575,6 +1597,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1596,6 +1619,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1644,6 +1668,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1665,6 +1690,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1785,6 +1811,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1806,6 +1833,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out index 8e9d2bb20b..9806647548 100644 --- a/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out +++ b/ql/src/test/results/clientpositive/spark/parallel_orderby.q.out @@ -118,6 +118,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numRows 48 rawDataSize 512 @@ -228,6 +229,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numRows 48 rawDataSize 512 diff --git a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out index 7d23ba8f22..2aaf23dbbc 100644 --- a/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/spark/parquet_vectorization_0.q.out @@ -1817,6 +1817,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -1838,6 +1839,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30637,6 +30639,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30658,6 +30661,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30750,6 +30754,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30771,6 +30776,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30864,6 +30870,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30885,6 +30892,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30968,6 +30976,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30989,6 +30998,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/pcr.q.out b/ql/src/test/results/clientpositive/spark/pcr.q.out index a86147fb70..7e0f8a5d4d 100644 --- a/ql/src/test/results/clientpositive/spark/pcr.q.out +++ b/ql/src/test/results/clientpositive/spark/pcr.q.out @@ -120,6 +120,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -167,6 +168,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -315,6 +317,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -362,6 +365,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -409,6 +413,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -595,6 +600,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -642,6 +648,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -792,6 +799,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -839,6 +847,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -991,6 +1000,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1038,6 +1048,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1085,6 +1096,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1248,6 +1260,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1295,6 +1308,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1342,6 +1356,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1512,6 +1527,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1559,6 +1575,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1692,6 +1709,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1739,6 +1757,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1912,6 +1931,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1959,6 +1979,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2006,6 +2027,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2206,6 +2228,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2253,6 +2276,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2394,6 +2418,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2469,6 +2494,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2667,6 +2693,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2742,6 +2769,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2949,6 +2977,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2996,6 +3025,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3043,6 +3073,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3090,6 +3121,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3275,6 +3307,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3322,6 +3355,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3369,6 +3403,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3540,6 +3575,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3576,6 +3612,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3630,6 +3667,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3659,6 +3697,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3692,6 +3731,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3783,6 +3823,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3823,6 +3864,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3877,6 +3919,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3906,6 +3949,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -3939,6 +3983,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -4052,6 +4097,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -4189,6 +4235,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -4237,6 +4284,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -4378,6 +4426,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -4426,6 +4475,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out index c8b2e465d7..caeac14385 100644 --- a/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out +++ b/ql/src/test/results/clientpositive/spark/quotedid_smb.q.out @@ -116,16 +116,16 @@ POSTHOOK: Output: hdfs://### HDFS PATH ### 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 0 val_0 -103 val_103 103 val_103 -103 val_103 103 val_103 -103 val_103 103 val_103 -103 val_103 103 val_103 -105 val_105 105 val_105 -10 val_10 10 val_10 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 100 val_100 +105 val_105 105 val_105 +10 val_10 10 val_10 +103 val_103 103 val_103 +103 val_103 103 val_103 +103 val_103 103 val_103 +103 val_103 103 val_103 104 val_104 104 val_104 104 val_104 104 val_104 104 val_104 104 val_104 diff --git a/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out b/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out index 4475c6e5be..d00cdafdca 100644 --- a/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out +++ b/ql/src/test/results/clientpositive/spark/reduce_deduplicate.q.out @@ -56,6 +56,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -78,6 +79,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -119,6 +121,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -152,6 +155,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -334,6 +338,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns aid,bid,t,ctime,etime,l,et columns.comments @@ -365,6 +370,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns aid,bid,t,ctime,etime,l,et columns.comments diff --git a/ql/src/test/results/clientpositive/spark/sample1.q.out b/ql/src/test/results/clientpositive/spark/sample1.q.out index 26d6148ccb..9ac4e9d755 100644 --- a/ql/src/test/results/clientpositive/spark/sample1.q.out +++ b/ql/src/test/results/clientpositive/spark/sample1.q.out @@ -53,6 +53,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments @@ -108,6 +109,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -137,6 +139,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value,dt,hr columns.comments diff --git a/ql/src/test/results/clientpositive/spark/sample2.q.out b/ql/src/test/results/clientpositive/spark/sample2.q.out index dff572ea09..73e940f7e4 100644 --- a/ql/src/test/results/clientpositive/spark/sample2.q.out +++ b/ql/src/test/results/clientpositive/spark/sample2.q.out @@ -52,6 +52,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -83,6 +84,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -105,6 +107,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -136,6 +139,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -180,205 +184,188 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 +3 val_4 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 +17 val_17 +19 val_19 +19 val_20 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 +21 val_22 +21 val_22 +21 val_22 +21 val_22 +27 val_27 +29 val_30 +29 val_30 30 val_30 30 val_31 -32 val_33 -34 val_34 +31 val_32 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 +41 val_41 +43 val_43 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 +51 val_51 +51 val_51 +51 val_52 54 val_54 -56 val_57 +57 val_57 58 val_58 58 val_58 58 val_59 58 val_59 +59 val_60 60 val_61 -62 val_63 -62 val_63 +61 val_62 64 val_64 -66 val_66 +65 val_65 +65 val_66 +65 val_66 +67 val_67 +67 val_67 68 val_69 +69 val_69 +69 val_70 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 +77 val_77 +77 val_78 +77 val_78 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 +83 val_83 +83 val_83 84 val_84 84 val_84 +85 val_85 +85 val_86 86 val_86 86 val_87 +89 val_90 +89 val_90 +89 val_90 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 +91 val_92 +93 val_94 +93 val_94 +93 val_94 96 val_96 +97 val_97 +97 val_97 +97 val_98 +97 val_98 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +99 val_100 +101 val_102 +105 val_105 +105 val_106 +105 val_106 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 +113 val_113 +113 val_113 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 +117 val_118 +117 val_118 +119 val_119 +119 val_119 +119 val_119 +119 val_120 +119 val_120 +119 val_120 +121 val_122 +121 val_122 +123 val_124 +123 val_124 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 +133 val_133 +133 val_134 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 +135 val_136 +135 val_136 +135 val_136 +137 val_137 +137 val_137 +137 val_138 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +149 val_149 +149 val_149 +149 val_150 +153 val_153 +153 val_154 +153 val_154 156 val_156 156 val_157 156 val_157 +157 val_157 +157 val_158 +157 val_158 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 +163 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 +165 val_165 +165 val_165 +165 val_166 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +177 val_177 +177 val_178 +177 val_178 178 val_178 178 val_179 178 val_179 -180 val_180 +181 val_181 182 val_183 184 val_185 -186 val_186 +185 val_186 +187 val_187 +187 val_187 +187 val_187 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 +191 val_191 +191 val_191 +191 val_192 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +197 val_198 +199 val_199 +199 val_199 +199 val_199 +199 val_200 +201 val_201 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -387,95 +374,80 @@ POSTHOOK: Input: default@dest1 208 val_208 212 val_213 214 val_214 +215 val_216 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 +221 val_221 +221 val_221 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 +229 val_229 +229 val_229 +231 val_232 +233 val_233 +233 val_233 +237 val_237 +237 val_237 238 val_238 238 val_238 238 val_239 +239 val_239 +239 val_239 +239 val_240 +239 val_240 240 val_241 -242 val_242 -242 val_242 -242 val_243 +243 val_244 +243 val_244 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 +249 val_249 +249 val_250 +249 val_250 252 val_252 252 val_253 254 val_255 +255 val_255 +255 val_255 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 +261 val_262 266 val_266 -268 val_269 +271 val_272 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 +287 val_287 +287 val_288 +287 val_288 +289 val_289 +289 val_290 +291 val_291 +291 val_292 +291 val_292 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 +307 val_307 +307 val_307 308 val_308 308 val_309 308 val_309 @@ -483,63 +455,83 @@ POSTHOOK: Input: default@dest1 310 val_311 310 val_311 310 val_311 -314 val_315 +311 val_311 +311 val_311 +311 val_311 +313 val_314 +315 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 +317 val_317 +317 val_317 +317 val_318 324 val_325 +325 val_325 +325 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 +327 val_327 +327 val_327 +327 val_327 332 val_332 334 val_335 336 val_336 336 val_337 +337 val_338 338 val_338 338 val_339 -340 val_341 +339 val_339 +341 val_341 +341 val_342 +341 val_342 +341 val_342 342 val_342 342 val_342 342 val_343 +343 val_344 344 val_344 344 val_344 344 val_345 +347 val_348 +347 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_349 +349 val_350 +349 val_350 +349 val_350 +349 val_350 +351 val_351 +351 val_352 +351 val_352 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 +353 val_353 +353 val_353 +353 val_354 +355 val_356 +355 val_356 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 +365 val_365 368 val_368 -374 val_374 -374 val_375 -376 val_377 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +371 val_372 +371 val_372 +371 val_372 +371 val_372 +377 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -550,18 +542,24 @@ POSTHOOK: Input: default@dest1 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 +391 val_392 +391 val_392 392 val_392 392 val_393 392 val_393 +393 val_393 +393 val_394 +393 val_394 394 val_394 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 +397 val_397 +397 val_397 +399 val_399 +399 val_399 +399 val_400 +399 val_400 402 val_402 402 val_403 402 val_403 @@ -571,25 +569,36 @@ POSTHOOK: Input: default@dest1 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 +407 val_407 +407 val_408 +407 val_408 +407 val_408 408 val_409 408 val_409 +409 val_409 +409 val_409 +409 val_409 +409 val_410 +409 val_410 410 val_411 -412 val_413 -412 val_413 +411 val_411 +411 val_412 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +421 val_421 +421 val_422 +421 val_422 +423 val_424 +425 val_426 426 val_427 +427 val_427 +427 val_428 +427 val_428 428 val_429 430 val_430 430 val_430 @@ -597,25 +606,24 @@ POSTHOOK: Input: default@dest1 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 +435 val_435 +435 val_436 +437 val_437 +437 val_438 440 val_441 440 val_441 -442 val_443 +443 val_443 +443 val_444 +443 val_444 +443 val_444 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 +449 val_449 452 val_452 +453 val_453 +453 val_454 454 val_454 454 val_454 454 val_454 @@ -623,23 +631,19 @@ POSTHOOK: Input: default@dest1 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 +459 val_459 +459 val_459 +459 val_460 +463 val_463 +463 val_463 +463 val_464 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 +467 val_467 +467 val_468 472 val_472 +473 val_474 474 val_475 474 val_475 476 val_477 @@ -648,6 +652,7 @@ POSTHOOK: Input: default@dest1 478 val_478 478 val_479 478 val_479 +479 val_479 480 val_480 480 val_480 480 val_480 @@ -655,21 +660,23 @@ POSTHOOK: Input: default@dest1 480 val_481 482 val_482 482 val_483 +483 val_483 484 val_484 484 val_485 -486 val_487 +485 val_485 +485 val_486 +485 val_486 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 +491 val_491 +491 val_492 +491 val_492 +495 val_495 +495 val_496 +497 val_497 +497 val_498 +497 val_498 498 val_498 498 val_498 498 val_498 diff --git a/ql/src/test/results/clientpositive/spark/sample3.q.out b/ql/src/test/results/clientpositive/spark/sample3.q.out index 667d5c35d1..e979f1ead4 100644 --- a/ql/src/test/results/clientpositive/spark/sample3.q.out +++ b/ql/src/test/results/clientpositive/spark/sample3.q.out @@ -33,192 +33,221 @@ FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 on key) s SORT BY key POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 -0 -0 -0 -0 -10 -10 -100 -100 -100 -100 -105 -105 -105 -110 -120 -120 -120 +1 +103 +103 +122 +122 +122 125 125 125 -135 -135 -135 -140 -145 -15 -15 -15 -15 -150 +133 +133 +147 +147 155 -160 -160 +16 +16 +161 +161 +161 +161 +162 +162 +163 165 165 165 -170 -170 -175 -175 -175 -175 -180 -185 -190 -195 -195 -20 -20 -20 -200 -200 -205 -205 -205 -215 +18 +18 +194 +196 +196 +196 +196 +21 +21 +21 +21 +222 +222 230 230 230 230 230 -235 -235 +237 +237 +238 +238 +238 +24 +24 240 -245 -245 -255 -255 +246 +246 +256 +256 +256 260 260 260 -265 -265 -265 +264 +264 +273 +273 +273 +273 275 275 275 -280 -280 -285 -285 -295 -295 -30 -30 -300 -300 +276 +278 +278 +278 +288 +288 +289 +289 +296 +296 +302 +302 305 305 -310 -310 -310 -310 -315 -325 -325 -330 +311 +311 +311 +32 +323 +323 +33 +33 +332 335 335 335 -340 -345 +344 +344 +344 35 35 35 35 35 35 +352 +352 355 355 -360 -360 -365 -375 -375 -375 -375 -375 -375 -385 -385 -390 -390 -390 -395 -395 -395 -395 -40 -40 -400 +362 +366 +369 +369 +369 +369 +37 +37 +373 +373 +379 +379 +391 +391 +393 +393 +393 +397 +397 405 +407 +407 +407 +407 +41 410 -415 +411 +411 +416 425 -430 -430 -430 -430 +43 +432 +432 435 435 -440 -440 +436 +436 +439 +439 +439 +439 +441 450 450 +453 +453 +454 +454 +454 +454 +454 455 455 455 460 +466 +466 +466 +469 +469 +469 +469 +469 +469 470 470 -475 -475 -480 -480 -480 -480 -480 -485 -485 -485 -490 -490 -495 -495 -5 -5 -5 -5 -50 -60 -65 -65 -65 -70 -70 -70 -70 -75 -80 -80 -85 -85 -90 -90 -90 -95 -95 +481 +481 +484 +484 +492 +492 +492 +492 +493 +494 +494 +494 +498 +498 +498 +51 +51 +51 +52 +52 +52 +52 +53 +53 +54 +61 +68 +69 +69 +72 +72 +8 +8 +87 +87 +87 +89 +89 +89 +91 +93 +93 +93 +96 diff --git a/ql/src/test/results/clientpositive/spark/sample4.q.out b/ql/src/test/results/clientpositive/spark/sample4.q.out index 8c4640f01d..90ca433060 100644 --- a/ql/src/test/results/clientpositive/spark/sample4.q.out +++ b/ql/src/test/results/clientpositive/spark/sample4.q.out @@ -52,6 +52,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -83,6 +84,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -105,6 +107,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -136,6 +139,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -180,205 +184,188 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 +3 val_4 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 +17 val_17 +19 val_19 +19 val_20 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 +21 val_22 +21 val_22 +21 val_22 +21 val_22 +27 val_27 +29 val_30 +29 val_30 30 val_30 30 val_31 -32 val_33 -34 val_34 +31 val_32 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 +41 val_41 +43 val_43 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 +51 val_51 +51 val_51 +51 val_52 54 val_54 -56 val_57 +57 val_57 58 val_58 58 val_58 58 val_59 58 val_59 +59 val_60 60 val_61 -62 val_63 -62 val_63 +61 val_62 64 val_64 -66 val_66 +65 val_65 +65 val_66 +65 val_66 +67 val_67 +67 val_67 68 val_69 +69 val_69 +69 val_70 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 +77 val_77 +77 val_78 +77 val_78 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 +83 val_83 +83 val_83 84 val_84 84 val_84 +85 val_85 +85 val_86 86 val_86 86 val_87 +89 val_90 +89 val_90 +89 val_90 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 +91 val_92 +93 val_94 +93 val_94 +93 val_94 96 val_96 +97 val_97 +97 val_97 +97 val_98 +97 val_98 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +99 val_100 +101 val_102 +105 val_105 +105 val_106 +105 val_106 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 +113 val_113 +113 val_113 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 +117 val_118 +117 val_118 +119 val_119 +119 val_119 +119 val_119 +119 val_120 +119 val_120 +119 val_120 +121 val_122 +121 val_122 +123 val_124 +123 val_124 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 +133 val_133 +133 val_134 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 +135 val_136 +135 val_136 +135 val_136 +137 val_137 +137 val_137 +137 val_138 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +149 val_149 +149 val_149 +149 val_150 +153 val_153 +153 val_154 +153 val_154 156 val_156 156 val_157 156 val_157 +157 val_157 +157 val_158 +157 val_158 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 +163 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 +165 val_165 +165 val_165 +165 val_166 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +177 val_177 +177 val_178 +177 val_178 178 val_178 178 val_179 178 val_179 -180 val_180 +181 val_181 182 val_183 184 val_185 -186 val_186 +185 val_186 +187 val_187 +187 val_187 +187 val_187 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 +191 val_191 +191 val_191 +191 val_192 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +197 val_198 +199 val_199 +199 val_199 +199 val_199 +199 val_200 +201 val_201 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -387,95 +374,80 @@ POSTHOOK: Input: default@dest1 208 val_208 212 val_213 214 val_214 +215 val_216 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 +221 val_221 +221 val_221 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 +229 val_229 +229 val_229 +231 val_232 +233 val_233 +233 val_233 +237 val_237 +237 val_237 238 val_238 238 val_238 238 val_239 +239 val_239 +239 val_239 +239 val_240 +239 val_240 240 val_241 -242 val_242 -242 val_242 -242 val_243 +243 val_244 +243 val_244 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 +249 val_249 +249 val_250 +249 val_250 252 val_252 252 val_253 254 val_255 +255 val_255 +255 val_255 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 +261 val_262 266 val_266 -268 val_269 +271 val_272 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 +287 val_287 +287 val_288 +287 val_288 +289 val_289 +289 val_290 +291 val_291 +291 val_292 +291 val_292 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 +307 val_307 +307 val_307 308 val_308 308 val_309 308 val_309 @@ -483,63 +455,83 @@ POSTHOOK: Input: default@dest1 310 val_311 310 val_311 310 val_311 -314 val_315 +311 val_311 +311 val_311 +311 val_311 +313 val_314 +315 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 +317 val_317 +317 val_317 +317 val_318 324 val_325 +325 val_325 +325 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 +327 val_327 +327 val_327 +327 val_327 332 val_332 334 val_335 336 val_336 336 val_337 +337 val_338 338 val_338 338 val_339 -340 val_341 +339 val_339 +341 val_341 +341 val_342 +341 val_342 +341 val_342 342 val_342 342 val_342 342 val_343 +343 val_344 344 val_344 344 val_344 344 val_345 +347 val_348 +347 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_349 +349 val_350 +349 val_350 +349 val_350 +349 val_350 +351 val_351 +351 val_352 +351 val_352 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 +353 val_353 +353 val_353 +353 val_354 +355 val_356 +355 val_356 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 +365 val_365 368 val_368 -374 val_374 -374 val_375 -376 val_377 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +371 val_372 +371 val_372 +371 val_372 +371 val_372 +377 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -550,18 +542,24 @@ POSTHOOK: Input: default@dest1 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 +391 val_392 +391 val_392 392 val_392 392 val_393 392 val_393 +393 val_393 +393 val_394 +393 val_394 394 val_394 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 +397 val_397 +397 val_397 +399 val_399 +399 val_399 +399 val_400 +399 val_400 402 val_402 402 val_403 402 val_403 @@ -571,25 +569,36 @@ POSTHOOK: Input: default@dest1 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 +407 val_407 +407 val_408 +407 val_408 +407 val_408 408 val_409 408 val_409 +409 val_409 +409 val_409 +409 val_409 +409 val_410 +409 val_410 410 val_411 -412 val_413 -412 val_413 +411 val_411 +411 val_412 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +421 val_421 +421 val_422 +421 val_422 +423 val_424 +425 val_426 426 val_427 +427 val_427 +427 val_428 +427 val_428 428 val_429 430 val_430 430 val_430 @@ -597,25 +606,24 @@ POSTHOOK: Input: default@dest1 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 +435 val_435 +435 val_436 +437 val_437 +437 val_438 440 val_441 440 val_441 -442 val_443 +443 val_443 +443 val_444 +443 val_444 +443 val_444 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 +449 val_449 452 val_452 +453 val_453 +453 val_454 454 val_454 454 val_454 454 val_454 @@ -623,23 +631,19 @@ POSTHOOK: Input: default@dest1 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 +459 val_459 +459 val_459 +459 val_460 +463 val_463 +463 val_463 +463 val_464 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 +467 val_467 +467 val_468 472 val_472 +473 val_474 474 val_475 474 val_475 476 val_477 @@ -648,6 +652,7 @@ POSTHOOK: Input: default@dest1 478 val_478 478 val_479 478 val_479 +479 val_479 480 val_480 480 val_480 480 val_480 @@ -655,21 +660,23 @@ POSTHOOK: Input: default@dest1 480 val_481 482 val_482 482 val_483 +483 val_483 484 val_484 484 val_485 -486 val_487 +485 val_485 +485 val_486 +485 val_486 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 +491 val_491 +491 val_492 +491 val_492 +495 val_495 +495 val_496 +497 val_497 +497 val_498 +497 val_498 498 val_498 498 val_498 498 val_498 diff --git a/ql/src/test/results/clientpositive/spark/sample5.q.out b/ql/src/test/results/clientpositive/spark/sample5.q.out index 4af424cc4d..6585abedfd 100644 --- a/ql/src/test/results/clientpositive/spark/sample5.q.out +++ b/ql/src/test/results/clientpositive/spark/sample5.q.out @@ -53,6 +53,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -84,6 +85,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -106,6 +108,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -137,6 +140,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -181,192 +185,221 @@ POSTHOOK: query: SELECT dest1.* FROM dest1 SORT BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 -10 val_10 -10 val_11 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -105 val_105 -105 val_106 -105 val_106 -110 val_111 -120 val_120 -120 val_120 -120 val_121 +1 val_2 +103 val_103 +103 val_103 +122 val_123 +122 val_123 +122 val_123 125 val_125 125 val_125 125 val_126 -135 val_136 -135 val_136 -135 val_136 -140 val_141 -145 val_145 -15 val_15 -15 val_15 -15 val_16 -15 val_16 -150 val_150 +133 val_133 +133 val_134 +147 val_148 +147 val_148 155 val_155 -160 val_160 -160 val_161 +16 val_17 +16 val_17 +161 val_162 +161 val_162 +161 val_162 +161 val_162 +162 val_162 +162 val_163 +163 val_163 165 val_165 165 val_165 165 val_166 -170 val_170 -170 val_171 -175 val_175 -175 val_175 -175 val_176 -175 val_176 -180 val_180 -185 val_186 -190 val_190 -195 val_195 -195 val_195 -20 val_20 -20 val_21 -20 val_21 -200 val_200 -200 val_200 -205 val_205 -205 val_205 -205 val_206 -215 val_216 +18 val_18 +18 val_18 +194 val_194 +196 val_196 +196 val_197 +196 val_197 +196 val_197 +21 val_22 +21 val_22 +21 val_22 +21 val_22 +222 val_222 +222 val_223 230 val_230 230 val_230 230 val_230 230 val_230 230 val_230 -235 val_235 -235 val_236 +237 val_237 +237 val_237 +238 val_238 +238 val_238 +238 val_239 +24 val_24 +24 val_24 240 val_241 -245 val_246 -245 val_246 -255 val_255 -255 val_255 +246 val_247 +246 val_247 +256 val_256 +256 val_256 +256 val_257 260 val_260 260 val_261 260 val_261 -265 val_265 -265 val_265 -265 val_266 +264 val_265 +264 val_265 +273 val_273 +273 val_273 +273 val_273 +273 val_274 275 val_275 275 val_276 275 val_276 -280 val_280 -280 val_280 -285 val_285 -285 val_286 -295 val_296 -295 val_296 -30 val_30 -30 val_31 -300 val_301 -300 val_301 +276 val_277 +278 val_278 +278 val_278 +278 val_279 +288 val_288 +288 val_288 +289 val_289 +289 val_290 +296 val_296 +296 val_297 +302 val_302 +302 val_303 305 val_305 305 val_306 -310 val_310 -310 val_311 -310 val_311 -310 val_311 -315 val_315 -325 val_325 -325 val_325 -330 val_331 +311 val_311 +311 val_311 +311 val_311 +32 val_33 +323 val_323 +323 val_324 +33 val_33 +33 val_34 +332 val_332 335 val_335 335 val_336 335 val_336 -340 val_341 -345 val_345 +344 val_344 +344 val_344 +344 val_345 35 val_35 35 val_35 35 val_35 35 val_36 35 val_36 35 val_36 +352 val_353 +352 val_353 355 val_356 355 val_356 -360 val_360 -360 val_361 -365 val_365 -375 val_375 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -385 val_386 -385 val_386 -390 val_391 -390 val_391 -390 val_391 -395 val_395 -395 val_395 -395 val_396 -395 val_396 -40 val_41 -40 val_41 -400 val_400 +362 val_362 +366 val_366 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +37 val_37 +37 val_37 +373 val_373 +373 val_374 +379 val_379 +379 val_380 +391 val_392 +391 val_392 +393 val_393 +393 val_394 +393 val_394 +397 val_397 +397 val_397 405 val_406 +407 val_407 +407 val_408 +407 val_408 +407 val_408 +41 val_41 410 val_411 -415 val_416 +411 val_411 +411 val_412 +416 val_417 425 val_426 -430 val_430 -430 val_430 -430 val_430 -430 val_431 +43 val_43 +432 val_432 +432 val_433 435 val_435 435 val_436 -440 val_441 -440 val_441 +436 val_436 +436 val_437 +439 val_439 +439 val_439 +439 val_440 +439 val_440 +441 val_442 450 val_451 450 val_451 +453 val_453 +453 val_454 +454 val_454 +454 val_454 +454 val_454 +454 val_455 +454 val_455 455 val_455 455 val_456 455 val_456 460 val_460 +466 val_466 +466 val_466 +466 val_466 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_470 470 val_470 470 val_471 -475 val_475 -475 val_476 -480 val_480 -480 val_480 -480 val_480 -480 val_481 -480 val_481 -485 val_485 -485 val_486 -485 val_486 -490 val_490 -490 val_491 -495 val_495 -495 val_496 -5 val_5 -5 val_5 -5 val_5 -5 val_6 -50 val_51 -60 val_61 -65 val_65 -65 val_66 -65 val_66 -70 val_70 -70 val_70 -70 val_70 -70 val_71 -75 val_76 -80 val_80 -80 val_81 -85 val_85 -85 val_86 -90 val_90 -90 val_90 -90 val_90 -95 val_95 -95 val_95 +481 val_481 +481 val_482 +484 val_484 +484 val_485 +492 val_492 +492 val_492 +492 val_493 +492 val_493 +493 val_493 +494 val_494 +494 val_495 +494 val_495 +498 val_498 +498 val_498 +498 val_498 +51 val_51 +51 val_51 +51 val_52 +52 val_53 +52 val_53 +52 val_53 +52 val_53 +53 val_53 +53 val_54 +54 val_54 +61 val_62 +68 val_69 +69 val_69 +69 val_70 +72 val_72 +72 val_72 +8 val_8 +8 val_9 +87 val_87 +87 val_88 +87 val_88 +89 val_90 +89 val_90 +89 val_90 +91 val_92 +93 val_94 +93 val_94 +93 val_94 +96 val_96 diff --git a/ql/src/test/results/clientpositive/spark/sample6.q.out b/ql/src/test/results/clientpositive/spark/sample6.q.out index 1b49bd32df..95ff3ce484 100644 --- a/ql/src/test/results/clientpositive/spark/sample6.q.out +++ b/ql/src/test/results/clientpositive/spark/sample6.q.out @@ -52,6 +52,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -83,6 +84,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -105,6 +107,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -136,6 +139,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -180,172 +184,175 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 -4 val_4 -4 val_5 -8 val_8 -8 val_9 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -20 val_20 -20 val_21 -20 val_21 -24 val_24 -24 val_24 -28 val_28 -32 val_33 +2 val_2 +2 val_3 +6 val_7 +6 val_7 +10 val_10 +10 val_11 +17 val_17 +21 val_22 +21 val_22 +21 val_22 +21 val_22 +27 val_27 +30 val_30 +30 val_31 +31 val_32 40 val_41 40 val_41 -44 val_44 -48 val_49 -48 val_49 -52 val_53 -52 val_53 -52 val_53 -52 val_53 -56 val_57 -60 val_61 +51 val_51 +51 val_51 +51 val_52 +57 val_57 +58 val_58 +58 val_58 +58 val_59 +58 val_59 64 val_64 -68 val_69 -72 val_72 -72 val_72 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 +65 val_65 +65 val_66 +65 val_66 +70 val_70 +70 val_70 +70 val_70 +70 val_71 80 val_80 80 val_81 -84 val_84 -84 val_84 -92 val_92 -96 val_96 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +83 val_83 +83 val_83 +86 val_86 +86 val_87 +90 val_90 +90 val_90 +90 val_90 +91 val_92 +98 val_98 +98 val_98 +105 val_105 +105 val_106 +105 val_106 +110 val_111 +113 val_113 +113 val_113 116 val_116 116 val_117 -120 val_120 -120 val_120 -120 val_121 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 -132 val_133 -132 val_133 -136 val_136 -136 val_137 -140 val_141 -144 val_145 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +117 val_118 +117 val_118 +119 val_119 +119 val_119 +119 val_119 +119 val_120 +119 val_120 +119 val_120 +121 val_122 +121 val_122 +123 val_124 +123 val_124 +126 val_126 +126 val_127 +126 val_127 +134 val_134 +134 val_134 +134 val_135 +137 val_137 +137 val_137 +137 val_138 +153 val_153 +153 val_154 +153 val_154 156 val_156 156 val_157 156 val_157 -160 val_160 -160 val_161 -164 val_164 -164 val_164 -164 val_165 -164 val_165 -168 val_168 -168 val_169 -172 val_172 -172 val_172 -172 val_173 -176 val_176 -176 val_176 -180 val_180 +157 val_157 +157 val_158 +157 val_158 +158 val_158 +163 val_163 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +177 val_177 +177 val_178 +177 val_178 +178 val_178 +178 val_179 +178 val_179 184 val_185 -192 val_192 -192 val_193 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 -204 val_205 +187 val_187 +187 val_187 +187 val_187 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +197 val_198 +206 val_207 +206 val_207 +206 val_207 208 val_208 208 val_208 208 val_208 -212 val_213 -216 val_216 -216 val_216 -216 val_217 -224 val_224 -224 val_224 -224 val_225 -228 val_228 -228 val_229 -240 val_241 +221 val_221 +221 val_221 +229 val_229 +229 val_229 +237 val_237 +237 val_237 +243 val_244 +243 val_244 244 val_244 244 val_245 244 val_245 244 val_245 -248 val_248 -248 val_249 +249 val_249 +249 val_250 +249 val_250 252 val_252 252 val_253 +254 val_255 256 val_256 256 val_256 256 val_257 -260 val_260 -260 val_261 -260 val_261 -264 val_265 -264 val_265 -268 val_269 +266 val_266 +271 val_272 272 val_272 272 val_272 272 val_273 -276 val_277 -280 val_280 -280 val_280 -284 val_284 -284 val_285 -284 val_285 -288 val_288 -288 val_288 +286 val_286 +286 val_287 +289 val_289 +289 val_290 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -300 val_301 -300 val_301 304 val_305 +307 val_307 +307 val_307 308 val_308 308 val_309 308 val_309 +315 val_315 316 val_316 316 val_316 316 val_316 -324 val_325 -328 val_329 -328 val_329 -332 val_332 +317 val_317 +317 val_317 +317 val_318 +326 val_327 +327 val_327 +327 val_327 +327 val_327 +334 val_335 336 val_336 336 val_337 -340 val_341 +338 val_338 +338 val_339 +339 val_339 +342 val_342 +342 val_342 +342 val_343 344 val_344 344 val_344 344 val_345 @@ -355,80 +362,97 @@ POSTHOOK: Input: default@dest1 348 val_348 348 val_348 348 val_349 +349 val_350 +349 val_350 +349 val_350 +349 val_350 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 +353 val_353 +353 val_353 +353 val_354 +355 val_356 +355 val_356 360 val_360 360 val_361 +362 val_362 364 val_364 364 val_365 -368 val_368 -376 val_377 -384 val_384 -384 val_384 -384 val_384 -384 val_385 -384 val_385 -384 val_385 -388 val_389 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +371 val_372 +371 val_372 +371 val_372 +371 val_372 +377 val_377 +378 val_378 +378 val_379 +391 val_392 +391 val_392 392 val_392 392 val_393 392 val_393 396 val_396 396 val_396 396 val_396 -400 val_400 +399 val_399 +399 val_399 +399 val_400 +399 val_400 +402 val_402 +402 val_403 +402 val_403 +402 val_403 404 val_404 404 val_404 404 val_405 404 val_405 404 val_405 +407 val_407 +407 val_408 +407 val_408 +407 val_408 408 val_409 408 val_409 -412 val_413 -412 val_413 -416 val_417 -424 val_424 -424 val_424 -424 val_425 -428 val_429 -432 val_432 -432 val_433 -436 val_436 -436 val_437 +410 val_411 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +423 val_424 +426 val_427 +427 val_427 +427 val_428 +427 val_428 440 val_441 440 val_441 -444 val_444 -448 val_448 -448 val_449 +449 val_449 452 val_452 -460 val_460 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 +458 val_458 +458 val_458 +463 val_463 +463 val_463 +463 val_464 +466 val_466 +466 val_466 +466 val_466 472 val_472 476 val_477 476 val_477 -480 val_480 -480 val_480 -480 val_480 -480 val_481 -480 val_481 +478 val_478 +478 val_478 +478 val_479 +478 val_479 +479 val_479 +482 val_482 +482 val_483 484 val_484 484 val_485 -488 val_489 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -496 val_496 -496 val_497 +497 val_497 +497 val_498 +497 val_498 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 4 OUT OF 4 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -480,6 +504,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -502,6 +527,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -567,147 +593,186 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -3 val_4 -11 val_11 -11 val_12 -11 val_12 -11 val_12 +5 val_5 +5 val_5 +5 val_5 +5 val_6 +12 val_12 +12 val_12 +12 val_13 15 val_15 15 val_15 15 val_16 15 val_16 -19 val_19 -19 val_20 +16 val_17 +16 val_17 +22 val_23 23 val_24 -27 val_27 -31 val_32 +24 val_24 +24 val_24 +28 val_28 +33 val_33 +33 val_34 35 val_35 35 val_35 35 val_35 35 val_36 35 val_36 35 val_36 -43 val_43 +42 val_42 +42 val_42 +42 val_43 +42 val_43 +42 val_43 +44 val_44 47 val_47 47 val_48 -51 val_51 -51 val_51 -51 val_52 -59 val_60 +49 val_50 +49 val_50 +50 val_51 +52 val_53 +52 val_53 +52 val_53 +52 val_53 +53 val_53 +53 val_54 +56 val_57 63 val_64 -67 val_67 -67 val_67 -71 val_72 75 val_76 -83 val_83 -83 val_83 +76 val_76 +76 val_76 +76 val_77 +76 val_77 +76 val_77 87 val_87 87 val_88 87 val_88 -91 val_92 +94 val_95 95 val_95 95 val_95 -99 val_100 -103 val_103 -103 val_103 +104 val_104 +104 val_104 +104 val_105 +104 val_105 +104 val_105 111 val_111 -119 val_119 -119 val_119 -119 val_119 -119 val_120 -119 val_120 -119 val_120 -123 val_124 -123 val_124 -131 val_131 -135 val_136 -135 val_136 -135 val_136 -143 val_143 -143 val_144 +114 val_114 +114 val_115 +114 val_115 +114 val_115 +125 val_125 +125 val_125 +125 val_126 +129 val_129 +129 val_129 +129 val_130 +129 val_130 +138 val_138 +138 val_138 +138 val_138 +138 val_138 +138 val_139 +138 val_139 +145 val_145 147 val_148 147 val_148 151 val_152 151 val_152 -155 val_155 -163 val_163 +161 val_162 +161 val_162 +161 val_162 +161 val_162 +166 val_166 167 val_167 167 val_167 167 val_167 167 val_168 -175 val_175 -175 val_175 -175 val_176 -175 val_176 -179 val_179 -179 val_179 -179 val_180 -183 val_183 -183 val_184 -187 val_187 -187 val_187 -187 val_187 -191 val_191 -191 val_191 -191 val_192 -195 val_195 -195 val_195 -199 val_199 -199 val_199 -199 val_199 -199 val_200 +168 val_168 +168 val_169 +170 val_170 +170 val_171 +172 val_172 +172 val_172 +172 val_173 +180 val_180 +192 val_192 +192 val_193 +193 val_193 +193 val_193 +193 val_193 +196 val_196 +196 val_197 +196 val_197 +196 val_197 203 val_203 203 val_203 207 val_207 207 val_207 -215 val_216 +209 val_209 +209 val_209 +209 val_210 +209 val_210 +213 val_213 +213 val_213 +213 val_214 219 val_219 219 val_219 -223 val_223 -223 val_223 +224 val_224 +224 val_224 +224 val_225 227 val_228 -231 val_232 -235 val_235 -235 val_236 -239 val_239 -239 val_239 -239 val_240 -239 val_240 -243 val_244 -243 val_244 -247 val_247 -255 val_255 -255 val_255 +241 val_241 +241 val_242 +241 val_242 +241 val_242 +241 val_242 +242 val_242 +242 val_242 +242 val_243 +245 val_246 +245 val_246 +257 val_257 +257 val_258 +257 val_258 +258 val_258 +258 val_259 259 val_260 259 val_260 263 val_263 +265 val_265 +265 val_265 +265 val_266 267 val_268 -271 val_272 -275 val_275 -275 val_276 -275 val_276 +268 val_269 +273 val_273 +273 val_273 +273 val_273 +273 val_274 +274 val_274 +274 val_275 +278 val_278 +278 val_278 +278 val_279 +281 val_281 +281 val_281 +281 val_282 +281 val_282 +281 val_282 283 val_283 -287 val_287 -287 val_288 -287 val_288 -291 val_291 -291 val_292 -291 val_292 -295 val_296 -295 val_296 +293 val_294 +293 val_294 +300 val_301 +300 val_301 303 val_304 303 val_304 -307 val_307 -307 val_307 -311 val_311 -311 val_311 -311 val_311 -315 val_315 -323 val_323 -323 val_324 -327 val_327 -327 val_327 -327 val_327 +318 val_318 +318 val_318 +318 val_318 +318 val_319 +322 val_322 +322 val_322 +322 val_323 +330 val_331 331 val_331 331 val_331 331 val_332 @@ -715,97 +780,91 @@ POSTHOOK: Input: default@srcbucket 335 val_335 335 val_336 335 val_336 -339 val_339 -343 val_344 -347 val_348 -347 val_348 -351 val_351 -351 val_352 -351 val_352 -355 val_356 -355 val_356 -363 val_364 -363 val_364 -363 val_364 +356 val_356 +356 val_357 +356 val_357 +358 val_359 367 val_367 367 val_367 367 val_368 367 val_368 -371 val_372 -371 val_372 -371 val_372 -371 val_372 -375 val_375 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -375 val_376 +373 val_373 +373 val_374 379 val_379 379 val_380 -391 val_392 -391 val_392 +381 val_382 +382 val_382 +382 val_382 +382 val_383 +382 val_383 +385 val_386 +385 val_386 +390 val_391 +390 val_391 +390 val_391 395 val_395 395 val_395 395 val_396 395 val_396 -399 val_399 -399 val_399 -399 val_400 -399 val_400 +401 val_401 +401 val_401 +401 val_401 +401 val_401 +401 val_401 +401 val_402 403 val_403 403 val_403 403 val_403 -407 val_407 -407 val_408 -407 val_408 -407 val_408 -411 val_411 -411 val_412 +405 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_407 +412 val_413 +412 val_413 415 val_416 -419 val_419 -423 val_424 -427 val_427 -427 val_428 -427 val_428 +416 val_417 +418 val_418 +429 val_429 +429 val_429 +429 val_430 +429 val_430 431 val_431 431 val_431 431 val_431 431 val_432 -435 val_435 -435 val_436 -439 val_439 -439 val_439 -439 val_440 -439 val_440 -443 val_443 -443 val_444 -443 val_444 -443 val_444 +436 val_436 +436 val_437 +441 val_442 447 val_448 -451 val_452 -455 val_455 -455 val_456 -455 val_456 -459 val_459 -459 val_459 -459 val_460 -463 val_463 -463 val_463 -463 val_464 -467 val_467 -467 val_468 +448 val_448 +448 val_449 +468 val_468 +468 val_468 +468 val_468 +468 val_468 +468 val_469 +468 val_469 +468 val_469 +470 val_470 +470 val_471 475 val_475 475 val_476 -479 val_479 -483 val_483 -487 val_487 -487 val_488 -491 val_491 -491 val_492 -491 val_492 -495 val_495 -495 val_496 +481 val_481 +481 val_482 +489 val_489 +489 val_489 +489 val_489 +489 val_489 +489 val_490 +492 val_492 +492 val_492 +492 val_493 +492 val_493 +494 val_494 +494 val_495 +494 val_495 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 2 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -857,6 +916,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -879,6 +939,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -944,205 +1005,188 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 +3 val_4 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 +17 val_17 +19 val_19 +19 val_20 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 +21 val_22 +21 val_22 +21 val_22 +21 val_22 +27 val_27 +29 val_30 +29 val_30 30 val_30 30 val_31 -32 val_33 -34 val_34 +31 val_32 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 +41 val_41 +43 val_43 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 +51 val_51 +51 val_51 +51 val_52 54 val_54 -56 val_57 +57 val_57 58 val_58 58 val_58 58 val_59 58 val_59 +59 val_60 60 val_61 -62 val_63 -62 val_63 +61 val_62 64 val_64 -66 val_66 +65 val_65 +65 val_66 +65 val_66 +67 val_67 +67 val_67 68 val_69 +69 val_69 +69 val_70 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 +77 val_77 +77 val_78 +77 val_78 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 +83 val_83 +83 val_83 84 val_84 84 val_84 +85 val_85 +85 val_86 86 val_86 86 val_87 +89 val_90 +89 val_90 +89 val_90 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 +91 val_92 +93 val_94 +93 val_94 +93 val_94 96 val_96 +97 val_97 +97 val_97 +97 val_98 +97 val_98 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +99 val_100 +101 val_102 +105 val_105 +105 val_106 +105 val_106 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 +113 val_113 +113 val_113 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 +117 val_118 +117 val_118 +119 val_119 +119 val_119 +119 val_119 +119 val_120 +119 val_120 +119 val_120 +121 val_122 +121 val_122 +123 val_124 +123 val_124 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 +133 val_133 +133 val_134 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 +135 val_136 +135 val_136 +135 val_136 +137 val_137 +137 val_137 +137 val_138 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +149 val_149 +149 val_149 +149 val_150 +153 val_153 +153 val_154 +153 val_154 156 val_156 156 val_157 156 val_157 +157 val_157 +157 val_158 +157 val_158 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 +163 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 +165 val_165 +165 val_165 +165 val_166 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +177 val_177 +177 val_178 +177 val_178 178 val_178 178 val_179 178 val_179 -180 val_180 +181 val_181 182 val_183 184 val_185 -186 val_186 +185 val_186 +187 val_187 +187 val_187 +187 val_187 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 +191 val_191 +191 val_191 +191 val_192 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +197 val_198 +199 val_199 +199 val_199 +199 val_199 +199 val_200 +201 val_201 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -1151,95 +1195,80 @@ POSTHOOK: Input: default@srcbucket 208 val_208 212 val_213 214 val_214 +215 val_216 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 +221 val_221 +221 val_221 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 +229 val_229 +229 val_229 +231 val_232 +233 val_233 +233 val_233 +237 val_237 +237 val_237 238 val_238 238 val_238 238 val_239 +239 val_239 +239 val_239 +239 val_240 +239 val_240 240 val_241 -242 val_242 -242 val_242 -242 val_243 +243 val_244 +243 val_244 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 +249 val_249 +249 val_250 +249 val_250 252 val_252 252 val_253 254 val_255 +255 val_255 +255 val_255 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 +261 val_262 266 val_266 -268 val_269 +271 val_272 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 +287 val_287 +287 val_288 +287 val_288 +289 val_289 +289 val_290 +291 val_291 +291 val_292 +291 val_292 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 +307 val_307 +307 val_307 308 val_308 308 val_309 308 val_309 @@ -1247,63 +1276,83 @@ POSTHOOK: Input: default@srcbucket 310 val_311 310 val_311 310 val_311 -314 val_315 +311 val_311 +311 val_311 +311 val_311 +313 val_314 +315 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 +317 val_317 +317 val_317 +317 val_318 324 val_325 +325 val_325 +325 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 +327 val_327 +327 val_327 +327 val_327 332 val_332 334 val_335 336 val_336 336 val_337 +337 val_338 338 val_338 338 val_339 -340 val_341 +339 val_339 +341 val_341 +341 val_342 +341 val_342 +341 val_342 342 val_342 342 val_342 342 val_343 +343 val_344 344 val_344 344 val_344 344 val_345 +347 val_348 +347 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_349 +349 val_350 +349 val_350 +349 val_350 +349 val_350 +351 val_351 +351 val_352 +351 val_352 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 +353 val_353 +353 val_353 +353 val_354 +355 val_356 +355 val_356 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 +365 val_365 368 val_368 -374 val_374 -374 val_375 -376 val_377 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +371 val_372 +371 val_372 +371 val_372 +371 val_372 +377 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -1314,18 +1363,24 @@ POSTHOOK: Input: default@srcbucket 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 +391 val_392 +391 val_392 392 val_392 392 val_393 392 val_393 +393 val_393 +393 val_394 +393 val_394 394 val_394 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 +397 val_397 +397 val_397 +399 val_399 +399 val_399 +399 val_400 +399 val_400 402 val_402 402 val_403 402 val_403 @@ -1335,25 +1390,36 @@ POSTHOOK: Input: default@srcbucket 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 +407 val_407 +407 val_408 +407 val_408 +407 val_408 408 val_409 408 val_409 +409 val_409 +409 val_409 +409 val_409 +409 val_410 +409 val_410 410 val_411 -412 val_413 -412 val_413 +411 val_411 +411 val_412 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +421 val_421 +421 val_422 +421 val_422 +423 val_424 +425 val_426 426 val_427 +427 val_427 +427 val_428 +427 val_428 428 val_429 430 val_430 430 val_430 @@ -1361,25 +1427,24 @@ POSTHOOK: Input: default@srcbucket 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 +435 val_435 +435 val_436 +437 val_437 +437 val_438 440 val_441 440 val_441 -442 val_443 +443 val_443 +443 val_444 +443 val_444 +443 val_444 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 +449 val_449 452 val_452 +453 val_453 +453 val_454 454 val_454 454 val_454 454 val_454 @@ -1387,23 +1452,19 @@ POSTHOOK: Input: default@srcbucket 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 +459 val_459 +459 val_459 +459 val_460 +463 val_463 +463 val_463 +463 val_464 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 +467 val_467 +467 val_468 472 val_472 +473 val_474 474 val_475 474 val_475 476 val_477 @@ -1412,6 +1473,7 @@ POSTHOOK: Input: default@srcbucket 478 val_478 478 val_479 478 val_479 +479 val_479 480 val_480 480 val_480 480 val_480 @@ -1419,21 +1481,23 @@ POSTHOOK: Input: default@srcbucket 480 val_481 482 val_482 482 val_483 +483 val_483 484 val_484 484 val_485 -486 val_487 +485 val_485 +485 val_486 +485 val_486 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 +491 val_491 +491 val_492 +491 val_492 +495 val_495 +495 val_496 +497 val_497 +497 val_498 +497 val_498 498 val_498 498 val_498 498 val_498 @@ -1487,6 +1551,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1509,6 +1574,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1574,24 +1640,16 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 -3 val_4 -6 val_7 -6 val_7 9 val_9 -12 val_12 -12 val_12 -12 val_13 -15 val_15 -15 val_15 -15 val_16 -15 val_16 +16 val_17 +16 val_17 18 val_18 18 val_18 +19 val_19 +19 val_20 +20 val_20 +20 val_21 +20 val_21 21 val_22 21 val_22 21 val_22 @@ -1599,265 +1657,302 @@ POSTHOOK: Input: default@srcbucket 24 val_24 24 val_24 27 val_27 +29 val_30 +29 val_30 30 val_30 30 val_31 -33 val_33 -33 val_34 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -48 val_49 -48 val_49 -51 val_51 -51 val_51 -51 val_52 +31 val_32 +32 val_33 +40 val_41 +40 val_41 +41 val_41 +43 val_43 +44 val_44 +47 val_47 +47 val_48 +49 val_50 +49 val_50 +50 val_51 54 val_54 -57 val_57 -60 val_61 -63 val_64 -66 val_66 -69 val_69 -69 val_70 -72 val_72 -72 val_72 +61 val_62 +64 val_64 +67 val_67 +67 val_67 +70 val_70 +70 val_70 +70 val_70 +70 val_71 +71 val_72 +74 val_74 75 val_76 -78 val_78 -78 val_79 -84 val_84 -84 val_84 +76 val_76 +76 val_76 +76 val_77 +76 val_77 +76 val_77 +77 val_77 +77 val_78 +77 val_78 +82 val_82 +82 val_83 +82 val_83 +85 val_85 +85 val_86 87 val_87 87 val_88 87 val_88 +89 val_90 +89 val_90 +89 val_90 90 val_90 90 val_90 90 val_90 -93 val_94 -93 val_94 -93 val_94 -96 val_96 -99 val_100 -102 val_103 +92 val_92 105 val_105 105 val_106 105 val_106 -111 val_111 114 val_114 114 val_115 114 val_115 114 val_115 +116 val_116 +116 val_117 117 val_118 117 val_118 +118 val_118 +118 val_118 +118 val_119 +118 val_119 +118 val_119 120 val_120 120 val_120 120 val_121 -123 val_124 -123 val_124 -126 val_126 -126 val_127 -126 val_127 -129 val_129 -129 val_129 -129 val_130 -129 val_130 -132 val_133 -132 val_133 +122 val_123 +122 val_123 +122 val_123 +134 val_134 +134 val_134 +134 val_135 135 val_136 135 val_136 135 val_136 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 +143 val_143 +143 val_144 144 val_145 -147 val_148 -147 val_148 -150 val_150 -153 val_153 -153 val_154 -153 val_154 -156 val_156 -156 val_157 -156 val_157 -162 val_162 -162 val_163 +145 val_145 +146 val_146 +146 val_146 +149 val_149 +149 val_149 +149 val_150 +157 val_157 +157 val_158 +157 val_158 +158 val_158 +161 val_162 +161 val_162 +161 val_162 +161 val_162 165 val_165 165 val_165 165 val_166 +166 val_166 168 val_168 168 val_169 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -177 val_177 -177 val_178 -177 val_178 +170 val_170 +170 val_171 +179 val_179 +179 val_179 +179 val_180 180 val_180 +181 val_181 183 val_183 183 val_184 -186 val_186 -189 val_189 -189 val_190 192 val_192 192 val_193 +193 val_193 +193 val_193 +193 val_193 195 val_195 195 val_195 -201 val_201 +197 val_197 +197 val_197 +197 val_198 +203 val_203 +203 val_203 204 val_205 -207 val_207 -207 val_207 -213 val_213 -213 val_213 -213 val_214 -216 val_216 -216 val_216 -216 val_217 -219 val_219 -219 val_219 +209 val_209 +209 val_209 +209 val_210 +209 val_210 +214 val_214 222 val_222 222 val_223 +226 val_226 +226 val_227 +226 val_227 +226 val_227 +226 val_227 228 val_228 228 val_229 -231 val_232 -237 val_237 -237 val_237 -240 val_241 -243 val_244 -243 val_244 -246 val_247 -246 val_247 -249 val_249 -249 val_250 -249 val_250 -252 val_252 -252 val_253 -255 val_255 -255 val_255 -258 val_258 -258 val_259 +235 val_235 +235 val_236 +238 val_238 +238 val_238 +238 val_239 +241 val_241 +241 val_242 +241 val_242 +241 val_242 +241 val_242 +242 val_242 +242 val_242 +242 val_243 +245 val_246 +245 val_246 +254 val_255 +256 val_256 +256 val_256 +256 val_257 261 val_262 -264 val_265 -264 val_265 -267 val_268 +262 val_262 +262 val_263 +262 val_263 +266 val_266 +268 val_269 +271 val_272 273 val_273 273 val_273 273 val_273 273 val_274 276 val_277 -282 val_282 -282 val_282 +278 val_278 +278 val_278 +278 val_279 +280 val_280 +280 val_280 +284 val_284 +284 val_285 +284 val_285 285 val_285 285 val_286 +286 val_286 +286 val_287 +287 val_287 +287 val_288 +287 val_288 288 val_288 288 val_288 -291 val_291 -291 val_292 -291 val_292 +292 val_292 +292 val_293 +292 val_293 +293 val_294 +293 val_294 +295 val_296 +295 val_296 +298 val_298 +298 val_298 +298 val_298 300 val_301 300 val_301 -303 val_304 -303 val_304 306 val_306 306 val_307 +308 val_308 +308 val_309 +308 val_309 309 val_309 309 val_309 309 val_310 -315 val_315 +316 val_316 +316 val_316 +316 val_316 318 val_318 318 val_318 318 val_318 318 val_319 -321 val_321 -321 val_321 -324 val_325 -327 val_327 -327 val_327 -327 val_327 -330 val_331 -333 val_333 -333 val_333 -333 val_334 -336 val_336 -336 val_337 -339 val_339 -342 val_342 -342 val_342 -342 val_343 -345 val_345 +323 val_323 +323 val_324 +325 val_325 +325 val_325 +326 val_327 +331 val_331 +331 val_331 +331 val_332 +331 val_332 +332 val_332 +341 val_341 +341 val_342 +341 val_342 +341 val_342 +343 val_344 +344 val_344 +344 val_344 +344 val_345 +347 val_348 +347 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_349 -351 val_351 -351 val_352 -351 val_352 -360 val_360 -360 val_361 -363 val_364 -363 val_364 -363 val_364 +364 val_364 +364 val_365 366 val_366 369 val_369 369 val_369 369 val_369 369 val_370 -375 val_375 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -375 val_376 -378 val_378 -378 val_379 -381 val_382 +373 val_373 +373 val_374 +374 val_374 +374 val_375 +379 val_379 +379 val_380 384 val_384 384 val_384 384 val_384 384 val_385 384 val_385 384 val_385 -390 val_391 -390 val_391 -390 val_391 -393 val_393 -393 val_394 -393 val_394 -396 val_396 -396 val_396 -396 val_396 +391 val_392 +391 val_392 +392 val_392 +392 val_393 +392 val_393 +395 val_395 +395 val_395 +395 val_396 +395 val_396 +397 val_397 +397 val_397 399 val_399 399 val_399 399 val_400 399 val_400 -402 val_402 -402 val_403 -402 val_403 -402 val_403 -405 val_406 -408 val_409 -408 val_409 -411 val_411 -411 val_412 +407 val_407 +407 val_408 +407 val_408 +407 val_408 +409 val_409 +409 val_409 +409 val_409 +409 val_410 +409 val_410 +410 val_411 414 val_414 414 val_414 414 val_415 +415 val_416 417 val_417 417 val_417 417 val_417 423 val_424 426 val_427 -429 val_429 -429 val_429 -429 val_430 -429 val_430 -432 val_432 -432 val_433 +430 val_430 +430 val_430 +430 val_430 +430 val_431 435 val_435 435 val_436 438 val_438 @@ -1865,19 +1960,24 @@ POSTHOOK: Input: default@srcbucket 438 val_438 438 val_439 438 val_439 -441 val_442 +439 val_439 +439 val_439 +439 val_440 +439 val_440 +440 val_441 +440 val_441 +443 val_443 +443 val_444 +443 val_444 +443 val_444 444 val_444 447 val_448 -450 val_451 -450 val_451 -453 val_453 -453 val_454 +448 val_448 +448 val_449 +452 val_452 459 val_459 459 val_459 459 val_460 -462 val_462 -462 val_462 -462 val_463 468 val_468 468 val_468 468 val_468 @@ -1885,31 +1985,39 @@ POSTHOOK: Input: default@srcbucket 468 val_469 468 val_469 468 val_469 -474 val_475 -474 val_475 -477 val_477 -477 val_478 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_469 +469 val_470 +470 val_470 +470 val_471 +472 val_472 +478 val_478 +478 val_478 +478 val_479 +478 val_479 480 val_480 480 val_480 480 val_480 480 val_481 480 val_481 -483 val_483 -486 val_487 -489 val_489 -489 val_489 -489 val_489 -489 val_489 -489 val_490 +485 val_485 +485 val_486 +485 val_486 +491 val_491 +491 val_492 +491 val_492 492 val_492 492 val_492 492 val_493 492 val_493 495 val_495 495 val_496 -498 val_498 -498 val_498 -498 val_498 +497 val_497 +497 val_498 +497 val_498 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket TABLESAMPLE (BUCKET 2 OUT OF 3 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -1960,6 +2068,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1982,6 +2091,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2047,91 +2157,125 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### +0 val_0 +0 val_0 +0 val_0 +0 val_1 +0 val_1 1 val_2 -4 val_4 -4 val_5 +5 val_5 +5 val_5 +5 val_5 +5 val_6 +8 val_8 +8 val_9 10 val_10 10 val_11 -16 val_17 -16 val_17 -19 val_19 -19 val_20 -22 val_23 -28 val_28 -31 val_32 +15 val_15 +15 val_15 +15 val_16 +15 val_16 +17 val_17 +26 val_26 +26 val_26 +33 val_33 +33 val_34 34 val_34 37 val_37 37 val_37 -40 val_41 -40 val_41 -43 val_43 -46 val_47 -49 val_50 -49 val_50 +42 val_42 +42 val_42 +42 val_43 +42 val_43 +42 val_43 52 val_53 52 val_53 52 val_53 52 val_53 +53 val_53 +53 val_54 +56 val_57 58 val_58 58 val_58 58 val_59 58 val_59 -61 val_62 -64 val_64 -67 val_67 -67 val_67 -70 val_70 -70 val_70 -70 val_70 -70 val_71 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -82 val_82 -82 val_83 -82 val_83 -85 val_85 -85 val_86 +59 val_60 +60 val_61 +65 val_65 +65 val_66 +65 val_66 +66 val_66 +69 val_69 +69 val_70 +72 val_72 +72 val_72 +83 val_83 +83 val_83 +84 val_84 +84 val_84 91 val_92 94 val_95 97 val_97 97 val_97 97 val_98 97 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -103 val_103 -103 val_103 +99 val_100 +101 val_102 +102 val_103 +104 val_104 +104 val_104 +104 val_105 +104 val_105 +104 val_105 106 val_107 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 +110 val_111 +113 val_113 +113 val_113 121 val_122 121 val_122 +123 val_124 +123 val_124 +126 val_126 +126 val_127 +126 val_127 +128 val_128 +128 val_128 +128 val_128 +128 val_129 +128 val_129 +132 val_133 +132 val_133 133 val_133 133 val_134 -136 val_136 -136 val_137 -145 val_145 -151 val_152 -151 val_152 -157 val_157 -157 val_158 -157 val_158 +137 val_137 +137 val_137 +137 val_138 +138 val_138 +138 val_138 +138 val_138 +138 val_138 +138 val_139 +138 val_139 +150 val_150 +152 val_152 +152 val_152 +152 val_153 +152 val_153 +152 val_153 +153 val_153 +153 val_154 +153 val_154 160 val_160 160 val_161 163 val_163 -166 val_166 -169 val_169 -169 val_169 -169 val_169 -169 val_169 +164 val_164 +164 val_164 +164 val_165 +164 val_165 +167 val_167 +167 val_167 +167 val_167 +167 val_168 172 val_172 172 val_172 172 val_173 @@ -2139,144 +2283,107 @@ POSTHOOK: Input: default@srcbucket 175 val_175 175 val_176 175 val_176 -178 val_178 -178 val_179 -178 val_179 -181 val_181 +176 val_176 +176 val_176 +177 val_177 +177 val_178 +177 val_178 184 val_185 187 val_187 187 val_187 187 val_187 +189 val_189 +189 val_190 190 val_190 -193 val_193 -193 val_193 -193 val_193 -196 val_196 -196 val_197 -196 val_197 -196 val_197 +194 val_194 199 val_199 199 val_199 199 val_199 199 val_200 202 val_202 -205 val_205 -205 val_205 -205 val_206 -208 val_208 -208 val_208 -208 val_208 -214 val_214 -217 val_217 -217 val_217 -217 val_218 -217 val_218 -223 val_223 -223 val_223 -226 val_226 -226 val_227 -226 val_227 -226 val_227 -226 val_227 +212 val_213 +213 val_213 +213 val_213 +213 val_214 +215 val_216 +218 val_218 +219 val_219 +219 val_219 +224 val_224 +224 val_224 +224 val_225 +227 val_228 229 val_229 229 val_229 -235 val_235 -235 val_236 -238 val_238 -238 val_238 -238 val_239 -241 val_241 -241 val_242 -241 val_242 -241 val_242 -241 val_242 -244 val_244 -244 val_245 -244 val_245 -244 val_245 +233 val_233 +233 val_233 +243 val_244 +243 val_244 +246 val_247 +246 val_247 247 val_247 -256 val_256 -256 val_256 -256 val_257 +249 val_249 +249 val_250 +249 val_250 +252 val_252 +252 val_253 +255 val_255 +255 val_255 +257 val_257 +257 val_258 +257 val_258 259 val_260 259 val_260 -262 val_262 -262 val_263 -262 val_263 -265 val_265 -265 val_265 -265 val_266 -268 val_269 -271 val_272 -274 val_274 -274 val_275 +260 val_260 +260 val_261 +260 val_261 +267 val_268 +272 val_272 +272 val_272 +272 val_273 +275 val_275 +275 val_276 +275 val_276 277 val_277 277 val_277 277 val_277 277 val_277 277 val_278 277 val_278 -280 val_280 -280 val_280 -283 val_283 -286 val_286 -286 val_287 +282 val_282 +282 val_282 289 val_289 289 val_290 -292 val_292 -292 val_293 -292 val_293 -295 val_296 -295 val_296 -298 val_298 -298 val_298 -298 val_298 304 val_305 -307 val_307 -307 val_307 310 val_310 310 val_311 310 val_311 310 val_311 313 val_314 -316 val_316 -316 val_316 -316 val_316 -322 val_322 -322 val_322 -322 val_323 -325 val_325 -325 val_325 -328 val_329 -328 val_329 -331 val_331 -331 val_331 -331 val_332 -331 val_332 -334 val_335 -337 val_338 +314 val_315 +315 val_315 +324 val_325 +330 val_331 +333 val_333 +333 val_333 +333 val_334 340 val_341 -343 val_344 -349 val_350 -349 val_350 -349 val_350 -349 val_350 -352 val_353 -352 val_353 -355 val_356 -355 val_356 +351 val_351 +351 val_352 +351 val_352 +353 val_353 +353 val_353 +353 val_354 +356 val_356 +356 val_357 +356 val_357 358 val_359 -364 val_364 -364 val_365 -367 val_367 -367 val_367 -367 val_368 -367 val_368 -373 val_373 -373 val_374 -376 val_377 -379 val_379 -379 val_380 +363 val_364 +363 val_364 +363 val_364 +377 val_377 +378 val_378 +378 val_379 382 val_382 382 val_382 382 val_383 @@ -2284,52 +2391,46 @@ POSTHOOK: Input: default@srcbucket 385 val_386 385 val_386 388 val_389 -391 val_392 -391 val_392 -394 val_394 -397 val_397 -397 val_397 -400 val_400 -403 val_403 -403 val_403 -403 val_403 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 -409 val_409 -409 val_409 -409 val_409 -409 val_410 -409 val_410 +393 val_393 +393 val_394 +393 val_394 +396 val_396 +396 val_396 +396 val_396 +402 val_402 +402 val_403 +402 val_403 +402 val_403 +405 val_406 +408 val_409 +408 val_409 412 val_413 412 val_413 -415 val_416 -418 val_418 +413 val_413 +413 val_413 +413 val_414 +416 val_417 +419 val_419 421 val_421 421 val_422 421 val_422 -424 val_424 -424 val_424 -424 val_425 -427 val_427 -427 val_428 -427 val_428 -430 val_430 -430 val_430 -430 val_430 -430 val_431 +429 val_429 +429 val_429 +429 val_430 +429 val_430 +432 val_432 +432 val_433 436 val_436 436 val_437 -439 val_439 -439 val_439 -439 val_440 -439 val_440 -442 val_443 -448 val_448 -448 val_449 +437 val_437 +437 val_438 +441 val_442 +446 val_446 +446 val_447 +446 val_447 451 val_452 +453 val_453 +453 val_454 454 val_454 454 val_454 454 val_454 @@ -2338,37 +2439,41 @@ POSTHOOK: Input: default@srcbucket 457 val_457 457 val_458 457 val_458 +458 val_458 +458 val_458 460 val_460 +461 val_462 463 val_463 463 val_463 463 val_464 466 val_466 466 val_466 466 val_466 -469 val_469 -469 val_469 -469 val_469 -469 val_469 -469 val_469 -469 val_470 -472 val_472 +474 val_475 +474 val_475 475 val_475 475 val_476 -478 val_478 -478 val_478 -478 val_479 -478 val_479 +476 val_477 +476 val_477 +477 val_477 +477 val_478 481 val_481 481 val_482 +482 val_482 +482 val_483 +483 val_483 484 val_484 484 val_485 +486 val_487 487 val_487 487 val_488 +489 val_489 +489 val_489 +489 val_489 +489 val_489 +489 val_490 490 val_490 490 val_491 -493 val_493 -496 val_496 -496 val_497 PREHOOK: query: EXPLAIN EXTENDED SELECT s.* FROM srcbucket2 TABLESAMPLE (BUCKET 1 OUT OF 2 on key) s ORDER BY key, value PREHOOK: type: QUERY @@ -2420,6 +2525,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2442,6 +2548,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2468,6 +2575,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2490,6 +2598,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2556,104 +2665,93 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket2 #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 2 val_2 -4 val_4 -8 val_8 10 val_10 -12 val_12 -12 val_12 -18 val_18 -18 val_18 +17 val_17 +19 val_19 20 val_20 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 +27 val_27 30 val_30 -34 val_34 -42 val_42 -42 val_42 -44 val_44 +41 val_41 +43 val_43 +51 val_51 +51 val_51 54 val_54 +57 val_57 58 val_58 58 val_58 64 val_64 -66 val_66 +65 val_65 +67 val_67 +67 val_67 +69 val_69 70 val_70 70 val_70 70 val_70 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -78 val_78 +77 val_77 80 val_80 -82 val_82 +83 val_83 +83 val_83 84 val_84 84 val_84 +85 val_85 86 val_86 90 val_90 90 val_90 90 val_90 -92 val_92 96 val_96 +97 val_97 +97 val_97 98 val_98 98 val_98 -100 val_100 -100 val_100 -104 val_104 -104 val_104 -114 val_114 +105 val_105 +113 val_113 +113 val_113 116 val_116 -118 val_118 -118 val_118 -120 val_120 -120 val_120 +119 val_119 +119 val_119 +119 val_119 126 val_126 -128 val_128 -128 val_128 -128 val_128 +133 val_133 134 val_134 134 val_134 -136 val_136 -138 val_138 -138 val_138 -138 val_138 -138 val_138 +137 val_137 +137 val_137 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 +149 val_149 +149 val_149 +153 val_153 156 val_156 +157 val_157 158 val_158 -160 val_160 162 val_162 +163 val_163 164 val_164 164 val_164 -166 val_166 -168 val_168 -170 val_170 -172 val_172 -172 val_172 -174 val_174 -174 val_174 -176 val_176 -176 val_176 +165 val_165 +165 val_165 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +177 val_177 178 val_178 -180 val_180 -186 val_186 +181 val_181 +187 val_187 +187 val_187 +187 val_187 190 val_190 -192 val_192 -194 val_194 -196 val_196 -200 val_200 -200 val_200 +191 val_191 +191 val_191 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +199 val_199 +199 val_199 +199 val_199 +201 val_201 202 val_202 208 val_208 208 val_208 @@ -2661,63 +2759,60 @@ POSTHOOK: Input: default@srcbucket2 214 val_214 216 val_216 216 val_216 -218 val_218 -222 val_222 -224 val_224 -224 val_224 +221 val_221 +221 val_221 226 val_226 -228 val_228 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 +229 val_229 +229 val_229 +233 val_233 +233 val_233 +237 val_237 +237 val_237 238 val_238 238 val_238 -242 val_242 -242 val_242 +239 val_239 +239 val_239 244 val_244 248 val_248 +249 val_249 252 val_252 +255 val_255 +255 val_255 256 val_256 256 val_256 -258 val_258 260 val_260 -262 val_262 266 val_266 272 val_272 272 val_272 -274 val_274 -278 val_278 -278 val_278 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 286 val_286 -288 val_288 -288 val_288 +287 val_287 +289 val_289 +291 val_291 292 val_292 -296 val_296 -298 val_298 -298 val_298 -298 val_298 -302 val_302 -306 val_306 +307 val_307 +307 val_307 308 val_308 310 val_310 +311 val_311 +311 val_311 +311 val_311 +315 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -322 val_322 -322 val_322 +317 val_317 +317 val_317 +325 val_325 +325 val_325 +327 val_327 +327 val_327 +327 val_327 332 val_332 336 val_336 338 val_338 +339 val_339 +341 val_341 342 val_342 342 val_342 344 val_344 @@ -2727,79 +2822,89 @@ POSTHOOK: Input: default@srcbucket2 348 val_348 348 val_348 348 val_348 -356 val_356 +351 val_351 +353 val_353 +353 val_353 360 val_360 362 val_362 364 val_364 -366 val_366 +365 val_365 368 val_368 -374 val_374 +369 val_369 +369 val_369 +369 val_369 +377 val_377 378 val_378 -382 val_382 -382 val_382 384 val_384 384 val_384 384 val_384 386 val_386 392 val_392 +393 val_393 394 val_394 396 val_396 396 val_396 396 val_396 -400 val_400 +397 val_397 +397 val_397 +399 val_399 +399 val_399 402 val_402 404 val_404 404 val_404 -406 val_406 -406 val_406 -406 val_406 -406 val_406 +407 val_407 +409 val_409 +409 val_409 +409 val_409 +411 val_411 414 val_414 414 val_414 -418 val_418 -424 val_424 -424 val_424 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +421 val_421 +427 val_427 430 val_430 430 val_430 430 val_430 432 val_432 -436 val_436 -438 val_438 -438 val_438 -438 val_438 +435 val_435 +437 val_437 +443 val_443 444 val_444 446 val_446 -448 val_448 +449 val_449 452 val_452 +453 val_453 454 val_454 454 val_454 454 val_454 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 +459 val_459 +459 val_459 +463 val_463 +463 val_463 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -470 val_470 +467 val_467 472 val_472 478 val_478 478 val_478 +479 val_479 480 val_480 480 val_480 480 val_480 482 val_482 +483 val_483 484 val_484 +485 val_485 490 val_490 -492 val_492 -492 val_492 -494 val_494 -496 val_496 +491 val_491 +495 val_495 +497 val_497 498 val_498 498 val_498 498 val_498 @@ -2854,6 +2959,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2876,6 +2982,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 4 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -2941,144 +3048,132 @@ ORDER BY key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket2 #### A masked pattern was here #### -5 val_5 -5 val_5 -5 val_5 +0 val_0 +0 val_0 +0 val_0 +4 val_4 +8 val_8 9 val_9 -17 val_17 -33 val_33 +11 val_11 +18 val_18 +18 val_18 +26 val_26 +26 val_26 +34 val_34 37 val_37 37 val_37 -41 val_41 -53 val_53 -57 val_57 -65 val_65 -69 val_69 -77 val_77 -85 val_85 -97 val_97 -97 val_97 -105 val_105 -113 val_113 -113 val_113 -125 val_125 -125 val_125 -129 val_129 -129 val_129 -133 val_133 -137 val_137 -137 val_137 -145 val_145 -149 val_149 -149 val_149 -153 val_153 -157 val_157 -165 val_165 -165 val_165 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -177 val_177 -181 val_181 +66 val_66 +72 val_72 +72 val_72 +74 val_74 +78 val_78 +82 val_82 +92 val_92 +100 val_100 +100 val_100 +103 val_103 +103 val_103 +118 val_118 +118 val_118 +120 val_120 +120 val_120 +128 val_128 +128 val_128 +128 val_128 +131 val_131 +136 val_136 +143 val_143 +150 val_150 +152 val_152 +152 val_152 +155 val_155 +160 val_160 +174 val_174 +174 val_174 +175 val_175 +175 val_175 +176 val_176 +176 val_176 +179 val_179 +179 val_179 +183 val_183 +186 val_186 189 val_189 -193 val_193 -193 val_193 -193 val_193 -197 val_197 -197 val_197 -201 val_201 +194 val_194 +200 val_200 +200 val_200 205 val_205 205 val_205 -209 val_209 -209 val_209 -213 val_213 -213 val_213 217 val_217 217 val_217 -221 val_221 -221 val_221 -229 val_229 -229 val_229 -233 val_233 -233 val_233 -237 val_237 -237 val_237 -241 val_241 -249 val_249 -257 val_257 -265 val_265 -265 val_265 -273 val_273 -273 val_273 -273 val_273 +218 val_218 +222 val_222 +223 val_223 +223 val_223 +228 val_228 +230 val_230 +230 val_230 +230 val_230 +230 val_230 +230 val_230 +235 val_235 +247 val_247 +262 val_262 +275 val_275 277 val_277 277 val_277 277 val_277 277 val_277 -281 val_281 -281 val_281 +280 val_280 +280 val_280 +282 val_282 +282 val_282 285 val_285 -289 val_289 +288 val_288 +288 val_288 +296 val_296 +298 val_298 +298 val_298 +298 val_298 +302 val_302 305 val_305 +306 val_306 309 val_309 309 val_309 -317 val_317 -317 val_317 321 val_321 321 val_321 -325 val_325 -325 val_325 +323 val_323 333 val_333 333 val_333 -341 val_341 345 val_345 -353 val_353 -353 val_353 -365 val_365 -369 val_369 -369 val_369 -369 val_369 -373 val_373 -377 val_377 +366 val_366 +374 val_374 +375 val_375 389 val_389 -393 val_393 -397 val_397 -397 val_397 -401 val_401 -401 val_401 -401 val_401 -401 val_401 -401 val_401 -409 val_409 -409 val_409 -409 val_409 +400 val_400 413 val_413 413 val_413 -417 val_417 -417 val_417 -417 val_417 -421 val_421 -429 val_429 -429 val_429 -437 val_437 -449 val_449 -453 val_453 +424 val_424 +424 val_424 +438 val_438 +438 val_438 +438 val_438 +439 val_439 +439 val_439 +455 val_455 457 val_457 +460 val_460 +462 val_462 +462 val_462 469 val_469 469 val_469 469 val_469 469 val_469 469 val_469 477 val_477 -481 val_481 -485 val_485 -489 val_489 -489 val_489 -489 val_489 -489 val_489 +487 val_487 493 val_493 -497 val_497 +496 val_496 PREHOOK: query: CREATE TABLE empty_bucket (key int, value string) CLUSTERED BY (key) INTO 2 BUCKETS STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default diff --git a/ql/src/test/results/clientpositive/spark/sample7.q.out b/ql/src/test/results/clientpositive/spark/sample7.q.out index 98c2d92b3a..96dc5cce89 100644 --- a/ql/src/test/results/clientpositive/spark/sample7.q.out +++ b/ql/src/test/results/clientpositive/spark/sample7.q.out @@ -53,6 +53,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -84,6 +85,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -106,6 +108,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count 2 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -137,6 +140,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -183,121 +187,130 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@dest1 #### A masked pattern was here #### -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +105 val_105 +105 val_106 +105 val_106 +110 val_111 +113 val_113 +113 val_113 116 val_116 116 val_117 -120 val_120 -120 val_120 -120 val_121 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 -132 val_133 -132 val_133 -136 val_136 -136 val_137 -140 val_141 -144 val_145 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +117 val_118 +117 val_118 +119 val_119 +119 val_119 +119 val_119 +119 val_120 +119 val_120 +119 val_120 +121 val_122 +121 val_122 +123 val_124 +123 val_124 +126 val_126 +126 val_127 +126 val_127 +134 val_134 +134 val_134 +134 val_135 +137 val_137 +137 val_137 +137 val_138 +153 val_153 +153 val_154 +153 val_154 156 val_156 156 val_157 156 val_157 -160 val_160 -160 val_161 -164 val_164 -164 val_164 -164 val_165 -164 val_165 -168 val_168 -168 val_169 -172 val_172 -172 val_172 -172 val_173 -176 val_176 -176 val_176 -180 val_180 +157 val_157 +157 val_158 +157 val_158 +158 val_158 +163 val_163 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +177 val_177 +177 val_178 +177 val_178 +178 val_178 +178 val_179 +178 val_179 184 val_185 -192 val_192 -192 val_193 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 -204 val_205 +187 val_187 +187 val_187 +187 val_187 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +197 val_198 +206 val_207 +206 val_207 +206 val_207 208 val_208 208 val_208 208 val_208 -212 val_213 -216 val_216 -216 val_216 -216 val_217 -224 val_224 -224 val_224 -224 val_225 -228 val_228 -228 val_229 -240 val_241 +221 val_221 +221 val_221 +229 val_229 +229 val_229 +237 val_237 +237 val_237 +243 val_244 +243 val_244 244 val_244 244 val_245 244 val_245 244 val_245 -248 val_248 -248 val_249 +249 val_249 +249 val_250 +249 val_250 252 val_252 252 val_253 +254 val_255 256 val_256 256 val_256 256 val_257 -260 val_260 -260 val_261 -260 val_261 -264 val_265 -264 val_265 -268 val_269 +266 val_266 +271 val_272 272 val_272 272 val_272 272 val_273 -276 val_277 -280 val_280 -280 val_280 -284 val_284 -284 val_285 -284 val_285 -288 val_288 -288 val_288 +286 val_286 +286 val_287 +289 val_289 +289 val_290 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -300 val_301 -300 val_301 304 val_305 +307 val_307 +307 val_307 308 val_308 308 val_309 308 val_309 +315 val_315 316 val_316 316 val_316 316 val_316 -324 val_325 -328 val_329 -328 val_329 -332 val_332 +317 val_317 +317 val_317 +317 val_318 +326 val_327 +327 val_327 +327 val_327 +327 val_327 +334 val_335 336 val_336 336 val_337 -340 val_341 +338 val_338 +338 val_339 +339 val_339 +342 val_342 +342 val_342 +342 val_343 344 val_344 344 val_344 344 val_345 @@ -307,77 +320,94 @@ POSTHOOK: Input: default@dest1 348 val_348 348 val_348 348 val_349 +349 val_350 +349 val_350 +349 val_350 +349 val_350 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 +353 val_353 +353 val_353 +353 val_354 +355 val_356 +355 val_356 360 val_360 360 val_361 +362 val_362 364 val_364 364 val_365 -368 val_368 -376 val_377 -384 val_384 -384 val_384 -384 val_384 -384 val_385 -384 val_385 -384 val_385 -388 val_389 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +371 val_372 +371 val_372 +371 val_372 +371 val_372 +377 val_377 +378 val_378 +378 val_379 +391 val_392 +391 val_392 392 val_392 392 val_393 392 val_393 396 val_396 396 val_396 396 val_396 -400 val_400 +399 val_399 +399 val_399 +399 val_400 +399 val_400 +402 val_402 +402 val_403 +402 val_403 +402 val_403 404 val_404 404 val_404 404 val_405 404 val_405 404 val_405 +407 val_407 +407 val_408 +407 val_408 +407 val_408 408 val_409 408 val_409 -412 val_413 -412 val_413 -416 val_417 -424 val_424 -424 val_424 -424 val_425 -428 val_429 -432 val_432 -432 val_433 -436 val_436 -436 val_437 +410 val_411 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +423 val_424 +426 val_427 +427 val_427 +427 val_428 +427 val_428 440 val_441 440 val_441 -444 val_444 -448 val_448 -448 val_449 +449 val_449 452 val_452 -460 val_460 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 +458 val_458 +458 val_458 +463 val_463 +463 val_463 +463 val_464 +466 val_466 +466 val_466 +466 val_466 472 val_472 476 val_477 476 val_477 -480 val_480 -480 val_480 -480 val_480 -480 val_481 -480 val_481 +478 val_478 +478 val_478 +478 val_479 +478 val_479 +479 val_479 +482 val_482 +482 val_483 484 val_484 484 val_485 -488 val_489 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -496 val_496 -496 val_497 +497 val_497 +497 val_498 +497 val_498 diff --git a/ql/src/test/results/clientpositive/spark/sample8.q.out b/ql/src/test/results/clientpositive/spark/sample8.q.out index 5e27cb66d0..165ff50e47 100644 --- a/ql/src/test/results/clientpositive/spark/sample8.q.out +++ b/ql/src/test/results/clientpositive/spark/sample8.q.out @@ -75,6 +75,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -146,6 +147,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -194,6 +196,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -242,6 +245,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -290,6 +294,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -380,122 +385,22 @@ 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 #### A masked pattern was here #### -105 val_105 -105 val_105 -105 val_105 -105 val_105 -114 val_114 -114 val_114 -114 val_114 -114 val_114 -150 val_150 -150 val_150 -150 val_150 -150 val_150 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -169 val_169 -178 val_178 -178 val_178 -178 val_178 -178 val_178 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 -187 val_187 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 +149 val_149 196 val_196 196 val_196 196 val_196 @@ -504,234 +409,270 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12 2 val_2 2 val_2 2 val_2 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -213 val_213 -222 val_222 -222 val_222 -222 val_222 -222 val_222 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -277 val_277 -286 val_286 -286 val_286 -286 val_286 -286 val_286 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -321 val_321 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 -367 val_367 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +219 val_219 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +238 val_238 +258 val_258 +258 val_258 +258 val_258 +258 val_258 +28 val_28 +28 val_28 +28 val_28 +28 val_28 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +280 val_280 +285 val_285 +285 val_285 +285 val_285 +285 val_285 +291 val_291 +291 val_291 +291 val_291 +291 val_291 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +298 val_298 +30 val_30 +30 val_30 +30 val_30 +30 val_30 +306 val_306 +306 val_306 +306 val_306 +306 val_306 +374 val_374 +374 val_374 +374 val_374 +374 val_374 +377 val_377 +377 val_377 +377 val_377 +377 val_377 394 val_394 394 val_394 394 val_394 394 val_394 -402 val_402 -402 val_402 -402 val_402 -402 val_402 -411 val_411 -411 val_411 -411 val_411 -411 val_411 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -439 val_439 -448 val_448 -448 val_448 -448 val_448 -448 val_448 -457 val_457 -457 val_457 -457 val_457 -457 val_457 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -466 val_466 -475 val_475 -475 val_475 -475 val_475 -475 val_475 -484 val_484 -484 val_484 -484 val_484 -484 val_484 -493 val_493 -493 val_493 -493 val_493 -493 val_493 -77 val_77 -77 val_77 -77 val_77 -77 val_77 -86 val_86 -86 val_86 -86 val_86 -86 val_86 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 -95 val_95 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +406 val_406 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +414 val_414 +444 val_444 +444 val_444 +444 val_444 +444 val_444 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +458 val_458 +485 val_485 +485 val_485 +485 val_485 +485 val_485 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +492 val_492 +5 val_5 +5 val_5 +5 val_5 +5 val_5 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +90 val_90 +97 val_97 +97 val_97 +97 val_97 +97 val_97 PREHOOK: query: EXPLAIN SELECT * FROM src TABLESAMPLE(100 ROWS) a JOIN src1 TABLESAMPLE(10 ROWS) b ON a.key=b.key PREHOOK: type: QUERY diff --git a/ql/src/test/results/clientpositive/spark/sample9.q.out b/ql/src/test/results/clientpositive/spark/sample9.q.out index 8283d04669..7e648b5b23 100644 --- a/ql/src/test/results/clientpositive/spark/sample9.q.out +++ b/ql/src/test/results/clientpositive/spark/sample9.q.out @@ -38,205 +38,188 @@ order by key, value POSTHOOK: type: QUERY POSTHOOK: Input: default@srcbucket #### A masked pattern was here #### -0 val_0 -0 val_0 -0 val_0 -0 val_1 -0 val_1 2 val_2 2 val_3 -4 val_4 -4 val_5 +3 val_4 6 val_7 6 val_7 -8 val_8 -8 val_9 10 val_10 10 val_11 -12 val_12 -12 val_12 -12 val_13 -16 val_17 -16 val_17 -18 val_18 -18 val_18 +17 val_17 +19 val_19 +19 val_20 20 val_20 20 val_21 20 val_21 -22 val_23 -24 val_24 -24 val_24 -26 val_26 -26 val_26 -28 val_28 +21 val_22 +21 val_22 +21 val_22 +21 val_22 +27 val_27 +29 val_30 +29 val_30 30 val_30 30 val_31 -32 val_33 -34 val_34 +31 val_32 40 val_41 40 val_41 -42 val_42 -42 val_42 -42 val_43 -42 val_43 -42 val_43 -44 val_44 +41 val_41 +43 val_43 46 val_47 48 val_49 48 val_49 -50 val_51 -52 val_53 -52 val_53 -52 val_53 -52 val_53 +51 val_51 +51 val_51 +51 val_52 54 val_54 -56 val_57 +57 val_57 58 val_58 58 val_58 58 val_59 58 val_59 +59 val_60 60 val_61 -62 val_63 -62 val_63 +61 val_62 64 val_64 -66 val_66 +65 val_65 +65 val_66 +65 val_66 +67 val_67 +67 val_67 68 val_69 +69 val_69 +69 val_70 70 val_70 70 val_70 70 val_70 70 val_71 -72 val_72 -72 val_72 -74 val_74 -76 val_76 -76 val_76 -76 val_77 -76 val_77 -76 val_77 -78 val_78 -78 val_79 +77 val_77 +77 val_78 +77 val_78 80 val_80 80 val_81 -82 val_82 -82 val_83 -82 val_83 +83 val_83 +83 val_83 84 val_84 84 val_84 +85 val_85 +85 val_86 86 val_86 86 val_87 +89 val_90 +89 val_90 +89 val_90 90 val_90 90 val_90 90 val_90 -92 val_92 -94 val_95 +91 val_92 +93 val_94 +93 val_94 +93 val_94 96 val_96 +97 val_97 +97 val_97 +97 val_98 +97 val_98 98 val_98 98 val_98 -100 val_100 -100 val_100 -100 val_101 -100 val_101 -102 val_103 -104 val_104 -104 val_104 -104 val_105 -104 val_105 -104 val_105 +99 val_100 +101 val_102 +105 val_105 +105 val_106 +105 val_106 106 val_107 110 val_111 -114 val_114 -114 val_115 -114 val_115 -114 val_115 +113 val_113 +113 val_113 116 val_116 116 val_117 -118 val_118 -118 val_118 -118 val_119 -118 val_119 -118 val_119 -120 val_120 -120 val_120 -120 val_121 -122 val_123 -122 val_123 -122 val_123 +117 val_118 +117 val_118 +119 val_119 +119 val_119 +119 val_119 +119 val_120 +119 val_120 +119 val_120 +121 val_122 +121 val_122 +123 val_124 +123 val_124 126 val_126 126 val_127 126 val_127 -128 val_128 -128 val_128 -128 val_128 -128 val_129 -128 val_129 132 val_133 132 val_133 +133 val_133 +133 val_134 134 val_134 134 val_134 134 val_135 -136 val_136 -136 val_137 -138 val_138 -138 val_138 -138 val_138 -138 val_138 -138 val_139 -138 val_139 +135 val_136 +135 val_136 +135 val_136 +137 val_137 +137 val_137 +137 val_138 140 val_141 -144 val_145 146 val_146 146 val_146 -150 val_150 -152 val_152 -152 val_152 -152 val_153 -152 val_153 -152 val_153 +149 val_149 +149 val_149 +149 val_150 +153 val_153 +153 val_154 +153 val_154 156 val_156 156 val_157 156 val_157 +157 val_157 +157 val_158 +157 val_158 158 val_158 -160 val_160 -160 val_161 162 val_162 162 val_163 +163 val_163 164 val_164 164 val_164 164 val_165 164 val_165 -166 val_166 -168 val_168 -168 val_169 -170 val_170 -170 val_171 -172 val_172 -172 val_172 -172 val_173 -174 val_174 -174 val_174 -174 val_175 -174 val_175 -176 val_176 -176 val_176 +165 val_165 +165 val_165 +165 val_166 +169 val_169 +169 val_169 +169 val_169 +169 val_169 +177 val_177 +177 val_178 +177 val_178 178 val_178 178 val_179 178 val_179 -180 val_180 +181 val_181 182 val_183 184 val_185 -186 val_186 +185 val_186 +187 val_187 +187 val_187 +187 val_187 190 val_190 -192 val_192 -192 val_193 -194 val_194 -196 val_196 -196 val_197 -196 val_197 -196 val_197 -200 val_200 -200 val_200 +191 val_191 +191 val_191 +191 val_192 +195 val_195 +195 val_195 +197 val_197 +197 val_197 +197 val_198 +199 val_199 +199 val_199 +199 val_199 +199 val_200 +201 val_201 202 val_202 -204 val_205 206 val_207 206 val_207 206 val_207 @@ -245,95 +228,80 @@ POSTHOOK: Input: default@srcbucket 208 val_208 212 val_213 214 val_214 +215 val_216 216 val_216 216 val_216 216 val_217 -218 val_218 -222 val_222 -222 val_223 -224 val_224 -224 val_224 -224 val_225 +221 val_221 +221 val_221 226 val_226 226 val_227 226 val_227 226 val_227 226 val_227 -228 val_228 -228 val_229 -230 val_230 -230 val_230 -230 val_230 -230 val_230 -230 val_230 +229 val_229 +229 val_229 +231 val_232 +233 val_233 +233 val_233 +237 val_237 +237 val_237 238 val_238 238 val_238 238 val_239 +239 val_239 +239 val_239 +239 val_240 +239 val_240 240 val_241 -242 val_242 -242 val_242 -242 val_243 +243 val_244 +243 val_244 244 val_244 244 val_245 244 val_245 244 val_245 -246 val_247 -246 val_247 248 val_248 248 val_249 +249 val_249 +249 val_250 +249 val_250 252 val_252 252 val_253 254 val_255 +255 val_255 +255 val_255 256 val_256 256 val_256 256 val_257 -258 val_258 -258 val_259 260 val_260 260 val_261 260 val_261 -262 val_262 -262 val_263 -262 val_263 -264 val_265 -264 val_265 +261 val_262 266 val_266 -268 val_269 +271 val_272 272 val_272 272 val_272 272 val_273 -274 val_274 -274 val_275 276 val_277 -278 val_278 -278 val_278 -278 val_279 -280 val_280 -280 val_280 -282 val_282 -282 val_282 284 val_284 284 val_285 284 val_285 286 val_286 286 val_287 -288 val_288 -288 val_288 +287 val_287 +287 val_288 +287 val_288 +289 val_289 +289 val_290 +291 val_291 +291 val_292 +291 val_292 292 val_292 292 val_293 292 val_293 -296 val_296 -296 val_297 -298 val_298 -298 val_298 -298 val_298 -300 val_301 -300 val_301 -302 val_302 -302 val_303 304 val_305 -306 val_306 -306 val_307 +307 val_307 +307 val_307 308 val_308 308 val_309 308 val_309 @@ -341,63 +309,83 @@ POSTHOOK: Input: default@srcbucket 310 val_311 310 val_311 310 val_311 -314 val_315 +311 val_311 +311 val_311 +311 val_311 +313 val_314 +315 val_315 316 val_316 316 val_316 316 val_316 -318 val_318 -318 val_318 -318 val_318 -318 val_319 -322 val_322 -322 val_322 -322 val_323 +317 val_317 +317 val_317 +317 val_318 324 val_325 +325 val_325 +325 val_325 326 val_327 -328 val_329 -328 val_329 -330 val_331 +327 val_327 +327 val_327 +327 val_327 332 val_332 334 val_335 336 val_336 336 val_337 +337 val_338 338 val_338 338 val_339 -340 val_341 +339 val_339 +341 val_341 +341 val_342 +341 val_342 +341 val_342 342 val_342 342 val_342 342 val_343 +343 val_344 344 val_344 344 val_344 344 val_345 +347 val_348 +347 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_348 348 val_349 +349 val_350 +349 val_350 +349 val_350 +349 val_350 +351 val_351 +351 val_352 +351 val_352 352 val_353 352 val_353 -356 val_356 -356 val_357 -356 val_357 -358 val_359 +353 val_353 +353 val_353 +353 val_354 +355 val_356 +355 val_356 360 val_360 360 val_361 362 val_362 364 val_364 364 val_365 -366 val_366 +365 val_365 368 val_368 -374 val_374 -374 val_375 -376 val_377 +369 val_369 +369 val_369 +369 val_369 +369 val_370 +371 val_372 +371 val_372 +371 val_372 +371 val_372 +377 val_377 378 val_378 378 val_379 -382 val_382 -382 val_382 -382 val_383 -382 val_383 384 val_384 384 val_384 384 val_384 @@ -408,18 +396,24 @@ POSTHOOK: Input: default@srcbucket 386 val_387 386 val_387 388 val_389 -390 val_391 -390 val_391 -390 val_391 +391 val_392 +391 val_392 392 val_392 392 val_393 392 val_393 +393 val_393 +393 val_394 +393 val_394 394 val_394 396 val_396 396 val_396 396 val_396 -398 val_399 -400 val_400 +397 val_397 +397 val_397 +399 val_399 +399 val_399 +399 val_400 +399 val_400 402 val_402 402 val_403 402 val_403 @@ -429,25 +423,36 @@ POSTHOOK: Input: default@srcbucket 404 val_405 404 val_405 404 val_405 -406 val_406 -406 val_406 -406 val_406 -406 val_406 -406 val_407 +407 val_407 +407 val_408 +407 val_408 +407 val_408 408 val_409 408 val_409 +409 val_409 +409 val_409 +409 val_409 +409 val_410 +409 val_410 410 val_411 -412 val_413 -412 val_413 +411 val_411 +411 val_412 414 val_414 414 val_414 414 val_415 -416 val_417 -418 val_418 -424 val_424 -424 val_424 -424 val_425 +417 val_417 +417 val_417 +417 val_417 +419 val_419 +421 val_421 +421 val_422 +421 val_422 +423 val_424 +425 val_426 426 val_427 +427 val_427 +427 val_428 +427 val_428 428 val_429 430 val_430 430 val_430 @@ -455,25 +460,24 @@ POSTHOOK: Input: default@srcbucket 430 val_431 432 val_432 432 val_433 -436 val_436 -436 val_437 -438 val_438 -438 val_438 -438 val_438 -438 val_439 -438 val_439 +435 val_435 +435 val_436 +437 val_437 +437 val_438 440 val_441 440 val_441 -442 val_443 +443 val_443 +443 val_444 +443 val_444 +443 val_444 444 val_444 446 val_446 446 val_447 446 val_447 -448 val_448 -448 val_449 -450 val_451 -450 val_451 +449 val_449 452 val_452 +453 val_453 +453 val_454 454 val_454 454 val_454 454 val_454 @@ -481,23 +485,19 @@ POSTHOOK: Input: default@srcbucket 454 val_455 458 val_458 458 val_458 -460 val_460 -462 val_462 -462 val_462 -462 val_463 +459 val_459 +459 val_459 +459 val_460 +463 val_463 +463 val_463 +463 val_464 466 val_466 466 val_466 466 val_466 -468 val_468 -468 val_468 -468 val_468 -468 val_468 -468 val_469 -468 val_469 -468 val_469 -470 val_470 -470 val_471 +467 val_467 +467 val_468 472 val_472 +473 val_474 474 val_475 474 val_475 476 val_477 @@ -506,6 +506,7 @@ POSTHOOK: Input: default@srcbucket 478 val_478 478 val_479 478 val_479 +479 val_479 480 val_480 480 val_480 480 val_480 @@ -513,21 +514,23 @@ POSTHOOK: Input: default@srcbucket 480 val_481 482 val_482 482 val_483 +483 val_483 484 val_484 484 val_485 -486 val_487 +485 val_485 +485 val_486 +485 val_486 488 val_489 490 val_490 490 val_491 -492 val_492 -492 val_492 -492 val_493 -492 val_493 -494 val_494 -494 val_495 -494 val_495 -496 val_496 -496 val_497 +491 val_491 +491 val_492 +491 val_492 +495 val_495 +495 val_496 +497 val_497 +497 val_498 +497 val_498 498 val_498 498 val_498 498 val_498 diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out index ec10c44910..0ada54b95f 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out @@ -64,6 +64,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: SORTBUCKETCOLSPREFIX TRUE + bucketing_version 2 numFiles 1 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out index d8bd846a01..821641a51a 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out @@ -124,6 +124,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -147,6 +148,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -271,6 +273,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -294,6 +297,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -370,6 +374,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -393,6 +398,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out index 1916075436..2319acf404 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out @@ -86,6 +86,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -109,6 +110,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -164,6 +166,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -187,6 +190,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -392,6 +396,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -415,6 +420,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -470,6 +476,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -493,6 +500,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -646,6 +654,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -669,6 +678,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -724,6 +734,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -747,6 +758,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -900,6 +912,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -923,6 +936,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -978,6 +992,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments @@ -1001,6 +1016,7 @@ STAGE PLANS: SORTBUCKETCOLSPREFIX TRUE bucket_count 16 bucket_field_name key + bucketing_version 2 column.name.delimiter , columns key,key2,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out index 90d0e0ecfd..4f77202a91 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_18.q.out @@ -137,7 +137,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table1 @@ -148,7 +148,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select count(*) from test_table2 where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -190,7 +190,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -201,7 +201,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2') SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' and a.key = 238 diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out index 71267d6ac4..344b673cec 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_19.q.out @@ -159,7 +159,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -40 +19 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 13 out of 16) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table1 @@ -170,7 +170,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 POSTHOOK: Input: default@test_table1@ds=1 #### A masked pattern was here #### -29 +33 PREHOOK: query: select count(*) from test_table2 where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -234,7 +234,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -40 +19 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 13 out of 16) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -245,4 +245,4 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 POSTHOOK: Input: default@test_table2@ds=1 #### A masked pattern was here #### -29 +33 diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out index 314c07c804..c2746db8c7 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_20.q.out @@ -274,7 +274,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -247 +243 PREHOOK: query: select count(*) from test_table3 tablesample (bucket 2 out of 2) s where ds = '1' PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -285,7 +285,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select * from test_table3 PREHOOK: type: QUERY PREHOOK: Input: default@test_table3 @@ -296,104 +296,93 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -val_0 0 val_0 1 -val_0 0 val_0 1 -val_0 0 val_0 1 val_2 2 val_2 1 -val_4 4 val_4 1 -val_8 8 val_8 1 val_10 10 val_10 1 -val_12 12 val_12 1 -val_12 12 val_12 1 -val_18 18 val_18 1 -val_18 18 val_18 1 +val_17 17 val_17 1 +val_19 19 val_19 1 val_20 20 val_20 1 -val_24 24 val_24 1 -val_24 24 val_24 1 -val_26 26 val_26 1 -val_26 26 val_26 1 -val_28 28 val_28 1 +val_27 27 val_27 1 val_30 30 val_30 1 -val_34 34 val_34 1 -val_42 42 val_42 1 -val_42 42 val_42 1 -val_44 44 val_44 1 +val_41 41 val_41 1 +val_43 43 val_43 1 +val_51 51 val_51 1 +val_51 51 val_51 1 val_54 54 val_54 1 +val_57 57 val_57 1 val_58 58 val_58 1 val_58 58 val_58 1 val_64 64 val_64 1 -val_66 66 val_66 1 +val_65 65 val_65 1 +val_67 67 val_67 1 +val_67 67 val_67 1 +val_69 69 val_69 1 val_70 70 val_70 1 val_70 70 val_70 1 val_70 70 val_70 1 -val_72 72 val_72 1 -val_72 72 val_72 1 -val_74 74 val_74 1 -val_76 76 val_76 1 -val_76 76 val_76 1 -val_78 78 val_78 1 +val_77 77 val_77 1 val_80 80 val_80 1 -val_82 82 val_82 1 +val_83 83 val_83 1 +val_83 83 val_83 1 val_84 84 val_84 1 val_84 84 val_84 1 +val_85 85 val_85 1 val_86 86 val_86 1 val_90 90 val_90 1 val_90 90 val_90 1 val_90 90 val_90 1 -val_92 92 val_92 1 val_96 96 val_96 1 +val_97 97 val_97 1 +val_97 97 val_97 1 val_98 98 val_98 1 val_98 98 val_98 1 -val_100 100 val_100 1 -val_100 100 val_100 1 -val_104 104 val_104 1 -val_104 104 val_104 1 -val_114 114 val_114 1 +val_105 105 val_105 1 +val_113 113 val_113 1 +val_113 113 val_113 1 val_116 116 val_116 1 -val_118 118 val_118 1 -val_118 118 val_118 1 -val_120 120 val_120 1 -val_120 120 val_120 1 +val_119 119 val_119 1 +val_119 119 val_119 1 +val_119 119 val_119 1 val_126 126 val_126 1 -val_128 128 val_128 1 -val_128 128 val_128 1 -val_128 128 val_128 1 +val_133 133 val_133 1 val_134 134 val_134 1 val_134 134 val_134 1 -val_136 136 val_136 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 +val_137 137 val_137 1 +val_137 137 val_137 1 val_146 146 val_146 1 val_146 146 val_146 1 -val_150 150 val_150 1 -val_152 152 val_152 1 -val_152 152 val_152 1 +val_149 149 val_149 1 +val_149 149 val_149 1 +val_153 153 val_153 1 val_156 156 val_156 1 +val_157 157 val_157 1 val_158 158 val_158 1 -val_160 160 val_160 1 val_162 162 val_162 1 +val_163 163 val_163 1 val_164 164 val_164 1 val_164 164 val_164 1 -val_166 166 val_166 1 -val_168 168 val_168 1 -val_170 170 val_170 1 -val_172 172 val_172 1 -val_172 172 val_172 1 -val_174 174 val_174 1 -val_174 174 val_174 1 -val_176 176 val_176 1 -val_176 176 val_176 1 +val_165 165 val_165 1 +val_165 165 val_165 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_177 177 val_177 1 val_178 178 val_178 1 -val_180 180 val_180 1 -val_186 186 val_186 1 +val_181 181 val_181 1 +val_187 187 val_187 1 +val_187 187 val_187 1 +val_187 187 val_187 1 val_190 190 val_190 1 -val_192 192 val_192 1 -val_194 194 val_194 1 -val_196 196 val_196 1 -val_200 200 val_200 1 -val_200 200 val_200 1 +val_191 191 val_191 1 +val_191 191 val_191 1 +val_195 195 val_195 1 +val_195 195 val_195 1 +val_197 197 val_197 1 +val_197 197 val_197 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_201 201 val_201 1 val_202 202 val_202 1 val_208 208 val_208 1 val_208 208 val_208 1 @@ -401,63 +390,60 @@ val_208 208 val_208 1 val_214 214 val_214 1 val_216 216 val_216 1 val_216 216 val_216 1 -val_218 218 val_218 1 -val_222 222 val_222 1 -val_224 224 val_224 1 -val_224 224 val_224 1 +val_221 221 val_221 1 +val_221 221 val_221 1 val_226 226 val_226 1 -val_228 228 val_228 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 +val_229 229 val_229 1 +val_229 229 val_229 1 +val_233 233 val_233 1 +val_233 233 val_233 1 +val_237 237 val_237 1 +val_237 237 val_237 1 val_238 238 val_238 1 val_238 238 val_238 1 -val_242 242 val_242 1 -val_242 242 val_242 1 +val_239 239 val_239 1 +val_239 239 val_239 1 val_244 244 val_244 1 val_248 248 val_248 1 +val_249 249 val_249 1 val_252 252 val_252 1 +val_255 255 val_255 1 +val_255 255 val_255 1 val_256 256 val_256 1 val_256 256 val_256 1 -val_258 258 val_258 1 val_260 260 val_260 1 -val_262 262 val_262 1 val_266 266 val_266 1 val_272 272 val_272 1 val_272 272 val_272 1 -val_274 274 val_274 1 -val_278 278 val_278 1 -val_278 278 val_278 1 -val_280 280 val_280 1 -val_280 280 val_280 1 -val_282 282 val_282 1 -val_282 282 val_282 1 val_284 284 val_284 1 val_286 286 val_286 1 -val_288 288 val_288 1 -val_288 288 val_288 1 +val_287 287 val_287 1 +val_289 289 val_289 1 +val_291 291 val_291 1 val_292 292 val_292 1 -val_296 296 val_296 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_302 302 val_302 1 -val_306 306 val_306 1 +val_307 307 val_307 1 +val_307 307 val_307 1 val_308 308 val_308 1 val_310 310 val_310 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_315 315 val_315 1 val_316 316 val_316 1 val_316 316 val_316 1 val_316 316 val_316 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_322 322 val_322 1 -val_322 322 val_322 1 +val_317 317 val_317 1 +val_317 317 val_317 1 +val_325 325 val_325 1 +val_325 325 val_325 1 +val_327 327 val_327 1 +val_327 327 val_327 1 +val_327 327 val_327 1 val_332 332 val_332 1 val_336 336 val_336 1 val_338 338 val_338 1 +val_339 339 val_339 1 +val_341 341 val_341 1 val_342 342 val_342 1 val_342 342 val_342 1 val_344 344 val_344 1 @@ -467,176 +453,197 @@ val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 -val_356 356 val_356 1 +val_351 351 val_351 1 +val_353 353 val_353 1 +val_353 353 val_353 1 val_360 360 val_360 1 val_362 362 val_362 1 val_364 364 val_364 1 -val_366 366 val_366 1 +val_365 365 val_365 1 val_368 368 val_368 1 -val_374 374 val_374 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_377 377 val_377 1 val_378 378 val_378 1 -val_382 382 val_382 1 -val_382 382 val_382 1 val_384 384 val_384 1 val_384 384 val_384 1 val_384 384 val_384 1 val_386 386 val_386 1 val_392 392 val_392 1 +val_393 393 val_393 1 val_394 394 val_394 1 val_396 396 val_396 1 val_396 396 val_396 1 val_396 396 val_396 1 -val_400 400 val_400 1 +val_397 397 val_397 1 +val_397 397 val_397 1 +val_399 399 val_399 1 +val_399 399 val_399 1 val_402 402 val_402 1 val_404 404 val_404 1 val_404 404 val_404 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 +val_407 407 val_407 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_411 411 val_411 1 val_414 414 val_414 1 val_414 414 val_414 1 -val_418 418 val_418 1 -val_424 424 val_424 1 -val_424 424 val_424 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_419 419 val_419 1 +val_421 421 val_421 1 +val_427 427 val_427 1 val_430 430 val_430 1 val_430 430 val_430 1 val_430 430 val_430 1 val_432 432 val_432 1 -val_436 436 val_436 1 -val_438 438 val_438 1 -val_438 438 val_438 1 -val_438 438 val_438 1 +val_435 435 val_435 1 +val_437 437 val_437 1 +val_443 443 val_443 1 val_444 444 val_444 1 val_446 446 val_446 1 -val_448 448 val_448 1 +val_449 449 val_449 1 val_452 452 val_452 1 +val_453 453 val_453 1 val_454 454 val_454 1 val_454 454 val_454 1 val_454 454 val_454 1 val_458 458 val_458 1 val_458 458 val_458 1 -val_460 460 val_460 1 -val_462 462 val_462 1 -val_462 462 val_462 1 +val_459 459 val_459 1 +val_459 459 val_459 1 +val_463 463 val_463 1 +val_463 463 val_463 1 val_466 466 val_466 1 val_466 466 val_466 1 val_466 466 val_466 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_470 470 val_470 1 +val_467 467 val_467 1 val_472 472 val_472 1 val_478 478 val_478 1 val_478 478 val_478 1 +val_479 479 val_479 1 val_480 480 val_480 1 val_480 480 val_480 1 val_480 480 val_480 1 val_482 482 val_482 1 +val_483 483 val_483 1 val_484 484 val_484 1 +val_485 485 val_485 1 val_490 490 val_490 1 -val_492 492 val_492 1 -val_492 492 val_492 1 -val_494 494 val_494 1 -val_496 496 val_496 1 +val_491 491 val_491 1 +val_495 495 val_495 1 +val_497 497 val_497 1 val_498 498 val_498 1 val_498 498 val_498 1 val_498 498 val_498 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_4 4 val_4 1 val_5 5 val_5 1 -val_5 5 val_5 1 -val_5 5 val_5 1 +val_5 5 val_5 1 +val_5 5 val_5 1 +val_8 8 val_8 1 val_9 9 val_9 1 val_11 11 val_11 1 +val_12 12 val_12 1 +val_12 12 val_12 1 val_15 15 val_15 1 val_15 15 val_15 1 -val_17 17 val_17 1 -val_19 19 val_19 1 -val_27 27 val_27 1 +val_18 18 val_18 1 +val_18 18 val_18 1 +val_24 24 val_24 1 +val_24 24 val_24 1 +val_26 26 val_26 1 +val_26 26 val_26 1 +val_28 28 val_28 1 val_33 33 val_33 1 +val_34 34 val_34 1 val_35 35 val_35 1 val_35 35 val_35 1 val_35 35 val_35 1 val_37 37 val_37 1 val_37 37 val_37 1 -val_41 41 val_41 1 -val_43 43 val_43 1 +val_42 42 val_42 1 +val_42 42 val_42 1 +val_44 44 val_44 1 val_47 47 val_47 1 -val_51 51 val_51 1 -val_51 51 val_51 1 val_53 53 val_53 1 -val_57 57 val_57 1 -val_65 65 val_65 1 -val_67 67 val_67 1 -val_67 67 val_67 1 -val_69 69 val_69 1 -val_77 77 val_77 1 -val_83 83 val_83 1 -val_83 83 val_83 1 -val_85 85 val_85 1 +val_66 66 val_66 1 +val_72 72 val_72 1 +val_72 72 val_72 1 +val_74 74 val_74 1 +val_76 76 val_76 1 +val_76 76 val_76 1 +val_78 78 val_78 1 +val_82 82 val_82 1 val_87 87 val_87 1 +val_92 92 val_92 1 val_95 95 val_95 1 val_95 95 val_95 1 -val_97 97 val_97 1 -val_97 97 val_97 1 +val_100 100 val_100 1 +val_100 100 val_100 1 val_103 103 val_103 1 val_103 103 val_103 1 -val_105 105 val_105 1 +val_104 104 val_104 1 +val_104 104 val_104 1 val_111 111 val_111 1 -val_113 113 val_113 1 -val_113 113 val_113 1 -val_119 119 val_119 1 -val_119 119 val_119 1 -val_119 119 val_119 1 +val_114 114 val_114 1 +val_118 118 val_118 1 +val_118 118 val_118 1 +val_120 120 val_120 1 +val_120 120 val_120 1 val_125 125 val_125 1 val_125 125 val_125 1 +val_128 128 val_128 1 +val_128 128 val_128 1 +val_128 128 val_128 1 val_129 129 val_129 1 val_129 129 val_129 1 val_131 131 val_131 1 -val_133 133 val_133 1 -val_137 137 val_137 1 -val_137 137 val_137 1 +val_136 136 val_136 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 val_143 143 val_143 1 val_145 145 val_145 1 -val_149 149 val_149 1 -val_149 149 val_149 1 -val_153 153 val_153 1 +val_150 150 val_150 1 +val_152 152 val_152 1 +val_152 152 val_152 1 val_155 155 val_155 1 -val_157 157 val_157 1 -val_163 163 val_163 1 -val_165 165 val_165 1 -val_165 165 val_165 1 +val_160 160 val_160 1 +val_166 166 val_166 1 val_167 167 val_167 1 val_167 167 val_167 1 val_167 167 val_167 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 +val_168 168 val_168 1 +val_170 170 val_170 1 +val_172 172 val_172 1 +val_172 172 val_172 1 +val_174 174 val_174 1 +val_174 174 val_174 1 val_175 175 val_175 1 val_175 175 val_175 1 -val_177 177 val_177 1 +val_176 176 val_176 1 +val_176 176 val_176 1 val_179 179 val_179 1 val_179 179 val_179 1 -val_181 181 val_181 1 +val_180 180 val_180 1 val_183 183 val_183 1 -val_187 187 val_187 1 -val_187 187 val_187 1 -val_187 187 val_187 1 +val_186 186 val_186 1 val_189 189 val_189 1 -val_191 191 val_191 1 -val_191 191 val_191 1 +val_192 192 val_192 1 val_193 193 val_193 1 val_193 193 val_193 1 val_193 193 val_193 1 -val_195 195 val_195 1 -val_195 195 val_195 1 -val_197 197 val_197 1 -val_197 197 val_197 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_201 201 val_201 1 +val_194 194 val_194 1 +val_196 196 val_196 1 +val_200 200 val_200 1 +val_200 200 val_200 1 val_203 203 val_203 1 val_203 203 val_203 1 val_205 205 val_205 1 @@ -649,93 +656,89 @@ val_213 213 val_213 1 val_213 213 val_213 1 val_217 217 val_217 1 val_217 217 val_217 1 +val_218 218 val_218 1 val_219 219 val_219 1 val_219 219 val_219 1 -val_221 221 val_221 1 -val_221 221 val_221 1 +val_222 222 val_222 1 val_223 223 val_223 1 val_223 223 val_223 1 -val_229 229 val_229 1 -val_229 229 val_229 1 -val_233 233 val_233 1 -val_233 233 val_233 1 +val_224 224 val_224 1 +val_224 224 val_224 1 +val_228 228 val_228 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 val_235 235 val_235 1 -val_237 237 val_237 1 -val_237 237 val_237 1 -val_239 239 val_239 1 -val_239 239 val_239 1 val_241 241 val_241 1 +val_242 242 val_242 1 +val_242 242 val_242 1 val_247 247 val_247 1 -val_249 249 val_249 1 -val_255 255 val_255 1 -val_255 255 val_255 1 val_257 257 val_257 1 +val_258 258 val_258 1 +val_262 262 val_262 1 val_263 263 val_263 1 val_265 265 val_265 1 val_265 265 val_265 1 val_273 273 val_273 1 val_273 273 val_273 1 val_273 273 val_273 1 +val_274 274 val_274 1 val_275 275 val_275 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 +val_278 278 val_278 1 +val_278 278 val_278 1 +val_280 280 val_280 1 +val_280 280 val_280 1 val_281 281 val_281 1 val_281 281 val_281 1 +val_282 282 val_282 1 +val_282 282 val_282 1 val_283 283 val_283 1 val_285 285 val_285 1 -val_287 287 val_287 1 -val_289 289 val_289 1 -val_291 291 val_291 1 +val_288 288 val_288 1 +val_288 288 val_288 1 +val_296 296 val_296 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_302 302 val_302 1 val_305 305 val_305 1 -val_307 307 val_307 1 -val_307 307 val_307 1 +val_306 306 val_306 1 val_309 309 val_309 1 val_309 309 val_309 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_315 315 val_315 1 -val_317 317 val_317 1 -val_317 317 val_317 1 +val_318 318 val_318 1 +val_318 318 val_318 1 +val_318 318 val_318 1 val_321 321 val_321 1 val_321 321 val_321 1 +val_322 322 val_322 1 +val_322 322 val_322 1 val_323 323 val_323 1 -val_325 325 val_325 1 -val_325 325 val_325 1 -val_327 327 val_327 1 -val_327 327 val_327 1 -val_327 327 val_327 1 val_331 331 val_331 1 val_331 331 val_331 1 val_333 333 val_333 1 val_333 333 val_333 1 val_335 335 val_335 1 -val_339 339 val_339 1 -val_341 341 val_341 1 val_345 345 val_345 1 -val_351 351 val_351 1 -val_353 353 val_353 1 -val_353 353 val_353 1 -val_365 365 val_365 1 +val_356 356 val_356 1 +val_366 366 val_366 1 val_367 367 val_367 1 val_367 367 val_367 1 -val_369 369 val_369 1 -val_369 369 val_369 1 -val_369 369 val_369 1 val_373 373 val_373 1 +val_374 374 val_374 1 val_375 375 val_375 1 -val_377 377 val_377 1 val_379 379 val_379 1 +val_382 382 val_382 1 +val_382 382 val_382 1 val_389 389 val_389 1 -val_393 393 val_393 1 val_395 395 val_395 1 val_395 395 val_395 1 -val_397 397 val_397 1 -val_397 397 val_397 1 -val_399 399 val_399 1 -val_399 399 val_399 1 +val_400 400 val_400 1 val_401 401 val_401 1 val_401 401 val_401 1 val_401 401 val_401 1 @@ -744,58 +747,55 @@ val_401 401 val_401 1 val_403 403 val_403 1 val_403 403 val_403 1 val_403 403 val_403 1 -val_407 407 val_407 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_411 411 val_411 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 val_413 413 val_413 1 val_413 413 val_413 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_419 419 val_419 1 -val_421 421 val_421 1 -val_427 427 val_427 1 +val_418 418 val_418 1 +val_424 424 val_424 1 +val_424 424 val_424 1 val_429 429 val_429 1 val_429 429 val_429 1 val_431 431 val_431 1 val_431 431 val_431 1 val_431 431 val_431 1 -val_435 435 val_435 1 -val_437 437 val_437 1 +val_436 436 val_436 1 +val_438 438 val_438 1 +val_438 438 val_438 1 +val_438 438 val_438 1 val_439 439 val_439 1 val_439 439 val_439 1 -val_443 443 val_443 1 -val_449 449 val_449 1 -val_453 453 val_453 1 +val_448 448 val_448 1 val_455 455 val_455 1 val_457 457 val_457 1 -val_459 459 val_459 1 -val_459 459 val_459 1 -val_463 463 val_463 1 -val_463 463 val_463 1 -val_467 467 val_467 1 +val_460 460 val_460 1 +val_462 462 val_462 1 +val_462 462 val_462 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 +val_470 470 val_470 1 val_475 475 val_475 1 val_477 477 val_477 1 -val_479 479 val_479 1 val_481 481 val_481 1 -val_483 483 val_483 1 -val_485 485 val_485 1 val_487 487 val_487 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 -val_491 491 val_491 1 +val_492 492 val_492 1 +val_492 492 val_492 1 val_493 493 val_493 1 -val_495 495 val_495 1 -val_497 497 val_497 1 +val_494 494 val_494 1 +val_496 496 val_496 1 PREHOOK: query: INSERT OVERWRITE TABLE test_table3 PARTITION (ds = '1') SELECT a.value, a.key, a.value FROM test_table1 a WHERE a.ds = '1' PREHOOK: type: QUERY @@ -821,104 +821,93 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table3 POSTHOOK: Input: default@test_table3@ds=1 #### A masked pattern was here #### -val_0 0 val_0 1 -val_0 0 val_0 1 -val_0 0 val_0 1 val_2 2 val_2 1 -val_4 4 val_4 1 -val_8 8 val_8 1 val_10 10 val_10 1 -val_12 12 val_12 1 -val_12 12 val_12 1 -val_18 18 val_18 1 -val_18 18 val_18 1 +val_17 17 val_17 1 +val_19 19 val_19 1 val_20 20 val_20 1 -val_24 24 val_24 1 -val_24 24 val_24 1 -val_26 26 val_26 1 -val_26 26 val_26 1 -val_28 28 val_28 1 +val_27 27 val_27 1 val_30 30 val_30 1 -val_34 34 val_34 1 -val_42 42 val_42 1 -val_42 42 val_42 1 -val_44 44 val_44 1 +val_41 41 val_41 1 +val_43 43 val_43 1 +val_51 51 val_51 1 +val_51 51 val_51 1 val_54 54 val_54 1 +val_57 57 val_57 1 val_58 58 val_58 1 val_58 58 val_58 1 val_64 64 val_64 1 -val_66 66 val_66 1 +val_65 65 val_65 1 +val_67 67 val_67 1 +val_67 67 val_67 1 +val_69 69 val_69 1 val_70 70 val_70 1 val_70 70 val_70 1 val_70 70 val_70 1 -val_72 72 val_72 1 -val_72 72 val_72 1 -val_74 74 val_74 1 -val_76 76 val_76 1 -val_76 76 val_76 1 -val_78 78 val_78 1 +val_77 77 val_77 1 val_80 80 val_80 1 -val_82 82 val_82 1 +val_83 83 val_83 1 +val_83 83 val_83 1 val_84 84 val_84 1 val_84 84 val_84 1 +val_85 85 val_85 1 val_86 86 val_86 1 val_90 90 val_90 1 val_90 90 val_90 1 val_90 90 val_90 1 -val_92 92 val_92 1 val_96 96 val_96 1 +val_97 97 val_97 1 +val_97 97 val_97 1 val_98 98 val_98 1 val_98 98 val_98 1 -val_100 100 val_100 1 -val_100 100 val_100 1 -val_104 104 val_104 1 -val_104 104 val_104 1 -val_114 114 val_114 1 +val_105 105 val_105 1 +val_113 113 val_113 1 +val_113 113 val_113 1 val_116 116 val_116 1 -val_118 118 val_118 1 -val_118 118 val_118 1 -val_120 120 val_120 1 -val_120 120 val_120 1 +val_119 119 val_119 1 +val_119 119 val_119 1 +val_119 119 val_119 1 val_126 126 val_126 1 -val_128 128 val_128 1 -val_128 128 val_128 1 -val_128 128 val_128 1 +val_133 133 val_133 1 val_134 134 val_134 1 val_134 134 val_134 1 -val_136 136 val_136 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 -val_138 138 val_138 1 +val_137 137 val_137 1 +val_137 137 val_137 1 val_146 146 val_146 1 val_146 146 val_146 1 -val_150 150 val_150 1 -val_152 152 val_152 1 -val_152 152 val_152 1 +val_149 149 val_149 1 +val_149 149 val_149 1 +val_153 153 val_153 1 val_156 156 val_156 1 +val_157 157 val_157 1 val_158 158 val_158 1 -val_160 160 val_160 1 val_162 162 val_162 1 +val_163 163 val_163 1 val_164 164 val_164 1 val_164 164 val_164 1 -val_166 166 val_166 1 -val_168 168 val_168 1 -val_170 170 val_170 1 -val_172 172 val_172 1 -val_172 172 val_172 1 -val_174 174 val_174 1 -val_174 174 val_174 1 -val_176 176 val_176 1 -val_176 176 val_176 1 +val_165 165 val_165 1 +val_165 165 val_165 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_169 169 val_169 1 +val_177 177 val_177 1 val_178 178 val_178 1 -val_180 180 val_180 1 -val_186 186 val_186 1 +val_181 181 val_181 1 +val_187 187 val_187 1 +val_187 187 val_187 1 +val_187 187 val_187 1 val_190 190 val_190 1 -val_192 192 val_192 1 -val_194 194 val_194 1 -val_196 196 val_196 1 -val_200 200 val_200 1 -val_200 200 val_200 1 +val_191 191 val_191 1 +val_191 191 val_191 1 +val_195 195 val_195 1 +val_195 195 val_195 1 +val_197 197 val_197 1 +val_197 197 val_197 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_199 199 val_199 1 +val_201 201 val_201 1 val_202 202 val_202 1 val_208 208 val_208 1 val_208 208 val_208 1 @@ -926,63 +915,60 @@ val_208 208 val_208 1 val_214 214 val_214 1 val_216 216 val_216 1 val_216 216 val_216 1 -val_218 218 val_218 1 -val_222 222 val_222 1 -val_224 224 val_224 1 -val_224 224 val_224 1 +val_221 221 val_221 1 +val_221 221 val_221 1 val_226 226 val_226 1 -val_228 228 val_228 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 -val_230 230 val_230 1 +val_229 229 val_229 1 +val_229 229 val_229 1 +val_233 233 val_233 1 +val_233 233 val_233 1 +val_237 237 val_237 1 +val_237 237 val_237 1 val_238 238 val_238 1 val_238 238 val_238 1 -val_242 242 val_242 1 -val_242 242 val_242 1 +val_239 239 val_239 1 +val_239 239 val_239 1 val_244 244 val_244 1 val_248 248 val_248 1 +val_249 249 val_249 1 val_252 252 val_252 1 +val_255 255 val_255 1 +val_255 255 val_255 1 val_256 256 val_256 1 val_256 256 val_256 1 -val_258 258 val_258 1 val_260 260 val_260 1 -val_262 262 val_262 1 val_266 266 val_266 1 val_272 272 val_272 1 val_272 272 val_272 1 -val_274 274 val_274 1 -val_278 278 val_278 1 -val_278 278 val_278 1 -val_280 280 val_280 1 -val_280 280 val_280 1 -val_282 282 val_282 1 -val_282 282 val_282 1 val_284 284 val_284 1 val_286 286 val_286 1 -val_288 288 val_288 1 -val_288 288 val_288 1 +val_287 287 val_287 1 +val_289 289 val_289 1 +val_291 291 val_291 1 val_292 292 val_292 1 -val_296 296 val_296 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_298 298 val_298 1 -val_302 302 val_302 1 -val_306 306 val_306 1 +val_307 307 val_307 1 +val_307 307 val_307 1 val_308 308 val_308 1 val_310 310 val_310 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_311 311 val_311 1 +val_315 315 val_315 1 val_316 316 val_316 1 val_316 316 val_316 1 val_316 316 val_316 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_318 318 val_318 1 -val_322 322 val_322 1 -val_322 322 val_322 1 +val_317 317 val_317 1 +val_317 317 val_317 1 +val_325 325 val_325 1 +val_325 325 val_325 1 +val_327 327 val_327 1 +val_327 327 val_327 1 +val_327 327 val_327 1 val_332 332 val_332 1 val_336 336 val_336 1 val_338 338 val_338 1 +val_339 339 val_339 1 +val_341 341 val_341 1 val_342 342 val_342 1 val_342 342 val_342 1 val_344 344 val_344 1 @@ -992,176 +978,197 @@ val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 val_348 348 val_348 1 -val_356 356 val_356 1 +val_351 351 val_351 1 +val_353 353 val_353 1 +val_353 353 val_353 1 val_360 360 val_360 1 val_362 362 val_362 1 val_364 364 val_364 1 -val_366 366 val_366 1 +val_365 365 val_365 1 val_368 368 val_368 1 -val_374 374 val_374 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_369 369 val_369 1 +val_377 377 val_377 1 val_378 378 val_378 1 -val_382 382 val_382 1 -val_382 382 val_382 1 val_384 384 val_384 1 val_384 384 val_384 1 val_384 384 val_384 1 val_386 386 val_386 1 val_392 392 val_392 1 +val_393 393 val_393 1 val_394 394 val_394 1 val_396 396 val_396 1 val_396 396 val_396 1 val_396 396 val_396 1 -val_400 400 val_400 1 +val_397 397 val_397 1 +val_397 397 val_397 1 +val_399 399 val_399 1 +val_399 399 val_399 1 val_402 402 val_402 1 val_404 404 val_404 1 val_404 404 val_404 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 -val_406 406 val_406 1 +val_407 407 val_407 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_409 409 val_409 1 +val_411 411 val_411 1 val_414 414 val_414 1 val_414 414 val_414 1 -val_418 418 val_418 1 -val_424 424 val_424 1 -val_424 424 val_424 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_417 417 val_417 1 +val_419 419 val_419 1 +val_421 421 val_421 1 +val_427 427 val_427 1 val_430 430 val_430 1 val_430 430 val_430 1 val_430 430 val_430 1 val_432 432 val_432 1 -val_436 436 val_436 1 -val_438 438 val_438 1 -val_438 438 val_438 1 -val_438 438 val_438 1 +val_435 435 val_435 1 +val_437 437 val_437 1 +val_443 443 val_443 1 val_444 444 val_444 1 val_446 446 val_446 1 -val_448 448 val_448 1 +val_449 449 val_449 1 val_452 452 val_452 1 +val_453 453 val_453 1 val_454 454 val_454 1 val_454 454 val_454 1 val_454 454 val_454 1 val_458 458 val_458 1 val_458 458 val_458 1 -val_460 460 val_460 1 -val_462 462 val_462 1 -val_462 462 val_462 1 +val_459 459 val_459 1 +val_459 459 val_459 1 +val_463 463 val_463 1 +val_463 463 val_463 1 val_466 466 val_466 1 val_466 466 val_466 1 val_466 466 val_466 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_468 468 val_468 1 -val_470 470 val_470 1 +val_467 467 val_467 1 val_472 472 val_472 1 val_478 478 val_478 1 val_478 478 val_478 1 +val_479 479 val_479 1 val_480 480 val_480 1 val_480 480 val_480 1 val_480 480 val_480 1 val_482 482 val_482 1 +val_483 483 val_483 1 val_484 484 val_484 1 +val_485 485 val_485 1 val_490 490 val_490 1 -val_492 492 val_492 1 -val_492 492 val_492 1 -val_494 494 val_494 1 -val_496 496 val_496 1 +val_491 491 val_491 1 +val_495 495 val_495 1 +val_497 497 val_497 1 val_498 498 val_498 1 val_498 498 val_498 1 val_498 498 val_498 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_0 0 val_0 1 +val_4 4 val_4 1 val_5 5 val_5 1 val_5 5 val_5 1 val_5 5 val_5 1 +val_8 8 val_8 1 val_9 9 val_9 1 val_11 11 val_11 1 +val_12 12 val_12 1 +val_12 12 val_12 1 val_15 15 val_15 1 val_15 15 val_15 1 -val_17 17 val_17 1 -val_19 19 val_19 1 -val_27 27 val_27 1 +val_18 18 val_18 1 +val_18 18 val_18 1 +val_24 24 val_24 1 +val_24 24 val_24 1 +val_26 26 val_26 1 +val_26 26 val_26 1 +val_28 28 val_28 1 val_33 33 val_33 1 +val_34 34 val_34 1 val_35 35 val_35 1 val_35 35 val_35 1 val_35 35 val_35 1 val_37 37 val_37 1 val_37 37 val_37 1 -val_41 41 val_41 1 -val_43 43 val_43 1 +val_42 42 val_42 1 +val_42 42 val_42 1 +val_44 44 val_44 1 val_47 47 val_47 1 -val_51 51 val_51 1 -val_51 51 val_51 1 val_53 53 val_53 1 -val_57 57 val_57 1 -val_65 65 val_65 1 -val_67 67 val_67 1 -val_67 67 val_67 1 -val_69 69 val_69 1 -val_77 77 val_77 1 -val_83 83 val_83 1 -val_83 83 val_83 1 -val_85 85 val_85 1 +val_66 66 val_66 1 +val_72 72 val_72 1 +val_72 72 val_72 1 +val_74 74 val_74 1 +val_76 76 val_76 1 +val_76 76 val_76 1 +val_78 78 val_78 1 +val_82 82 val_82 1 val_87 87 val_87 1 +val_92 92 val_92 1 val_95 95 val_95 1 val_95 95 val_95 1 -val_97 97 val_97 1 -val_97 97 val_97 1 +val_100 100 val_100 1 +val_100 100 val_100 1 val_103 103 val_103 1 val_103 103 val_103 1 -val_105 105 val_105 1 +val_104 104 val_104 1 +val_104 104 val_104 1 val_111 111 val_111 1 -val_113 113 val_113 1 -val_113 113 val_113 1 -val_119 119 val_119 1 -val_119 119 val_119 1 -val_119 119 val_119 1 +val_114 114 val_114 1 +val_118 118 val_118 1 +val_118 118 val_118 1 +val_120 120 val_120 1 +val_120 120 val_120 1 val_125 125 val_125 1 val_125 125 val_125 1 +val_128 128 val_128 1 +val_128 128 val_128 1 +val_128 128 val_128 1 val_129 129 val_129 1 val_129 129 val_129 1 val_131 131 val_131 1 -val_133 133 val_133 1 -val_137 137 val_137 1 -val_137 137 val_137 1 +val_136 136 val_136 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 +val_138 138 val_138 1 val_143 143 val_143 1 val_145 145 val_145 1 -val_149 149 val_149 1 -val_149 149 val_149 1 -val_153 153 val_153 1 +val_150 150 val_150 1 +val_152 152 val_152 1 +val_152 152 val_152 1 val_155 155 val_155 1 -val_157 157 val_157 1 -val_163 163 val_163 1 -val_165 165 val_165 1 -val_165 165 val_165 1 +val_160 160 val_160 1 +val_166 166 val_166 1 val_167 167 val_167 1 val_167 167 val_167 1 val_167 167 val_167 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 -val_169 169 val_169 1 +val_168 168 val_168 1 +val_170 170 val_170 1 +val_172 172 val_172 1 +val_172 172 val_172 1 +val_174 174 val_174 1 +val_174 174 val_174 1 val_175 175 val_175 1 val_175 175 val_175 1 -val_177 177 val_177 1 +val_176 176 val_176 1 +val_176 176 val_176 1 val_179 179 val_179 1 val_179 179 val_179 1 -val_181 181 val_181 1 +val_180 180 val_180 1 val_183 183 val_183 1 -val_187 187 val_187 1 -val_187 187 val_187 1 -val_187 187 val_187 1 +val_186 186 val_186 1 val_189 189 val_189 1 -val_191 191 val_191 1 -val_191 191 val_191 1 +val_192 192 val_192 1 val_193 193 val_193 1 val_193 193 val_193 1 val_193 193 val_193 1 -val_195 195 val_195 1 -val_195 195 val_195 1 -val_197 197 val_197 1 -val_197 197 val_197 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_199 199 val_199 1 -val_201 201 val_201 1 +val_194 194 val_194 1 +val_196 196 val_196 1 +val_200 200 val_200 1 +val_200 200 val_200 1 val_203 203 val_203 1 val_203 203 val_203 1 val_205 205 val_205 1 @@ -1174,93 +1181,89 @@ val_213 213 val_213 1 val_213 213 val_213 1 val_217 217 val_217 1 val_217 217 val_217 1 +val_218 218 val_218 1 val_219 219 val_219 1 val_219 219 val_219 1 -val_221 221 val_221 1 -val_221 221 val_221 1 +val_222 222 val_222 1 val_223 223 val_223 1 val_223 223 val_223 1 -val_229 229 val_229 1 -val_229 229 val_229 1 -val_233 233 val_233 1 -val_233 233 val_233 1 +val_224 224 val_224 1 +val_224 224 val_224 1 +val_228 228 val_228 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 +val_230 230 val_230 1 val_235 235 val_235 1 -val_237 237 val_237 1 -val_237 237 val_237 1 -val_239 239 val_239 1 -val_239 239 val_239 1 val_241 241 val_241 1 +val_242 242 val_242 1 +val_242 242 val_242 1 val_247 247 val_247 1 -val_249 249 val_249 1 -val_255 255 val_255 1 -val_255 255 val_255 1 val_257 257 val_257 1 +val_258 258 val_258 1 +val_262 262 val_262 1 val_263 263 val_263 1 val_265 265 val_265 1 val_265 265 val_265 1 val_273 273 val_273 1 val_273 273 val_273 1 val_273 273 val_273 1 +val_274 274 val_274 1 val_275 275 val_275 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 val_277 277 val_277 1 +val_278 278 val_278 1 +val_278 278 val_278 1 +val_280 280 val_280 1 +val_280 280 val_280 1 val_281 281 val_281 1 val_281 281 val_281 1 +val_282 282 val_282 1 +val_282 282 val_282 1 val_283 283 val_283 1 val_285 285 val_285 1 -val_287 287 val_287 1 -val_289 289 val_289 1 -val_291 291 val_291 1 +val_288 288 val_288 1 +val_288 288 val_288 1 +val_296 296 val_296 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_298 298 val_298 1 +val_302 302 val_302 1 val_305 305 val_305 1 -val_307 307 val_307 1 -val_307 307 val_307 1 +val_306 306 val_306 1 val_309 309 val_309 1 val_309 309 val_309 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_311 311 val_311 1 -val_315 315 val_315 1 -val_317 317 val_317 1 -val_317 317 val_317 1 +val_318 318 val_318 1 +val_318 318 val_318 1 +val_318 318 val_318 1 val_321 321 val_321 1 val_321 321 val_321 1 +val_322 322 val_322 1 +val_322 322 val_322 1 val_323 323 val_323 1 -val_325 325 val_325 1 -val_325 325 val_325 1 -val_327 327 val_327 1 -val_327 327 val_327 1 -val_327 327 val_327 1 val_331 331 val_331 1 val_331 331 val_331 1 val_333 333 val_333 1 val_333 333 val_333 1 val_335 335 val_335 1 -val_339 339 val_339 1 -val_341 341 val_341 1 val_345 345 val_345 1 -val_351 351 val_351 1 -val_353 353 val_353 1 -val_353 353 val_353 1 -val_365 365 val_365 1 +val_356 356 val_356 1 +val_366 366 val_366 1 val_367 367 val_367 1 val_367 367 val_367 1 -val_369 369 val_369 1 -val_369 369 val_369 1 -val_369 369 val_369 1 val_373 373 val_373 1 +val_374 374 val_374 1 val_375 375 val_375 1 -val_377 377 val_377 1 val_379 379 val_379 1 +val_382 382 val_382 1 +val_382 382 val_382 1 val_389 389 val_389 1 -val_393 393 val_393 1 val_395 395 val_395 1 val_395 395 val_395 1 -val_397 397 val_397 1 -val_397 397 val_397 1 -val_399 399 val_399 1 -val_399 399 val_399 1 +val_400 400 val_400 1 val_401 401 val_401 1 val_401 401 val_401 1 val_401 401 val_401 1 @@ -1269,58 +1272,55 @@ val_401 401 val_401 1 val_403 403 val_403 1 val_403 403 val_403 1 val_403 403 val_403 1 -val_407 407 val_407 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_409 409 val_409 1 -val_411 411 val_411 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 +val_406 406 val_406 1 val_413 413 val_413 1 val_413 413 val_413 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_417 417 val_417 1 -val_419 419 val_419 1 -val_421 421 val_421 1 -val_427 427 val_427 1 +val_418 418 val_418 1 +val_424 424 val_424 1 +val_424 424 val_424 1 val_429 429 val_429 1 val_429 429 val_429 1 val_431 431 val_431 1 val_431 431 val_431 1 val_431 431 val_431 1 -val_435 435 val_435 1 -val_437 437 val_437 1 +val_436 436 val_436 1 +val_438 438 val_438 1 +val_438 438 val_438 1 +val_438 438 val_438 1 val_439 439 val_439 1 val_439 439 val_439 1 -val_443 443 val_443 1 -val_449 449 val_449 1 -val_453 453 val_453 1 +val_448 448 val_448 1 val_455 455 val_455 1 val_457 457 val_457 1 -val_459 459 val_459 1 -val_459 459 val_459 1 -val_463 463 val_463 1 -val_463 463 val_463 1 -val_467 467 val_467 1 +val_460 460 val_460 1 +val_462 462 val_462 1 +val_462 462 val_462 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 +val_468 468 val_468 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 val_469 469 val_469 1 +val_470 470 val_470 1 val_475 475 val_475 1 val_477 477 val_477 1 -val_479 479 val_479 1 val_481 481 val_481 1 -val_483 483 val_483 1 -val_485 485 val_485 1 val_487 487 val_487 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 val_489 489 val_489 1 -val_491 491 val_491 1 +val_492 492 val_492 1 +val_492 492 val_492 1 val_493 493 val_493 1 -val_495 495 val_495 1 -val_497 497 val_497 1 +val_494 494 val_494 1 +val_496 496 val_496 1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2') SELECT a.key+a.key, a.value, a.value FROM test_table1 a WHERE a.ds = '1' diff --git a/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out b/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out index e4681babac..1f74f5fb94 100644 --- a/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out +++ b/ql/src/test/results/clientpositive/spark/smb_mapjoin_22.q.out @@ -107,7 +107,7 @@ POSTHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select count(*) from test_table2 PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -125,7 +125,7 @@ POSTHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 #### A masked pattern was here #### -253 +257 PREHOOK: query: drop table test_table1 PREHOOK: type: DROPTABLE PREHOOK: Input: default@test_table1 @@ -251,7 +251,7 @@ POSTHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table1 #### A masked pattern was here #### -253 +257 PREHOOK: query: select count(*) from test_table2 PREHOOK: type: QUERY PREHOOK: Input: default@test_table2 @@ -269,4 +269,4 @@ POSTHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 2 POSTHOOK: type: QUERY POSTHOOK: Input: default@test_table2 #### A masked pattern was here #### -253 +257 diff --git a/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out b/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out index 16f1277636..4137ccfd83 100644 --- a/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out +++ b/ql/src/test/results/clientpositive/spark/spark_union_merge.q.out @@ -67,6 +67,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -88,6 +89,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -151,6 +153,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -172,6 +175,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -293,6 +297,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -314,6 +319,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -377,6 +383,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -398,6 +405,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/spark/stats0.q.out b/ql/src/test/results/clientpositive/spark/stats0.q.out index 0fae83b7d6..9fbc428383 100644 --- a/ql/src/test/results/clientpositive/spark/stats0.q.out +++ b/ql/src/test/results/clientpositive/spark/stats0.q.out @@ -47,6 +47,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -77,6 +78,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -98,6 +100,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -129,6 +132,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1365,6 +1369,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1395,6 +1400,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1416,6 +1422,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1447,6 +1454,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/spark/stats1.q.out b/ql/src/test/results/clientpositive/spark/stats1.q.out index 29777f901d..892a200cf2 100644 --- a/ql/src/test/results/clientpositive/spark/stats1.q.out +++ b/ql/src/test/results/clientpositive/spark/stats1.q.out @@ -171,6 +171,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 2 numRows 26 rawDataSize 199 @@ -212,6 +213,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 numRows 26 rawDataSize 199 diff --git a/ql/src/test/results/clientpositive/spark/stats10.q.out b/ql/src/test/results/clientpositive/spark/stats10.q.out index d79fc101d2..51d7d41bfc 100644 --- a/ql/src/test/results/clientpositive/spark/stats10.q.out +++ b/ql/src/test/results/clientpositive/spark/stats10.q.out @@ -117,104 +117,93 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket3_1 POSTHOOK: Input: default@bucket3_1@ds=1 #### A masked pattern was here #### -0 val_0 1 -0 val_0 1 -0 val_0 1 2 val_2 1 -4 val_4 1 -8 val_8 1 10 val_10 1 -12 val_12 1 -12 val_12 1 -18 val_18 1 -18 val_18 1 +17 val_17 1 +19 val_19 1 20 val_20 1 -24 val_24 1 -24 val_24 1 -26 val_26 1 -26 val_26 1 -28 val_28 1 +27 val_27 1 30 val_30 1 -34 val_34 1 -42 val_42 1 -42 val_42 1 -44 val_44 1 +41 val_41 1 +43 val_43 1 +51 val_51 1 +51 val_51 1 54 val_54 1 +57 val_57 1 58 val_58 1 58 val_58 1 64 val_64 1 -66 val_66 1 +65 val_65 1 +67 val_67 1 +67 val_67 1 +69 val_69 1 70 val_70 1 70 val_70 1 70 val_70 1 -72 val_72 1 -72 val_72 1 -74 val_74 1 -76 val_76 1 -76 val_76 1 -78 val_78 1 +77 val_77 1 80 val_80 1 -82 val_82 1 +83 val_83 1 +83 val_83 1 84 val_84 1 84 val_84 1 +85 val_85 1 86 val_86 1 90 val_90 1 90 val_90 1 90 val_90 1 -92 val_92 1 96 val_96 1 +97 val_97 1 +97 val_97 1 98 val_98 1 98 val_98 1 -100 val_100 1 -100 val_100 1 -104 val_104 1 -104 val_104 1 -114 val_114 1 +105 val_105 1 +113 val_113 1 +113 val_113 1 116 val_116 1 -118 val_118 1 -118 val_118 1 -120 val_120 1 -120 val_120 1 +119 val_119 1 +119 val_119 1 +119 val_119 1 126 val_126 1 -128 val_128 1 -128 val_128 1 -128 val_128 1 +133 val_133 1 134 val_134 1 134 val_134 1 -136 val_136 1 -138 val_138 1 -138 val_138 1 -138 val_138 1 -138 val_138 1 +137 val_137 1 +137 val_137 1 146 val_146 1 146 val_146 1 -150 val_150 1 -152 val_152 1 -152 val_152 1 +149 val_149 1 +149 val_149 1 +153 val_153 1 156 val_156 1 +157 val_157 1 158 val_158 1 -160 val_160 1 162 val_162 1 +163 val_163 1 164 val_164 1 164 val_164 1 -166 val_166 1 -168 val_168 1 -170 val_170 1 -172 val_172 1 -172 val_172 1 -174 val_174 1 -174 val_174 1 -176 val_176 1 -176 val_176 1 +165 val_165 1 +165 val_165 1 +169 val_169 1 +169 val_169 1 +169 val_169 1 +169 val_169 1 +177 val_177 1 178 val_178 1 -180 val_180 1 -186 val_186 1 +181 val_181 1 +187 val_187 1 +187 val_187 1 +187 val_187 1 190 val_190 1 -192 val_192 1 -194 val_194 1 -196 val_196 1 -200 val_200 1 -200 val_200 1 +191 val_191 1 +191 val_191 1 +195 val_195 1 +195 val_195 1 +197 val_197 1 +197 val_197 1 +199 val_199 1 +199 val_199 1 +199 val_199 1 +201 val_201 1 202 val_202 1 208 val_208 1 208 val_208 1 @@ -222,63 +211,60 @@ POSTHOOK: Input: default@bucket3_1@ds=1 214 val_214 1 216 val_216 1 216 val_216 1 -218 val_218 1 -222 val_222 1 -224 val_224 1 -224 val_224 1 +221 val_221 1 +221 val_221 1 226 val_226 1 -228 val_228 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 +229 val_229 1 +229 val_229 1 +233 val_233 1 +233 val_233 1 +237 val_237 1 +237 val_237 1 238 val_238 1 238 val_238 1 -242 val_242 1 -242 val_242 1 +239 val_239 1 +239 val_239 1 244 val_244 1 248 val_248 1 +249 val_249 1 252 val_252 1 +255 val_255 1 +255 val_255 1 256 val_256 1 256 val_256 1 -258 val_258 1 260 val_260 1 -262 val_262 1 266 val_266 1 272 val_272 1 272 val_272 1 -274 val_274 1 -278 val_278 1 -278 val_278 1 -280 val_280 1 -280 val_280 1 -282 val_282 1 -282 val_282 1 284 val_284 1 286 val_286 1 -288 val_288 1 -288 val_288 1 +287 val_287 1 +289 val_289 1 +291 val_291 1 292 val_292 1 -296 val_296 1 -298 val_298 1 -298 val_298 1 -298 val_298 1 -302 val_302 1 -306 val_306 1 +307 val_307 1 +307 val_307 1 308 val_308 1 310 val_310 1 +311 val_311 1 +311 val_311 1 +311 val_311 1 +315 val_315 1 316 val_316 1 316 val_316 1 316 val_316 1 -318 val_318 1 -318 val_318 1 -318 val_318 1 -322 val_322 1 -322 val_322 1 +317 val_317 1 +317 val_317 1 +325 val_325 1 +325 val_325 1 +327 val_327 1 +327 val_327 1 +327 val_327 1 332 val_332 1 336 val_336 1 338 val_338 1 +339 val_339 1 +341 val_341 1 342 val_342 1 342 val_342 1 344 val_344 1 @@ -288,79 +274,89 @@ POSTHOOK: Input: default@bucket3_1@ds=1 348 val_348 1 348 val_348 1 348 val_348 1 -356 val_356 1 +351 val_351 1 +353 val_353 1 +353 val_353 1 360 val_360 1 362 val_362 1 364 val_364 1 -366 val_366 1 +365 val_365 1 368 val_368 1 -374 val_374 1 +369 val_369 1 +369 val_369 1 +369 val_369 1 +377 val_377 1 378 val_378 1 -382 val_382 1 -382 val_382 1 384 val_384 1 384 val_384 1 384 val_384 1 386 val_386 1 392 val_392 1 +393 val_393 1 394 val_394 1 396 val_396 1 396 val_396 1 396 val_396 1 -400 val_400 1 +397 val_397 1 +397 val_397 1 +399 val_399 1 +399 val_399 1 402 val_402 1 404 val_404 1 404 val_404 1 -406 val_406 1 -406 val_406 1 -406 val_406 1 -406 val_406 1 +407 val_407 1 +409 val_409 1 +409 val_409 1 +409 val_409 1 +411 val_411 1 414 val_414 1 414 val_414 1 -418 val_418 1 -424 val_424 1 -424 val_424 1 +417 val_417 1 +417 val_417 1 +417 val_417 1 +419 val_419 1 +421 val_421 1 +427 val_427 1 430 val_430 1 430 val_430 1 430 val_430 1 432 val_432 1 -436 val_436 1 -438 val_438 1 -438 val_438 1 -438 val_438 1 +435 val_435 1 +437 val_437 1 +443 val_443 1 444 val_444 1 446 val_446 1 -448 val_448 1 +449 val_449 1 452 val_452 1 +453 val_453 1 454 val_454 1 454 val_454 1 454 val_454 1 458 val_458 1 458 val_458 1 -460 val_460 1 -462 val_462 1 -462 val_462 1 +459 val_459 1 +459 val_459 1 +463 val_463 1 +463 val_463 1 466 val_466 1 466 val_466 1 466 val_466 1 -468 val_468 1 -468 val_468 1 -468 val_468 1 -468 val_468 1 -470 val_470 1 +467 val_467 1 472 val_472 1 478 val_478 1 478 val_478 1 +479 val_479 1 480 val_480 1 480 val_480 1 480 val_480 1 482 val_482 1 +483 val_483 1 484 val_484 1 +485 val_485 1 490 val_490 1 -492 val_492 1 -492 val_492 1 -494 val_494 1 -496 val_496 1 +491 val_491 1 +495 val_495 1 +497 val_497 1 498 val_498 1 498 val_498 1 498 val_498 1 @@ -499,6 +495,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numPartitions 2 numRows 1000 diff --git a/ql/src/test/results/clientpositive/spark/stats16.q.out b/ql/src/test/results/clientpositive/spark/stats16.q.out index 659d581548..ba5628479c 100644 --- a/ql/src/test/results/clientpositive/spark/stats16.q.out +++ b/ql/src/test/results/clientpositive/spark/stats16.q.out @@ -27,6 +27,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -75,6 +76,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/spark/stats3.q.out b/ql/src/test/results/clientpositive/spark/stats3.q.out index 212ddccb8e..2c2801d327 100644 --- a/ql/src/test/results/clientpositive/spark/stats3.q.out +++ b/ql/src/test/results/clientpositive/spark/stats3.q.out @@ -36,6 +36,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1 columns.comments @@ -81,6 +82,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 0 rawDataSize 0 @@ -219,6 +221,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numPartitions 1 numRows 6 diff --git a/ql/src/test/results/clientpositive/spark/stats5.q.out b/ql/src/test/results/clientpositive/spark/stats5.q.out index 120420082e..6e88634a0f 100644 --- a/ql/src/test/results/clientpositive/spark/stats5.q.out +++ b/ql/src/test/results/clientpositive/spark/stats5.q.out @@ -59,6 +59,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out index 1f5bd0c188..7bc3296a21 100644 --- a/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out +++ b/ql/src/test/results/clientpositive/spark/stats_noscan_2.q.out @@ -48,6 +48,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} EXTERNAL TRUE + bucketing_version 2 numFiles 1 totalSize 11 #### A masked pattern was here #### @@ -88,6 +89,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} EXTERNAL TRUE + bucketing_version 2 numFiles 1 numRows 6 rawDataSize 6 diff --git a/ql/src/test/results/clientpositive/spark/statsfs.q.out b/ql/src/test/results/clientpositive/spark/statsfs.q.out index fef2040335..1af1495a45 100644 --- a/ql/src/test/results/clientpositive/spark/statsfs.q.out +++ b/ql/src/test/results/clientpositive/spark/statsfs.q.out @@ -274,6 +274,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 @@ -334,6 +335,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out index d2598dc96e..5b8083346d 100644 --- a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out +++ b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out @@ -99,6 +99,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -147,6 +148,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -195,6 +197,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -243,6 +246,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out index d08ace613a..366b40e94e 100644 --- a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out +++ b/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out @@ -101,6 +101,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -149,6 +150,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out b/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out index edeab0b9b1..5c8bf11cc8 100644 --- a/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out +++ b/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out @@ -30,8 +30,8 @@ test_tab GROUP BY INPUT__FILE__NAME POSTHOOK: type: QUERY POSTHOOK: Input: default@test_tab POSTHOOK: Output: hdfs://### HDFS PATH ### -258 -242 +256 +244 PREHOOK: query: TRUNCATE TABLE test_tab COLUMNS (value) PREHOOK: type: TRUNCATETABLE PREHOOK: Input: default@test_tab @@ -54,5 +54,5 @@ test_tab GROUP BY INPUT__FILE__NAME POSTHOOK: type: QUERY POSTHOOK: Input: default@test_tab POSTHOOK: Output: hdfs://### HDFS PATH ### -258 -242 +256 +244 diff --git a/ql/src/test/results/clientpositive/spark/union22.q.out b/ql/src/test/results/clientpositive/spark/union22.q.out index 5425fa2197..d3cb5dc14e 100644 --- a/ql/src/test/results/clientpositive/spark/union22.q.out +++ b/ql/src/test/results/clientpositive/spark/union22.q.out @@ -142,6 +142,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments @@ -191,6 +192,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -243,6 +245,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments @@ -307,6 +310,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -361,6 +365,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -391,6 +396,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments diff --git a/ql/src/test/results/clientpositive/spark/union24.q.out b/ql/src/test/results/clientpositive/spark/union24.q.out index 145869f7f7..4344eca94c 100644 --- a/ql/src/test/results/clientpositive/spark/union24.q.out +++ b/ql/src/test/results/clientpositive/spark/union24.q.out @@ -126,6 +126,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -147,6 +148,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -213,6 +215,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -234,6 +237,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -300,6 +304,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -321,6 +326,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -376,6 +382,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -397,6 +404,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -584,6 +592,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -605,6 +614,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -671,6 +681,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -692,6 +703,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -744,6 +756,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -765,6 +778,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -818,6 +832,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -839,6 +854,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1020,6 +1036,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1041,6 +1058,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1107,6 +1125,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1128,6 +1147,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1180,6 +1200,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1201,6 +1222,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1253,6 +1275,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1274,6 +1297,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments diff --git a/ql/src/test/results/clientpositive/spark/union_ppr.q.out b/ql/src/test/results/clientpositive/spark/union_ppr.q.out index c8e678cf8c..551d4f0e16 100644 --- a/ql/src/test/results/clientpositive/spark/union_ppr.q.out +++ b/ql/src/test/results/clientpositive/spark/union_ppr.q.out @@ -88,6 +88,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -136,6 +137,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -215,6 +217,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -263,6 +266,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out index a619efd341..696eb6349c 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out @@ -155,6 +155,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out index 0e86bb1a74..6a7ed5e7ab 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out @@ -230,6 +230,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 348 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_11.q.out b/ql/src/test/results/clientpositive/spark/union_remove_11.q.out index c4cf2bbec2..524feb5958 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_11.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_11.q.out @@ -220,6 +220,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 totalSize 273 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out index 57a9af71b6..a9d60cbd15 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out @@ -222,6 +222,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 194 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out index 0d21cbaa4d..538aa64557 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out @@ -244,6 +244,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 totalSize 269 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out index 57a9af71b6..a9d60cbd15 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out @@ -222,6 +222,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 194 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out index 58b968840c..574a2c85d3 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out @@ -172,6 +172,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 numPartitions 2 numRows 0 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out index 94ee97e67f..d85b363129 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out @@ -214,6 +214,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 numPartitions 2 numRows 0 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_17.q.out b/ql/src/test/results/clientpositive/spark/union_remove_17.q.out index 7715683ff4..b83ff692d5 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_17.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_17.q.out @@ -150,6 +150,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 0 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out index 1c570c9e4b..f03ef838db 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out @@ -184,6 +184,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 12 numPartitions 6 numRows 0 diff --git a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out index 5d28f00f23..340a1bcc15 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out @@ -155,6 +155,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out index 5bd51c520c..78376e9bf5 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_2.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_2.q.out @@ -180,6 +180,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 68 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_20.q.out b/ql/src/test/results/clientpositive/spark/union_remove_20.q.out index 7ffae80e2d..a971f82ba8 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_20.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_20.q.out @@ -163,6 +163,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_21.q.out b/ql/src/test/results/clientpositive/spark/union_remove_21.q.out index 35bbe82780..b8ae4db262 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_21.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_21.q.out @@ -149,6 +149,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 20 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out index 1e0702039b..0371bacbf7 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_22.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_22.q.out @@ -165,6 +165,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 60 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out index 5d3dce77c4..a177ee2950 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_23.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_23.q.out @@ -216,6 +216,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out index a8dead4c62..6730648559 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_24.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_24.q.out @@ -163,6 +163,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 60 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_3.q.out b/ql/src/test/results/clientpositive/spark/union_remove_3.q.out index 419f002a48..9c6522279b 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_3.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_3.q.out @@ -170,6 +170,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 totalSize 72 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out index e5c8c8f4da..88408fe265 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_4.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_4.q.out @@ -205,6 +205,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out index e76e9db799..fb20b2c5c4 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_5.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_5.q.out @@ -230,6 +230,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 68 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out index 4cf8aca7bd..901f007df3 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_7.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_7.q.out @@ -155,6 +155,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 332 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out index 56720f34f7..b98961657d 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_8.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_8.q.out @@ -180,6 +180,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 348 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out index ec0a86040c..01d35a131e 100644 --- a/ql/src/test/results/clientpositive/spark/union_remove_9.q.out +++ b/ql/src/test/results/clientpositive/spark/union_remove_9.q.out @@ -238,6 +238,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 4 totalSize 348 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/spark/vectorization_0.q.out b/ql/src/test/results/clientpositive/spark/vectorization_0.q.out index c3201bf124..8b73ef2f6f 100644 --- a/ql/src/test/results/clientpositive/spark/vectorization_0.q.out +++ b/ql/src/test/results/clientpositive/spark/vectorization_0.q.out @@ -1817,6 +1817,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -1838,6 +1839,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30637,6 +30639,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30658,6 +30661,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30750,6 +30754,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30771,6 +30776,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30864,6 +30870,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30885,6 +30892,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30968,6 +30976,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments @@ -30989,6 +30998,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"cbigint":"true","cboolean1":"true","cboolean2":"true","cdouble":"true","cfloat":"true","cint":"true","csmallint":"true","cstring1":"true","cstring2":"true","ctimestamp1":"true","ctimestamp2":"true","ctinyint":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns ctinyint,csmallint,cint,cbigint,cfloat,cdouble,cstring1,cstring2,ctimestamp1,ctimestamp2,cboolean1,cboolean2 columns.comments diff --git a/ql/src/test/results/clientpositive/stats0.q.out b/ql/src/test/results/clientpositive/stats0.q.out index dc77befb04..47c71a7fb2 100644 --- a/ql/src/test/results/clientpositive/stats0.q.out +++ b/ql/src/test/results/clientpositive/stats0.q.out @@ -44,6 +44,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -90,6 +91,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -111,6 +113,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -171,6 +174,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1449,6 +1453,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1495,6 +1500,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1516,6 +1522,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -1585,6 +1592,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1628,6 +1636,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1658,6 +1667,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1679,6 +1689,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1715,6 +1726,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1745,6 +1757,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -1766,6 +1779,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/stats1.q.out b/ql/src/test/results/clientpositive/stats1.q.out index 461d27ee73..8d89c1648c 100644 --- a/ql/src/test/results/clientpositive/stats1.q.out +++ b/ql/src/test/results/clientpositive/stats1.q.out @@ -222,6 +222,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 2 numRows 26 rawDataSize 199 @@ -263,6 +264,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 numRows 26 rawDataSize 199 diff --git a/ql/src/test/results/clientpositive/stats10.q.out b/ql/src/test/results/clientpositive/stats10.q.out index 75261cb97b..a226424cc0 100644 --- a/ql/src/test/results/clientpositive/stats10.q.out +++ b/ql/src/test/results/clientpositive/stats10.q.out @@ -161,104 +161,93 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@bucket3_1 POSTHOOK: Input: default@bucket3_1@ds=1 #### A masked pattern was here #### -0 val_0 1 -0 val_0 1 -0 val_0 1 2 val_2 1 -4 val_4 1 -8 val_8 1 10 val_10 1 -12 val_12 1 -12 val_12 1 -18 val_18 1 -18 val_18 1 +17 val_17 1 +19 val_19 1 20 val_20 1 -24 val_24 1 -24 val_24 1 -26 val_26 1 -26 val_26 1 -28 val_28 1 +27 val_27 1 30 val_30 1 -34 val_34 1 -42 val_42 1 -42 val_42 1 -44 val_44 1 +41 val_41 1 +43 val_43 1 +51 val_51 1 +51 val_51 1 54 val_54 1 +57 val_57 1 58 val_58 1 58 val_58 1 64 val_64 1 -66 val_66 1 +65 val_65 1 +67 val_67 1 +67 val_67 1 +69 val_69 1 70 val_70 1 70 val_70 1 70 val_70 1 -72 val_72 1 -72 val_72 1 -74 val_74 1 -76 val_76 1 -76 val_76 1 -78 val_78 1 +77 val_77 1 80 val_80 1 -82 val_82 1 +83 val_83 1 +83 val_83 1 84 val_84 1 84 val_84 1 +85 val_85 1 86 val_86 1 90 val_90 1 90 val_90 1 90 val_90 1 -92 val_92 1 96 val_96 1 +97 val_97 1 +97 val_97 1 98 val_98 1 98 val_98 1 -100 val_100 1 -100 val_100 1 -104 val_104 1 -104 val_104 1 -114 val_114 1 +105 val_105 1 +113 val_113 1 +113 val_113 1 116 val_116 1 -118 val_118 1 -118 val_118 1 -120 val_120 1 -120 val_120 1 +119 val_119 1 +119 val_119 1 +119 val_119 1 126 val_126 1 -128 val_128 1 -128 val_128 1 -128 val_128 1 +133 val_133 1 134 val_134 1 134 val_134 1 -136 val_136 1 -138 val_138 1 -138 val_138 1 -138 val_138 1 -138 val_138 1 +137 val_137 1 +137 val_137 1 146 val_146 1 146 val_146 1 -150 val_150 1 -152 val_152 1 -152 val_152 1 +149 val_149 1 +149 val_149 1 +153 val_153 1 156 val_156 1 +157 val_157 1 158 val_158 1 -160 val_160 1 162 val_162 1 +163 val_163 1 164 val_164 1 164 val_164 1 -166 val_166 1 -168 val_168 1 -170 val_170 1 -172 val_172 1 -172 val_172 1 -174 val_174 1 -174 val_174 1 -176 val_176 1 -176 val_176 1 +165 val_165 1 +165 val_165 1 +169 val_169 1 +169 val_169 1 +169 val_169 1 +169 val_169 1 +177 val_177 1 178 val_178 1 -180 val_180 1 -186 val_186 1 +181 val_181 1 +187 val_187 1 +187 val_187 1 +187 val_187 1 190 val_190 1 -192 val_192 1 -194 val_194 1 -196 val_196 1 -200 val_200 1 -200 val_200 1 +191 val_191 1 +191 val_191 1 +195 val_195 1 +195 val_195 1 +197 val_197 1 +197 val_197 1 +199 val_199 1 +199 val_199 1 +199 val_199 1 +201 val_201 1 202 val_202 1 208 val_208 1 208 val_208 1 @@ -266,63 +255,60 @@ POSTHOOK: Input: default@bucket3_1@ds=1 214 val_214 1 216 val_216 1 216 val_216 1 -218 val_218 1 -222 val_222 1 -224 val_224 1 -224 val_224 1 +221 val_221 1 +221 val_221 1 226 val_226 1 -228 val_228 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 -230 val_230 1 +229 val_229 1 +229 val_229 1 +233 val_233 1 +233 val_233 1 +237 val_237 1 +237 val_237 1 238 val_238 1 238 val_238 1 -242 val_242 1 -242 val_242 1 +239 val_239 1 +239 val_239 1 244 val_244 1 248 val_248 1 +249 val_249 1 252 val_252 1 +255 val_255 1 +255 val_255 1 256 val_256 1 256 val_256 1 -258 val_258 1 260 val_260 1 -262 val_262 1 266 val_266 1 272 val_272 1 272 val_272 1 -274 val_274 1 -278 val_278 1 -278 val_278 1 -280 val_280 1 -280 val_280 1 -282 val_282 1 -282 val_282 1 284 val_284 1 286 val_286 1 -288 val_288 1 -288 val_288 1 +287 val_287 1 +289 val_289 1 +291 val_291 1 292 val_292 1 -296 val_296 1 -298 val_298 1 -298 val_298 1 -298 val_298 1 -302 val_302 1 -306 val_306 1 +307 val_307 1 +307 val_307 1 308 val_308 1 310 val_310 1 +311 val_311 1 +311 val_311 1 +311 val_311 1 +315 val_315 1 316 val_316 1 316 val_316 1 316 val_316 1 -318 val_318 1 -318 val_318 1 -318 val_318 1 -322 val_322 1 -322 val_322 1 +317 val_317 1 +317 val_317 1 +325 val_325 1 +325 val_325 1 +327 val_327 1 +327 val_327 1 +327 val_327 1 332 val_332 1 336 val_336 1 338 val_338 1 +339 val_339 1 +341 val_341 1 342 val_342 1 342 val_342 1 344 val_344 1 @@ -332,79 +318,89 @@ POSTHOOK: Input: default@bucket3_1@ds=1 348 val_348 1 348 val_348 1 348 val_348 1 -356 val_356 1 +351 val_351 1 +353 val_353 1 +353 val_353 1 360 val_360 1 362 val_362 1 364 val_364 1 -366 val_366 1 +365 val_365 1 368 val_368 1 -374 val_374 1 +369 val_369 1 +369 val_369 1 +369 val_369 1 +377 val_377 1 378 val_378 1 -382 val_382 1 -382 val_382 1 384 val_384 1 384 val_384 1 384 val_384 1 386 val_386 1 392 val_392 1 +393 val_393 1 394 val_394 1 396 val_396 1 396 val_396 1 396 val_396 1 -400 val_400 1 +397 val_397 1 +397 val_397 1 +399 val_399 1 +399 val_399 1 402 val_402 1 404 val_404 1 404 val_404 1 -406 val_406 1 -406 val_406 1 -406 val_406 1 -406 val_406 1 +407 val_407 1 +409 val_409 1 +409 val_409 1 +409 val_409 1 +411 val_411 1 414 val_414 1 414 val_414 1 -418 val_418 1 -424 val_424 1 -424 val_424 1 +417 val_417 1 +417 val_417 1 +417 val_417 1 +419 val_419 1 +421 val_421 1 +427 val_427 1 430 val_430 1 430 val_430 1 430 val_430 1 432 val_432 1 -436 val_436 1 -438 val_438 1 -438 val_438 1 -438 val_438 1 +435 val_435 1 +437 val_437 1 +443 val_443 1 444 val_444 1 446 val_446 1 -448 val_448 1 +449 val_449 1 452 val_452 1 +453 val_453 1 454 val_454 1 454 val_454 1 454 val_454 1 458 val_458 1 458 val_458 1 -460 val_460 1 -462 val_462 1 -462 val_462 1 +459 val_459 1 +459 val_459 1 +463 val_463 1 +463 val_463 1 466 val_466 1 466 val_466 1 466 val_466 1 -468 val_468 1 -468 val_468 1 -468 val_468 1 -468 val_468 1 -470 val_470 1 +467 val_467 1 472 val_472 1 478 val_478 1 478 val_478 1 +479 val_479 1 480 val_480 1 480 val_480 1 480 val_480 1 482 val_482 1 +483 val_483 1 484 val_484 1 +485 val_485 1 490 val_490 1 -492 val_492 1 -492 val_492 1 -494 val_494 1 -496 val_496 1 +491 val_491 1 +495 val_495 1 +497 val_497 1 498 val_498 1 498 val_498 1 498 val_498 1 @@ -540,6 +536,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 4 numPartitions 2 numRows 1000 diff --git a/ql/src/test/results/clientpositive/stats16.q.out b/ql/src/test/results/clientpositive/stats16.q.out index 659d581548..ba5628479c 100644 --- a/ql/src/test/results/clientpositive/stats16.q.out +++ b/ql/src/test/results/clientpositive/stats16.q.out @@ -27,6 +27,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -75,6 +76,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/stats3.q.out b/ql/src/test/results/clientpositive/stats3.q.out index 212ddccb8e..2c2801d327 100644 --- a/ql/src/test/results/clientpositive/stats3.q.out +++ b/ql/src/test/results/clientpositive/stats3.q.out @@ -36,6 +36,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns col1 columns.comments @@ -81,6 +82,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 0 rawDataSize 0 @@ -219,6 +221,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numPartitions 1 numRows 6 diff --git a/ql/src/test/results/clientpositive/stats5.q.out b/ql/src/test/results/clientpositive/stats5.q.out index 8d4f9c4dd2..c375c11246 100644 --- a/ql/src/test/results/clientpositive/stats5.q.out +++ b/ql/src/test/results/clientpositive/stats5.q.out @@ -56,6 +56,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/stats_empty_partition2.q.out b/ql/src/test/results/clientpositive/stats_empty_partition2.q.out index 6d56f83102..04bf3a114d 100644 --- a/ql/src/test/results/clientpositive/stats_empty_partition2.q.out +++ b/ql/src/test/results/clientpositive/stats_empty_partition2.q.out @@ -155,6 +155,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numPartitions 2 numRows 1 diff --git a/ql/src/test/results/clientpositive/stats_invalidation.q.out b/ql/src/test/results/clientpositive/stats_invalidation.q.out index 8200582784..7843852da0 100644 --- a/ql/src/test/results/clientpositive/stats_invalidation.q.out +++ b/ql/src/test/results/clientpositive/stats_invalidation.q.out @@ -46,6 +46,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 @@ -89,6 +90,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 500 diff --git a/ql/src/test/results/clientpositive/stats_list_bucket.q.out b/ql/src/test/results/clientpositive/stats_list_bucket.q.out index 369c5b8410..566af31192 100644 --- a/ql/src/test/results/clientpositive/stats_list_bucket.q.out +++ b/ql/src/test/results/clientpositive/stats_list_bucket.q.out @@ -131,6 +131,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"c1\":\"true\",\"c2\":\"true\"}} + bucketing_version 2 numFiles 4 numRows 500 rawDataSize 4812 diff --git a/ql/src/test/results/clientpositive/stats_noscan_2.q.out b/ql/src/test/results/clientpositive/stats_noscan_2.q.out index ef397c3c84..71c7097c94 100644 --- a/ql/src/test/results/clientpositive/stats_noscan_2.q.out +++ b/ql/src/test/results/clientpositive/stats_noscan_2.q.out @@ -48,6 +48,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} EXTERNAL TRUE + bucketing_version 2 numFiles 1 totalSize 11 #### A masked pattern was here #### @@ -88,6 +89,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} EXTERNAL TRUE + bucketing_version 2 numFiles 1 numRows 6 rawDataSize 6 diff --git a/ql/src/test/results/clientpositive/statsfs.q.out b/ql/src/test/results/clientpositive/statsfs.q.out index 07d5b1c1ee..aa9786be32 100644 --- a/ql/src/test/results/clientpositive/statsfs.q.out +++ b/ql/src/test/results/clientpositive/statsfs.q.out @@ -274,6 +274,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 @@ -334,6 +335,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 500 rawDataSize 5312 diff --git a/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out b/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out index a4a320c7ec..598bf8efaa 100644 --- a/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out +++ b/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out @@ -60,6 +60,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -109,6 +110,7 @@ Retention: 0 Table Type: EXTERNAL_TABLE Table Parameters: EXTERNAL TRUE + bucketing_version 2 numFiles 1 numRows 0 rawDataSize 0 @@ -248,6 +250,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments @@ -269,6 +272,7 @@ STAGE PLANS: properties: EXTERNAL TRUE bucket_count -1 + bucketing_version 2 column.name.delimiter , columns sourceip,desturl,visitdate,adrevenue,useragent,ccode,lcode,skeyword,avgtimeonsite columns.comments @@ -364,6 +368,7 @@ Table Type: EXTERNAL_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"adRevenue\":\"true\",\"avgTimeOnSite\":\"true\",\"sourceIP\":\"true\"}} EXTERNAL TRUE + bucketing_version 2 numFiles 1 numRows 55 rawDataSize 7005 diff --git a/ql/src/test/results/clientpositive/transform_ppr1.q.out b/ql/src/test/results/clientpositive/transform_ppr1.q.out index b0c23931b2..63442399d1 100644 --- a/ql/src/test/results/clientpositive/transform_ppr1.q.out +++ b/ql/src/test/results/clientpositive/transform_ppr1.q.out @@ -94,6 +94,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -142,6 +143,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -190,6 +192,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -238,6 +241,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/transform_ppr2.q.out b/ql/src/test/results/clientpositive/transform_ppr2.q.out index 42b363839d..9555e5a2d4 100644 --- a/ql/src/test/results/clientpositive/transform_ppr2.q.out +++ b/ql/src/test/results/clientpositive/transform_ppr2.q.out @@ -96,6 +96,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -144,6 +145,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/truncate_column.q.out b/ql/src/test/results/clientpositive/truncate_column.q.out index 8c00c57289..cc580728ac 100644 --- a/ql/src/test/results/clientpositive/truncate_column.q.out +++ b/ql/src/test/results/clientpositive/truncate_column.q.out @@ -36,6 +36,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 94 @@ -95,6 +96,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 94 @@ -164,6 +166,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 94 @@ -223,6 +226,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 numRows 10 rawDataSize 94 @@ -293,6 +297,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -353,6 +358,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 @@ -413,6 +419,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 #### A masked pattern was here #### numFiles 1 numRows 10 diff --git a/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out b/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out index 61502c6bc1..c9807b3235 100644 --- a/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out +++ b/ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out @@ -90,6 +90,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments @@ -172,6 +173,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments diff --git a/ql/src/test/results/clientpositive/udf_explode.q.out b/ql/src/test/results/clientpositive/udf_explode.q.out index 488d460a65..5ef38fe696 100644 --- a/ql/src/test/results/clientpositive/udf_explode.q.out +++ b/ql/src/test/results/clientpositive/udf_explode.q.out @@ -86,6 +86,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -107,6 +108,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -272,6 +274,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -293,6 +296,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/udtf_explode.q.out b/ql/src/test/results/clientpositive/udtf_explode.q.out index d0da547430..e0bed78e75 100644 --- a/ql/src/test/results/clientpositive/udtf_explode.q.out +++ b/ql/src/test/results/clientpositive/udtf_explode.q.out @@ -91,6 +91,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -112,6 +113,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -356,6 +358,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -377,6 +380,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/unicode_comments.q.out b/ql/src/test/results/clientpositive/unicode_comments.q.out index ae8c3e5ade..7e7768bc6a 100644 --- a/ql/src/test/results/clientpositive/unicode_comments.q.out +++ b/ql/src/test/results/clientpositive/unicode_comments.q.out @@ -62,6 +62,7 @@ OUTPUTFORMAT LOCATION #### A masked pattern was here #### TBLPROPERTIES ( + 'bucketing_version'='2', #### A masked pattern was here #### PREHOOK: query: describe formatted unicode_comments_tbl1 PREHOOK: type: DESCTABLE @@ -84,6 +85,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 comment 表格 numFiles 0 numPartitions 0 @@ -124,6 +126,7 @@ Database: unicode_comments_db Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 comment 视图 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/unicode_notation.q.out b/ql/src/test/results/clientpositive/unicode_notation.q.out index 9ac938ee9d..a4eaaffb40 100644 --- a/ql/src/test/results/clientpositive/unicode_notation.q.out +++ b/ql/src/test/results/clientpositive/unicode_notation.q.out @@ -23,6 +23,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -73,6 +74,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -123,6 +125,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\"}} + bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 diff --git a/ql/src/test/results/clientpositive/union22.q.out b/ql/src/test/results/clientpositive/union22.q.out index 50d06c0cd2..9e329f3400 100644 --- a/ql/src/test/results/clientpositive/union22.q.out +++ b/ql/src/test/results/clientpositive/union22.q.out @@ -121,6 +121,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments @@ -249,6 +250,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -296,6 +298,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments @@ -344,6 +347,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -397,6 +401,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -490,6 +495,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments @@ -555,6 +561,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -660,6 +667,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k1,k2,k3,k4 columns.comments @@ -707,6 +715,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns k0,k1,k2,k3,k4,k5 columns.comments diff --git a/ql/src/test/results/clientpositive/union24.q.out b/ql/src/test/results/clientpositive/union24.q.out index dfa614ed68..81dba3e2e7 100644 --- a/ql/src/test/results/clientpositive/union24.q.out +++ b/ql/src/test/results/clientpositive/union24.q.out @@ -111,6 +111,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -132,6 +133,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -348,6 +350,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -369,6 +372,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -394,6 +398,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -415,6 +420,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -440,6 +446,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -461,6 +468,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -623,6 +631,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -644,6 +653,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -669,6 +679,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -690,6 +701,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -877,6 +889,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -898,6 +911,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -923,6 +937,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -944,6 +959,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1095,6 +1111,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1116,6 +1133,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1141,6 +1159,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1162,6 +1181,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1419,6 +1439,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1440,6 +1461,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1465,6 +1487,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments @@ -1486,6 +1509,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,count columns.comments diff --git a/ql/src/test/results/clientpositive/union_pos_alias.q.out b/ql/src/test/results/clientpositive/union_pos_alias.q.out index 493316b3c5..fc49174879 100644 --- a/ql/src/test/results/clientpositive/union_pos_alias.q.out +++ b/ql/src/test/results/clientpositive/union_pos_alias.q.out @@ -336,6 +336,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/union_ppr.q.out b/ql/src/test/results/clientpositive/union_ppr.q.out index 8633c1289c..1be1e815ce 100644 --- a/ql/src/test/results/clientpositive/union_ppr.q.out +++ b/ql/src/test/results/clientpositive/union_ppr.q.out @@ -110,6 +110,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -158,6 +159,7 @@ STAGE PLANS: output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat properties: bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' diff --git a/ql/src/test/results/clientpositive/union_remove_1.q.out b/ql/src/test/results/clientpositive/union_remove_1.q.out index c5ef1525f1..7c09071ee1 100644 --- a/ql/src/test/results/clientpositive/union_remove_1.q.out +++ b/ql/src/test/results/clientpositive/union_remove_1.q.out @@ -171,6 +171,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_10.q.out b/ql/src/test/results/clientpositive/union_remove_10.q.out index 500c123532..39cb313209 100644 --- a/ql/src/test/results/clientpositive/union_remove_10.q.out +++ b/ql/src/test/results/clientpositive/union_remove_10.q.out @@ -222,6 +222,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 totalSize 271 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_11.q.out b/ql/src/test/results/clientpositive/union_remove_11.q.out index 39de6a2255..4fc7659ae9 100644 --- a/ql/src/test/results/clientpositive/union_remove_11.q.out +++ b/ql/src/test/results/clientpositive/union_remove_11.q.out @@ -211,6 +211,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 totalSize 115 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_12.q.out b/ql/src/test/results/clientpositive/union_remove_12.q.out index 29141e1b01..4c2ac88fdb 100644 --- a/ql/src/test/results/clientpositive/union_remove_12.q.out +++ b/ql/src/test/results/clientpositive/union_remove_12.q.out @@ -212,6 +212,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 194 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_13.q.out b/ql/src/test/results/clientpositive/union_remove_13.q.out index 5e3983a374..819028b36e 100644 --- a/ql/src/test/results/clientpositive/union_remove_13.q.out +++ b/ql/src/test/results/clientpositive/union_remove_13.q.out @@ -231,6 +231,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 192 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_14.q.out b/ql/src/test/results/clientpositive/union_remove_14.q.out index 29141e1b01..4c2ac88fdb 100644 --- a/ql/src/test/results/clientpositive/union_remove_14.q.out +++ b/ql/src/test/results/clientpositive/union_remove_14.q.out @@ -212,6 +212,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 194 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_15.q.out b/ql/src/test/results/clientpositive/union_remove_15.q.out index 2f34a37e4f..f03b70124b 100644 --- a/ql/src/test/results/clientpositive/union_remove_15.q.out +++ b/ql/src/test/results/clientpositive/union_remove_15.q.out @@ -188,6 +188,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 0 diff --git a/ql/src/test/results/clientpositive/union_remove_16.q.out b/ql/src/test/results/clientpositive/union_remove_16.q.out index 8c0ef93aab..3aa2be1d01 100644 --- a/ql/src/test/results/clientpositive/union_remove_16.q.out +++ b/ql/src/test/results/clientpositive/union_remove_16.q.out @@ -222,6 +222,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 0 diff --git a/ql/src/test/results/clientpositive/union_remove_17.q.out b/ql/src/test/results/clientpositive/union_remove_17.q.out index 4e50b23569..460d085f15 100644 --- a/ql/src/test/results/clientpositive/union_remove_17.q.out +++ b/ql/src/test/results/clientpositive/union_remove_17.q.out @@ -149,6 +149,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 numPartitions 2 numRows 0 diff --git a/ql/src/test/results/clientpositive/union_remove_18.q.out b/ql/src/test/results/clientpositive/union_remove_18.q.out index 9195eff044..cb7e99cad8 100644 --- a/ql/src/test/results/clientpositive/union_remove_18.q.out +++ b/ql/src/test/results/clientpositive/union_remove_18.q.out @@ -200,6 +200,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 12 numPartitions 6 numRows 0 diff --git a/ql/src/test/results/clientpositive/union_remove_19.q.out b/ql/src/test/results/clientpositive/union_remove_19.q.out index 8f9be65d0b..808a351f29 100644 --- a/ql/src/test/results/clientpositive/union_remove_19.q.out +++ b/ql/src/test/results/clientpositive/union_remove_19.q.out @@ -171,6 +171,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_2.q.out b/ql/src/test/results/clientpositive/union_remove_2.q.out index cd1f243a2a..b8a8d7e3f2 100644 --- a/ql/src/test/results/clientpositive/union_remove_2.q.out +++ b/ql/src/test/results/clientpositive/union_remove_2.q.out @@ -180,6 +180,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 totalSize 68 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_20.q.out b/ql/src/test/results/clientpositive/union_remove_20.q.out index 02fe296f75..9b986b3000 100644 --- a/ql/src/test/results/clientpositive/union_remove_20.q.out +++ b/ql/src/test/results/clientpositive/union_remove_20.q.out @@ -179,6 +179,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_21.q.out b/ql/src/test/results/clientpositive/union_remove_21.q.out index 9af1bac53e..bc21e22d93 100644 --- a/ql/src/test/results/clientpositive/union_remove_21.q.out +++ b/ql/src/test/results/clientpositive/union_remove_21.q.out @@ -163,6 +163,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 20 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_22.q.out b/ql/src/test/results/clientpositive/union_remove_22.q.out index 12c0b189cd..3167be4b0d 100644 --- a/ql/src/test/results/clientpositive/union_remove_22.q.out +++ b/ql/src/test/results/clientpositive/union_remove_22.q.out @@ -181,6 +181,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 60 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_23.q.out b/ql/src/test/results/clientpositive/union_remove_23.q.out index bc8edc0076..e19d6cd5d9 100644 --- a/ql/src/test/results/clientpositive/union_remove_23.q.out +++ b/ql/src/test/results/clientpositive/union_remove_23.q.out @@ -219,6 +219,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_24.q.out b/ql/src/test/results/clientpositive/union_remove_24.q.out index a0a7d380fd..6bbfa9682d 100644 --- a/ql/src/test/results/clientpositive/union_remove_24.q.out +++ b/ql/src/test/results/clientpositive/union_remove_24.q.out @@ -179,6 +179,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 60 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_3.q.out b/ql/src/test/results/clientpositive/union_remove_3.q.out index b3630a793f..28fb92b7e8 100644 --- a/ql/src/test/results/clientpositive/union_remove_3.q.out +++ b/ql/src/test/results/clientpositive/union_remove_3.q.out @@ -169,6 +169,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 1 totalSize 72 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_4.q.out b/ql/src/test/results/clientpositive/union_remove_4.q.out index e5d0807407..f0be72179f 100644 --- a/ql/src/test/results/clientpositive/union_remove_4.q.out +++ b/ql/src/test/results/clientpositive/union_remove_4.q.out @@ -215,6 +215,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 40 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_5.q.out b/ql/src/test/results/clientpositive/union_remove_5.q.out index f60b88bbd8..e9e1173988 100644 --- a/ql/src/test/results/clientpositive/union_remove_5.q.out +++ b/ql/src/test/results/clientpositive/union_remove_5.q.out @@ -224,6 +224,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 totalSize 68 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_7.q.out b/ql/src/test/results/clientpositive/union_remove_7.q.out index b64b3b031b..fb8fb421b0 100644 --- a/ql/src/test/results/clientpositive/union_remove_7.q.out +++ b/ql/src/test/results/clientpositive/union_remove_7.q.out @@ -171,6 +171,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 178 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_8.q.out b/ql/src/test/results/clientpositive/union_remove_8.q.out index f1ae75ac32..23821d32d1 100644 --- a/ql/src/test/results/clientpositive/union_remove_8.q.out +++ b/ql/src/test/results/clientpositive/union_remove_8.q.out @@ -180,6 +180,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 3 totalSize 271 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_remove_9.q.out b/ql/src/test/results/clientpositive/union_remove_9.q.out index 6baecd5d47..2b4ee4c14f 100644 --- a/ql/src/test/results/clientpositive/union_remove_9.q.out +++ b/ql/src/test/results/clientpositive/union_remove_9.q.out @@ -229,6 +229,7 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + bucketing_version 2 numFiles 2 totalSize 192 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/union_stats.q.out b/ql/src/test/results/clientpositive/union_stats.q.out index 5b6ada76e9..8bd3f44b6e 100644 --- a/ql/src/test/results/clientpositive/union_stats.q.out +++ b/ql/src/test/results/clientpositive/union_stats.q.out @@ -90,6 +90,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -111,6 +112,7 @@ STAGE PLANS: properties: COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}} bucket_count -1 + bucketing_version 2 column.name.delimiter , columns key,value columns.comments 'default','default' @@ -313,6 +315,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1000 rawDataSize 10624 @@ -361,6 +364,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1500 rawDataSize 15936 @@ -417,6 +421,7 @@ Retention: 0 Table Type: MANAGED_TABLE Table Parameters: COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\"} + bucketing_version 2 numFiles 1 numRows 1500 rawDataSize 15936 diff --git a/ql/src/test/results/clientpositive/unset_table_view_property.q.out b/ql/src/test/results/clientpositive/unset_table_view_property.q.out index 7097963e42..588797160c 100644 --- a/ql/src/test/results/clientpositive/unset_table_view_property.q.out +++ b/ql/src/test/results/clientpositive/unset_table_view_property.q.out @@ -17,6 +17,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} +bucketing_version 2 numFiles 0 numRows 0 rawDataSize 0 @@ -36,6 +37,7 @@ POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} a 1 +bucketing_version 2 c 3 #### A masked pattern was here #### numFiles 0 @@ -56,6 +58,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -76,6 +79,7 @@ POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} a 1 +bucketing_version 2 c 3 d 4 #### A masked pattern was here #### @@ -97,6 +101,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} +bucketing_version 2 c 3 #### A masked pattern was here #### numFiles 0 @@ -117,6 +122,7 @@ PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -138,6 +144,7 @@ POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} a 1 b 2 +bucketing_version 2 c 3 d 4 #### A masked pattern was here #### @@ -160,6 +167,7 @@ POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} a 1 +bucketing_version 2 c 3 #### A masked pattern was here #### numFiles 0 @@ -181,6 +189,7 @@ POSTHOOK: query: SHOW TBLPROPERTIES vt.testTable POSTHOOK: type: SHOW_TBLPROPERTIES COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"col1":"true","col2":"true"}} a 1 +bucketing_version 2 #### A masked pattern was here #### numFiles 0 numRows 0 @@ -218,6 +227,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### propA 100 propB 200 @@ -234,6 +244,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### PREHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propC'='300', 'propD'='400') PREHOOK: type: ALTERVIEW_PROPERTIES @@ -247,6 +258,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### propA 100 propC 300 @@ -264,6 +276,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### propD 400 #### A masked pattern was here #### @@ -279,6 +292,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### PREHOOK: query: ALTER VIEW vt.testView SET TBLPROPERTIES ('propA'='100', 'propB' = '200', 'propC'='300', 'propD'='400') PREHOOK: type: ALTERVIEW_PROPERTIES @@ -292,6 +306,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### propA 100 propB 200 @@ -310,6 +325,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### propA 100 propB 200 @@ -326,6 +342,7 @@ PREHOOK: query: SHOW TBLPROPERTIES vt.testView PREHOOK: type: SHOW_TBLPROPERTIES POSTHOOK: query: SHOW TBLPROPERTIES vt.testView POSTHOOK: type: SHOW_TBLPROPERTIES +bucketing_version 2 #### A masked pattern was here #### propA 100 #### A masked pattern was here #### diff --git a/ql/src/test/results/clientpositive/view_alias.q.out b/ql/src/test/results/clientpositive/view_alias.q.out index 6e3c2b520e..bbd721abfe 100644 --- a/ql/src/test/results/clientpositive/view_alias.q.out +++ b/ql/src/test/results/clientpositive/view_alias.q.out @@ -30,6 +30,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -96,6 +97,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -164,6 +166,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -232,6 +235,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -298,6 +302,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -412,6 +417,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/ql/src/test/results/clientpositive/view_cbo.q.out b/ql/src/test/results/clientpositive/view_cbo.q.out index 3983e5bbad..747c4c2362 100644 --- a/ql/src/test/results/clientpositive/view_cbo.q.out +++ b/ql/src/test/results/clientpositive/view_cbo.q.out @@ -121,6 +121,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -190,6 +191,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -269,6 +271,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -330,6 +333,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -379,6 +383,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -428,6 +433,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -479,6 +485,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -530,6 +537,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -581,6 +589,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information @@ -632,6 +641,7 @@ Database: default Retention: 0 Table Type: VIRTUAL_VIEW Table Parameters: + bucketing_version 2 #### A masked pattern was here #### # Storage Information diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java index e5b90c25e9..1dc9de7273 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/binarysortable/BinarySortableSerDe.java @@ -700,7 +700,7 @@ public static void writeByte(RandomAccessOutput buffer, byte b, boolean invert) buffer.write(b); } - static void serialize(ByteStream.Output buffer, Object o, ObjectInspector oi, + public static void serialize(ByteStream.Output buffer, Object o, ObjectInspector oi, boolean invert, byte nullMarker, byte notNullMarker) throws SerDeException { // Is this field a null? if (o == null) { diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java index 8823d41274..1e0d1f3904 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java @@ -21,6 +21,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.Type; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -28,9 +29,12 @@ import java.util.List; import java.util.Map; +import org.apache.hadoop.hive.serde2.ByteStream; +import org.apache.hadoop.hive.serde2.binarysortable.BinarySortableSerDe; import org.apache.hadoop.hive.serde2.io.TimestampLocalTZWritable; import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableTimestampLocalTZObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampLocalTZObjectInspector; +import org.apache.hive.common.util.Murmur3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.hive.serde.serdeConstants; @@ -154,7 +158,7 @@ public boolean equals(Object obj) { @Override public int hashCode() { - return ObjectInspectorUtils.getBucketHashCode(objects, oi); + return ObjectInspectorUtils.getBucketHashCodeOld(objects, oi); } } @@ -618,12 +622,24 @@ public static String getObjectInspectorName(ObjectInspector oi) { * @param bucketFields the bucketed fields of the row * @param bucketFieldInspectors the ObjectInpsectors for each of the bucketed fields * @param totalBuckets the number of buckets in the table - * @return the bucket number + * @return the bucket number using Murmur hash */ public static int getBucketNumber(Object[] bucketFields, ObjectInspector[] bucketFieldInspectors, int totalBuckets) { return getBucketNumber(getBucketHashCode(bucketFields, bucketFieldInspectors), totalBuckets); } + /** + * Computes the bucket number to which the bucketFields belong to + * @param bucketFields the bucketed fields of the row + * @param bucketFieldInspectors the ObjectInpsectors for each of the bucketed fields + * @param totalBuckets the number of buckets in the table + * @return the bucket number + */ + @Deprecated + public static int getBucketNumberOld(Object[] bucketFields, ObjectInspector[] bucketFieldInspectors, int totalBuckets) { + return getBucketNumber(getBucketHashCodeOld(bucketFields, bucketFieldInspectors), totalBuckets); + } + /** * https://cwiki.apache.org/confluence/display/Hive/LanguageManual+DDL+BucketedTables * @param hashCode as produced by {@link #getBucketHashCode(Object[], ObjectInspector[])} @@ -636,13 +652,15 @@ public static int getBucketNumber(int hashCode, int numberOfBuckets) { } return (hashCode & Integer.MAX_VALUE) % numberOfBuckets; } + /** * Computes the hash code for the given bucketed fields * @param bucketFields * @param bucketFieldInspectors * @return */ - public static int getBucketHashCode(Object[] bucketFields, ObjectInspector[] bucketFieldInspectors) { + @Deprecated + public static int getBucketHashCodeOld(Object[] bucketFields, ObjectInspector[] bucketFieldInspectors) { int hashCode = 0; for (int i = 0; i < bucketFields.length; i++) { int fieldHash = ObjectInspectorUtils.hashCode(bucketFields[i], bucketFieldInspectors[i]); @@ -651,7 +669,6 @@ public static int getBucketHashCode(Object[] bucketFields, ObjectInspector[] buc return hashCode; } - public static int hashCode(Object o, ObjectInspector objIns) { if (o == null) { return 0; @@ -769,6 +786,139 @@ public static int hashCode(Object o, ObjectInspector objIns) { } } + public static int getBucketHashCode(Object[] bucketFields, ObjectInspector[] bucketFieldInspectors) { + int hashCode = 0; + for (int i = 0; i < bucketFields.length; i++) { + int fieldHash = ObjectInspectorUtils.hashCodeMurmur(bucketFields[i], bucketFieldInspectors[i]); + hashCode = 31 * hashCode + fieldHash; + } + return hashCode; + } + + public static int hashCodeMurmur(Object o, ObjectInspector objIns) { + if (o == null) { + return 0; + } + switch (objIns.getCategory()) { + case PRIMITIVE: { + PrimitiveObjectInspector poi = ((PrimitiveObjectInspector) objIns); + switch (poi.getPrimitiveCategory()) { + case VOID: + return 0; + case BOOLEAN: + return (((BooleanObjectInspector) poi).get(o) ? 1 : 0); + case BYTE: + return ((ByteObjectInspector) poi).get(o); + case SHORT: { + ByteBuffer b = ByteBuffer.allocate(2); + b.putShort(((ShortObjectInspector) poi).get(o)); + return Murmur3.hash32(b.array()); + } + case INT: { + ByteBuffer b = ByteBuffer.allocate(4); + b.putInt(((IntObjectInspector) poi).get(o)); + return Murmur3.hash32(b.array()); + } + case LONG: { + ByteBuffer b = ByteBuffer.allocate(8); + b.putLong(((LongObjectInspector) poi).get(o)); + return Murmur3.hash32(b.array()); + } + case FLOAT: { + ByteBuffer b = ByteBuffer.allocate(4); + b.putFloat(Float.floatToIntBits(((FloatObjectInspector) poi).get(o))); + return Murmur3.hash32(b.array()); + } + case DOUBLE: { + // This hash function returns the same result as Double.hashCode() + // while DoubleWritable.hashCode returns a different result. + ByteBuffer b = ByteBuffer.allocate(8); + b.putDouble(Double.doubleToLongBits(((DoubleObjectInspector) poi).get(o))); + return Murmur3.hash32(b.array()); + } + case STRING: { + // This hash function returns the same result as String.hashCode() when + // all characters are ASCII, while Text.hashCode() always returns a + // different result. + return Murmur3.hash32((((StringObjectInspector) poi).getPrimitiveWritableObject(o)).getBytes()); + } + case CHAR: + return Murmur3.hash32(((HiveCharObjectInspector) poi).getPrimitiveWritableObject(o).getStrippedValue().getBytes()); + case VARCHAR: + return Murmur3.hash32(((HiveVarcharObjectInspector)poi).getPrimitiveWritableObject(o).getTextValue().getBytes()); + case BINARY: + return Murmur3.hash32(((BinaryObjectInspector) poi).getPrimitiveWritableObject(o).getBytes()); + + case DATE: + return Murmur3.hash32(((DateObjectInspector) poi).getPrimitiveWritableObject(o).toString().getBytes()); + case TIMESTAMP: { + TimestampWritable t = ((TimestampObjectInspector) poi) + .getPrimitiveWritableObject(o); + return Murmur3.hash32(t.getBytes()); + } + case TIMESTAMPLOCALTZ: + return Murmur3.hash32((((TimestampLocalTZObjectInspector) poi).getPrimitiveWritableObject(o)).getBytes()); + case INTERVAL_YEAR_MONTH: + HiveIntervalYearMonthWritable intervalYearMonth = ((HiveIntervalYearMonthObjectInspector) poi) + .getPrimitiveWritableObject(o); + return Murmur3.hash32(intervalYearMonth.toString().getBytes()); + case INTERVAL_DAY_TIME: + HiveIntervalDayTimeWritable intervalDayTime = ((HiveIntervalDayTimeObjectInspector) poi) + .getPrimitiveWritableObject(o); + return Murmur3.hash32(intervalDayTime.toString().getBytes()); + case DECIMAL: + // Since getBucketHashCode uses this, HiveDecimal return the old (much slower) but + // compatible hash code. + return Murmur3.hash32(((HiveDecimalObjectInspector) poi).getPrimitiveWritableObject(o).getInternalStorage()); + + default: { + throw new RuntimeException("Unknown type: " + + poi.getPrimitiveCategory()); + } + } + } + case LIST: { + int r = 0; + ListObjectInspector listOI = (ListObjectInspector)objIns; + ObjectInspector elemOI = listOI.getListElementObjectInspector(); + for (int ii = 0; ii < listOI.getListLength(o); ++ii) { + //r = 31 * r + hashCode(listOI.getListElement(o, ii), elemOI); + r = 31 * r + hashCodeMurmur(listOI.getListElement(o, ii), elemOI); + } + return r; + } + case MAP: { + int r = 0; + MapObjectInspector mapOI = (MapObjectInspector)objIns; + ObjectInspector keyOI = mapOI.getMapKeyObjectInspector(); + ObjectInspector valueOI = mapOI.getMapValueObjectInspector(); + Map map = mapOI.getMap(o); + for (Map.Entry entry : map.entrySet()) { + r += hashCodeMurmur(entry.getKey(), keyOI) ^ + hashCode(entry.getValue(), valueOI); + } + return r; + } + case STRUCT: + int r = 0; + StructObjectInspector structOI = (StructObjectInspector)objIns; + List fields = structOI.getAllStructFieldRefs(); + for (StructField field : fields) { + r = 31 * r + hashCodeMurmur(structOI.getStructFieldData(o, field), + field.getFieldObjectInspector()); + } + return r; + + case UNION: + UnionObjectInspector uOI = (UnionObjectInspector)objIns; + byte tag = uOI.getTag(o); + return hashCodeMurmur(uOI.getField(o), uOI.getObjectInspectors().get(tag)); + + default: + throw new RuntimeException("Unknown type: "+ objIns.getTypeName()); + } + } + /** * Compare two arrays of objects with their respective arrays of * ObjectInspectors. diff --git a/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java b/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java index eca74057a3..23ca194b6f 100644 --- a/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java +++ b/serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestObjectInspectorUtils.java @@ -150,9 +150,9 @@ public void testBucketIdGeneration() { struct.add("two"); struct.add(true); - int hashCode = ObjectInspectorUtils.getBucketHashCode(struct.toArray(), fieldObjectInspectors.toArray(new ObjectInspector[fieldObjectInspectors.size()])); + int hashCode = ObjectInspectorUtils.getBucketHashCodeOld(struct.toArray(), fieldObjectInspectors.toArray(new ObjectInspector[fieldObjectInspectors.size()])); assertEquals("", 3574518, hashCode); - int bucketId = ObjectInspectorUtils.getBucketNumber(struct.toArray(), fieldObjectInspectors.toArray(new ObjectInspector[fieldObjectInspectors.size()]), 16); + int bucketId = ObjectInspectorUtils.getBucketNumberOld(struct.toArray(), fieldObjectInspectors.toArray(new ObjectInspector[fieldObjectInspectors.size()]), 16); assertEquals("", 6, bucketId); assertEquals("", bucketId, ObjectInspectorUtils.getBucketNumber(hashCode, 16)); } diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java index cb1d40a4a8..6d4457945b 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/hive_metastoreConstants.java @@ -84,4 +84,7 @@ public static final String TABLE_TRANSACTIONAL_PROPERTIES = "transactional_properties"; + public static final String TABLE_BUCKETING_VERSION = "bucketing_version"; + + public static final String BUCKETED_TABLE_LOADED_IN_EXPERT_MODE = "bucketed_table_loaded_in_expert_mode"; } diff --git a/storage-api/src/java/org/apache/hive/common/util/Murmur3.java b/storage-api/src/java/org/apache/hive/common/util/Murmur3.java index 6848a59563..1ceeeb3868 100644 --- a/storage-api/src/java/org/apache/hive/common/util/Murmur3.java +++ b/storage-api/src/java/org/apache/hive/common/util/Murmur3.java @@ -61,7 +61,7 @@ * @return - hashcode */ public static int hash32(byte[] data) { - return hash32(data, data.length, DEFAULT_SEED); + return hash32(data, 0, data.length, DEFAULT_SEED); } /** @@ -73,16 +73,29 @@ public static int hash32(byte[] data) { * @return - hashcode */ public static int hash32(byte[] data, int length, int seed) { + return hash32(data, 0, length, seed); + } + + /** + * Murmur3 32-bit variant. + * + * @param data - input byte array + * @param offset - offset of data + * @param length - length of array + * @param seed - seed. (default 0) + * @return - hashcode + */ + public static int hash32(byte[] data, int offset, int length, int seed) { int hash = seed; final int nblocks = length >> 2; // body for (int i = 0; i < nblocks; i++) { int i_4 = i << 2; - int k = (data[i_4] & 0xff) - | ((data[i_4 + 1] & 0xff) << 8) - | ((data[i_4 + 2] & 0xff) << 16) - | ((data[i_4 + 3] & 0xff) << 24); + int k = (data[offset + i_4] & 0xff) + | ((data[offset + i_4 + 1] & 0xff) << 8) + | ((data[offset + i_4 + 2] & 0xff) << 16) + | ((data[offset + i_4 + 3] & 0xff) << 24); // mix functions k *= C1_32; @@ -97,11 +110,11 @@ public static int hash32(byte[] data, int length, int seed) { int k1 = 0; switch (length - idx) { case 3: - k1 ^= data[idx + 2] << 16; + k1 ^= data[offset + idx + 2] << 16; case 2: - k1 ^= data[idx + 1] << 8; + k1 ^= data[offset + idx + 1] << 8; case 1: - k1 ^= data[idx]; + k1 ^= data[offset + idx]; // mix functions k1 *= C1_32;