From b088d43138e524c6c12871fa9b36f08eada39dbb Mon Sep 17 00:00:00 2001 From: Ashutosh Chauhan Date: Thu, 5 Oct 2017 22:32:58 -0700 Subject: [PATCH] HIVE-17720 : Bitvectors are not shown in describe statement on beeline --- .../test/resources/testconfiguration.properties | 1 + .../metadata/formatting/MetaDataFormatUtils.java | 25 ++++---- .../apache/hadoop/hive/ql/plan/DescTableDesc.java | 2 +- .../results/clientpositive/autoColumnStats_5.q.out | 16 ++--- .../results/clientpositive/autoColumnStats_9.q.out | 4 +- .../beeline/colstats_all_nulls.q.out | 73 ++++++++++++++++++++++ .../clientpositive/columnstats_partlvl.q.out | 12 ++-- .../clientpositive/columnstats_partlvl_dp.q.out | 20 +++--- .../clientpositive/columnstats_tbllvl.q.out | 14 ++--- .../clientpositive/compute_stats_date.q.out | 4 +- .../clientpositive/display_colstats_tbllvl.q.out | 24 +++---- ql/src/test/results/clientpositive/fm-sketch.q.out | 10 +-- ql/src/test/results/clientpositive/hll.q.out | 10 +-- .../clientpositive/partial_column_stats.q.out | 2 +- .../temp_table_display_colstats_tbllvl.q.out | 24 +++---- 15 files changed, 157 insertions(+), 84 deletions(-) create mode 100644 ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index 038487f134..6b237396e5 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -781,6 +781,7 @@ encrypted.query.files=encryption_join_unencrypted_tbl.q,\ encryption_drop_table_in_encrypted_db.q beeline.positive.include=create_merge_compressed.q,\ + colstats_all_nulls.q,\ drop_with_concurrency.q,\ escape_comments.q,\ insert_overwrite_local_directory_1.q,\ diff --git a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java index a7f29674ff..2ea808cb82 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java @@ -18,7 +18,6 @@ package org.apache.hadoop.hive.ql.metadata.formatting; -import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringEscapeUtils; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.conf.HiveConf; @@ -55,7 +54,6 @@ import java.math.BigInteger; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.Date; @@ -183,8 +181,8 @@ private static String convertToString(byte[] buf) { return ""; } byte[] sub = new byte[2]; - sub[0] = (byte) buf[0]; - sub[1] = (byte) buf[1]; + sub[0] = buf[0]; + sub[1] = buf[1]; return new String(sub); } @@ -214,37 +212,37 @@ private static void formatWithoutIndentation(String name, String type, String co if (csd.isSetBinaryStats()) { BinaryColumnStatsData bcsd = csd.getBinaryStats(); appendColumnStatsNoFormatting(colBuffer, "", "", bcsd.getNumNulls(), "", - bcsd.getAvgColLen(), bcsd.getMaxColLen(), "", ""); + bcsd.getAvgColLen(), bcsd.getMaxColLen(), "", "", convertToString(bcsd.getBitVectors())); } else if (csd.isSetStringStats()) { StringColumnStatsData scsd = csd.getStringStats(); appendColumnStatsNoFormatting(colBuffer, "", "", scsd.getNumNulls(), scsd.getNumDVs(), - scsd.getAvgColLen(), scsd.getMaxColLen(), "", ""); + scsd.getAvgColLen(), scsd.getMaxColLen(), "", "", convertToString(scsd.getBitVectors())); } else if (csd.isSetBooleanStats()) { BooleanColumnStatsData bcsd = csd.getBooleanStats(); appendColumnStatsNoFormatting(colBuffer, "", "", bcsd.getNumNulls(), "", "", "", - bcsd.getNumTrues(), bcsd.getNumFalses()); + bcsd.getNumTrues(), bcsd.getNumFalses(), convertToString(bcsd.getBitVectors())); } else if (csd.isSetDecimalStats()) { DecimalColumnStatsData dcsd = csd.getDecimalStats(); appendColumnStatsNoFormatting(colBuffer, convertToString(dcsd.getLowValue()), convertToString(dcsd.getHighValue()), dcsd.getNumNulls(), dcsd.getNumDVs(), - "", "", "", ""); + "", "", "", "", convertToString(dcsd.getBitVectors())); } else if (csd.isSetDoubleStats()) { DoubleColumnStatsData dcsd = csd.getDoubleStats(); appendColumnStatsNoFormatting(colBuffer, dcsd.getLowValue(), dcsd.getHighValue(), - dcsd.getNumNulls(), dcsd.getNumDVs(), "", "", "", ""); + dcsd.getNumNulls(), dcsd.getNumDVs(), "", "", "", "", convertToString(dcsd.getBitVectors())); } else if (csd.isSetLongStats()) { LongColumnStatsData lcsd = csd.getLongStats(); appendColumnStatsNoFormatting(colBuffer, lcsd.getLowValue(), lcsd.getHighValue(), - lcsd.getNumNulls(), lcsd.getNumDVs(), "", "", "", ""); + lcsd.getNumNulls(), lcsd.getNumDVs(), "", "", "", "", convertToString(lcsd.getBitVectors())); } else if (csd.isSetDateStats()) { DateColumnStatsData dcsd = csd.getDateStats(); appendColumnStatsNoFormatting(colBuffer, convertToString(dcsd.getLowValue()), convertToString(dcsd.getHighValue()), - dcsd.getNumNulls(), dcsd.getNumDVs(), "", "", "", ""); + dcsd.getNumNulls(), dcsd.getNumDVs(), "", "", "", "", convertToString(dcsd.getBitVectors())); } } else { - appendColumnStatsNoFormatting(colBuffer, "", "", "", "", "", "", "", ""); + appendColumnStatsNoFormatting(colBuffer, "", "", "", "", "", "", "", "",""); } } colBuffer.append(comment == null ? "" : HiveStringUtils.escapeJava(comment)); @@ -811,7 +809,7 @@ private static void appendColumnStats(StringBuilder sb, Object min, Object max, private static void appendColumnStatsNoFormatting(StringBuilder sb, Object min, Object max, Object numNulls, Object ndv, Object avgColLen, Object maxColLen, - Object numTrues, Object numFalses) { + Object numTrues, Object numFalses, String bitvector) { sb.append(min).append(FIELD_DELIM); sb.append(max).append(FIELD_DELIM); sb.append(numNulls).append(FIELD_DELIM); @@ -820,6 +818,7 @@ private static void appendColumnStatsNoFormatting(StringBuilder sb, Object min, sb.append(maxColLen).append(FIELD_DELIM); sb.append(numTrues).append(FIELD_DELIM); sb.append(numFalses).append(FIELD_DELIM); + sb.append(bitvector).append(FIELD_DELIM); } public static String[] getColumnsHeader(List colStats) { diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java b/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java index 845ffcfb53..88c9921d01 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java @@ -59,7 +59,7 @@ public void setPartSpec(Map partSpec) { */ private static final String schema = "col_name,data_type,comment#string:string:string"; private static final String colStatsSchema = "col_name,data_type,min,max,num_nulls," - + "distinct_count,avg_col_len,max_col_len,num_trues,num_falses,comment,bitVector" + + "distinct_count,avg_col_len,max_col_len,num_trues,num_falses,bitVector,comment" + "#string:string:string:string:string:string:string:string:string:string:string:string"; public DescTableDesc() { diff --git a/ql/src/test/results/clientpositive/autoColumnStats_5.q.out b/ql/src/test/results/clientpositive/autoColumnStats_5.q.out index 1298d989a2..417433b4ff 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_5.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_5.q.out @@ -192,8 +192,8 @@ PREHOOK: Input: default@partitioned1 POSTHOOK: query: desc formatted partitioned1 partition(part=1) a POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@partitioned1 -col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment a int 1 4 0 4 HL from deserializer PREHOOK: query: alter table partitioned1 add columns(c int, d string) @@ -434,8 +434,8 @@ PREHOOK: Input: default@partitioned1 POSTHOOK: query: desc formatted partitioned1 partition(part=2) c POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@partitioned1 -col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment c int 10 40 0 4 HL from deserializer PREHOOK: query: explain insert into table partitioned1 partition(part=1) values(5, 'new', 100, 'hundred'),(6, 'new', 200, 'two hundred') @@ -626,8 +626,8 @@ PREHOOK: Input: default@partitioned1 POSTHOOK: query: desc formatted partitioned1 partition(part=1) a POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@partitioned1 -col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment a int 1 6 0 6 HL from deserializer PREHOOK: query: desc formatted partitioned1 partition(part=1) c @@ -636,7 +636,7 @@ PREHOOK: Input: default@partitioned1 POSTHOOK: query: desc formatted partitioned1 partition(part=1) c POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@partitioned1 -col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitvector -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitvector comment +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment c int 100 200 0 2 HL from deserializer diff --git a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out index fda71e0dd2..03e79d1caf 100644 --- a/ql/src/test/results/clientpositive/autoColumnStats_9.q.out +++ b/ql/src/test/results/clientpositive/autoColumnStats_9.q.out @@ -250,7 +250,7 @@ PREHOOK: Input: default@dest_j1 POSTHOOK: query: desc formatted dest_j1 key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@dest_j1 -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key int 0 498 0 309 HL from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} @@ -260,7 +260,7 @@ PREHOOK: Input: default@dest_j1 POSTHOOK: query: desc formatted dest_j1 value POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@dest_j1 -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment value string 0 309 6.834630350194552 7 HL from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\",\"value\":\"true\"}} diff --git a/ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out b/ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out new file mode 100644 index 0000000000..8080b21e02 --- /dev/null +++ b/ql/src/test/results/clientpositive/beeline/colstats_all_nulls.q.out @@ -0,0 +1,73 @@ +PREHOOK: query: CREATE TABLE src_null(a bigint) STORED AS TEXTFILE +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@src_null +POSTHOOK: query: CREATE TABLE src_null(a bigint) STORED AS TEXTFILE +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@src_null +PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nulls.txt' INTO TABLE src_null +PREHOOK: type: LOAD +#### A masked pattern was here #### +PREHOOK: Output: default@src_null +POSTHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/nulls.txt' INTO TABLE src_null +POSTHOOK: type: LOAD +#### A masked pattern was here #### +POSTHOOK: Output: default@src_null +PREHOOK: query: create table all_nulls as SELECT a, cast(a as double) as b, cast(a as decimal) as c FROM src_null where a is null limit 5 +PREHOOK: type: CREATETABLE_AS_SELECT +PREHOOK: Input: default@src_null +PREHOOK: Output: database:default +PREHOOK: Output: default@all_nulls +POSTHOOK: query: create table all_nulls as SELECT a, cast(a as double) as b, cast(a as decimal) as c FROM src_null where a is null limit 5 +POSTHOOK: type: CREATETABLE_AS_SELECT +POSTHOOK: Input: default@src_null +POSTHOOK: Output: database:default +POSTHOOK: Output: default@all_nulls +POSTHOOK: Lineage: all_nulls.a SIMPLE [] +POSTHOOK: Lineage: all_nulls.b SIMPLE [] +POSTHOOK: Lineage: all_nulls.c SIMPLE [] +PREHOOK: query: analyze table all_nulls compute statistics for columns +PREHOOK: type: QUERY +PREHOOK: Input: default@all_nulls +#### A masked pattern was here #### +POSTHOOK: query: analyze table all_nulls compute statistics for columns +POSTHOOK: type: QUERY +POSTHOOK: Input: default@all_nulls +#### A masked pattern was here #### +PREHOOK: query: describe formatted all_nulls a +PREHOOK: type: DESCTABLE +PREHOOK: Input: default@all_nulls +POSTHOOK: query: describe formatted all_nulls a +POSTHOOK: type: DESCTABLE +POSTHOOK: Input: default@all_nulls +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment + NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +a bigint 0 0 5 1 HL from deserializer +COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\"}} NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +PREHOOK: query: describe formatted all_nulls b +PREHOOK: type: DESCTABLE +PREHOOK: Input: default@all_nulls +POSTHOOK: query: describe formatted all_nulls b +POSTHOOK: type: DESCTABLE +POSTHOOK: Input: default@all_nulls +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment + NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +b double 0.0 0.0 5 1 HL from deserializer +COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\"}} NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL +PREHOOK: query: drop table all_nulls +PREHOOK: type: DROPTABLE +PREHOOK: Input: default@all_nulls +PREHOOK: Output: default@all_nulls +POSTHOOK: query: drop table all_nulls +POSTHOOK: type: DROPTABLE +POSTHOOK: Input: default@all_nulls +POSTHOOK: Output: default@all_nulls +PREHOOK: query: drop table src_null +PREHOOK: type: DROPTABLE +PREHOOK: Input: default@src_null +PREHOOK: Output: default@src_null +POSTHOOK: query: drop table src_null +POSTHOOK: type: DROPTABLE +POSTHOOK: Input: default@src_null +POSTHOOK: Output: default@src_null diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out index 1e1c55d4bf..936eb64929 100644 --- a/ql/src/test/results/clientpositive/columnstats_partlvl.q.out +++ b/ql/src/test/results/clientpositive/columnstats_partlvl.q.out @@ -509,7 +509,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary=2000.0) employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 34 1 12 HL from deserializer PREHOOK: query: describe formatted Employee_Part partition (employeeSalary=2000.0) employeeName @@ -518,7 +518,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary=2000.0) employeeName POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeName string 1 12 4.3076923076923075 6 HL from deserializer PREHOOK: query: explain @@ -598,7 +598,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition(employeeSalary=2000.0) employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 34 1 12 HL from deserializer PREHOOK: query: describe formatted Employee_Part partition(employeeSalary=4000.0) employeeID @@ -607,7 +607,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition(employeeSalary=4000.0) employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 34 1 12 HL from deserializer PREHOOK: query: explain @@ -679,7 +679,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 34 2 12 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"employeeid\":\"true\",\"employeename\":\"true\"}} @@ -711,7 +711,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted default.Employee_Part partition (employeeSalary=2000.0) employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 34 1 12 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"employeeid\":\"true\",\"employeename\":\"true\"}} diff --git a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out index 0739b497f6..fa7b65c759 100644 --- a/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out +++ b/ql/src/test/results/clientpositive/columnstats_partlvl_dp.q.out @@ -141,7 +141,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='4000.0', country='USA') employeeName POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeName string 0 7 5.142857142857143 6 HL from deserializer PREHOOK: query: explain @@ -221,7 +221,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='2000.0', country='USA') employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 34 1 12 HL from deserializer PREHOOK: query: describe formatted Employee_Part partition (employeeSalary='2000.0', country='UK') employeeID @@ -230,7 +230,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='2000.0', country='UK') employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 31 0 7 HL from deserializer PREHOOK: query: explain @@ -318,7 +318,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='3000.0', country='UK') employeeID POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeID int 16 34 1 12 HL from deserializer PREHOOK: query: explain @@ -406,7 +406,7 @@ PREHOOK: Input: default@employee_part POSTHOOK: query: describe formatted Employee_Part partition (employeeSalary='3500.0', country='UK') employeeName POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee_part -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeName string 0 12 5.142857142857143 6 HL from deserializer PREHOOK: query: drop table Employee @@ -481,7 +481,7 @@ PREHOOK: Input: default@employee POSTHOOK: query: describe formatted Employee partition (employeeSalary='3500.0', country='UK') employeeName POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeName string 0 12 5.142857142857143 6 HL from deserializer PREHOOK: query: LOAD DATA LOCAL INPATH "../../data/files/employee2.dat" INTO TABLE Employee partition(employeeSalary='3000.0', country='USA') @@ -528,7 +528,7 @@ PREHOOK: Input: default@employee POSTHOOK: query: describe formatted Employee partition (employeeSalary='3000.0', country='USA') employeeName POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeName string 0 12 5.142857142857143 6 HL from deserializer PREHOOK: query: alter table Employee add columns (c int ,d string) @@ -564,7 +564,7 @@ PREHOOK: Input: default@employee POSTHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') employeeName POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment employeeName string 0 9 4.777777777777778 6 HL from deserializer PREHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') c @@ -573,7 +573,7 @@ PREHOOK: Input: default@employee POSTHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') c POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment c int 2000 4000 0 3 HL from deserializer PREHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') d @@ -582,6 +582,6 @@ PREHOOK: Input: default@employee POSTHOOK: query: describe formatted Employee partition (employeeSalary='6000.0', country='UK') d POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@employee -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment d string 0 2 2.4444444444444446 3 HL from deserializer diff --git a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out index bcab71ade8..897c11a75d 100644 --- a/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out +++ b/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out @@ -285,7 +285,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: describe formatted UserVisits_web_text_none destURL POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment destURL string 0 55 48.945454545454545 96 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} @@ -295,7 +295,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: describe formatted UserVisits_web_text_none adRevenue POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} @@ -305,7 +305,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: describe formatted UserVisits_web_text_none avgTimeOnSite POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment avgTimeOnSite int 1 9 0 9 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} @@ -414,7 +414,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: describe formatted default.UserVisits_web_text_none destURL POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment destURL string 0 55 48.945454545454545 96 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} @@ -707,7 +707,7 @@ PREHOOK: Input: dummydb@uservisits_in_dummy_db POSTHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db destURL POSTHOOK: type: DESCTABLE POSTHOOK: Input: dummydb@uservisits_in_dummy_db -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment destURL string 0 55 48.945454545454545 96 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} @@ -717,7 +717,7 @@ PREHOOK: Input: dummydb@uservisits_in_dummy_db POSTHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db adRevenue POSTHOOK: type: DESCTABLE POSTHOOK: Input: dummydb@uservisits_in_dummy_db -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} @@ -727,7 +727,7 @@ PREHOOK: Input: dummydb@uservisits_in_dummy_db POSTHOOK: query: describe formatted dummydb.UserVisits_in_dummy_db avgTimeOnSite POSTHOOK: type: DESCTABLE POSTHOOK: Input: dummydb@uservisits_in_dummy_db -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment avgTimeOnSite int 1 9 0 9 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"ccode\":\"true\",\"desturl\":\"true\",\"lcode\":\"true\",\"skeyword\":\"true\",\"sourceip\":\"true\",\"useragent\":\"true\",\"visitdate\":\"true\"}} diff --git a/ql/src/test/results/clientpositive/compute_stats_date.q.out b/ql/src/test/results/clientpositive/compute_stats_date.q.out index 7043d52914..4a63b8b735 100644 --- a/ql/src/test/results/clientpositive/compute_stats_date.q.out +++ b/ql/src/test/results/clientpositive/compute_stats_date.q.out @@ -109,7 +109,7 @@ PREHOOK: Input: default@tab_date POSTHOOK: query: describe formatted tab_date fl_date POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@tab_date -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment fl_date date 2000-11-20 2010-10-29 0 19 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"fl_date\":\"true\"}} @@ -123,7 +123,7 @@ PREHOOK: Input: default@tab_date POSTHOOK: query: describe formatted tab_date fl_date POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@tab_date -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment fl_date date 1970-01-01 2015-01-01 0 19 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"fl_date\":\"true\"}} 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 f17e7bd08f..47b339a6f8 100644 --- a/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out +++ b/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out @@ -51,7 +51,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string from deserializer PREHOOK: query: explain @@ -242,7 +242,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string 0 55 12.763636363636364 13 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}} @@ -252,7 +252,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none avgTimeOnSite POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment avgTimeOnSite int 1 9 0 9 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}} @@ -262,7 +262,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none adRevenue POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}} @@ -292,7 +292,7 @@ PREHOOK: Input: default@empty_tab POSTHOOK: query: desc formatted empty_tab a POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@empty_tab -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment a int from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}} @@ -361,7 +361,7 @@ PREHOOK: Input: default@empty_tab POSTHOOK: query: desc formatted empty_tab a POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@empty_tab -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment a int 0 0 0 0 from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}} @@ -371,7 +371,7 @@ PREHOOK: Input: default@empty_tab POSTHOOK: query: desc formatted empty_tab b POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@empty_tab -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment b double 0.0 0.0 0 0 from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}} @@ -451,7 +451,7 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string from deserializer PREHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP @@ -460,7 +460,7 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string from deserializer PREHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP @@ -469,7 +469,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string 0 55 12.763636363636364 13 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"adrevenue\":\"true\",\"avgtimeonsite\":\"true\",\"sourceip\":\"true\"}} @@ -495,7 +495,7 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sKeyword POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sKeyword string 0 54 7.872727272727273 19 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"skeyword\":\"true\"}} @@ -505,7 +505,7 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted test.UserVisits_web_text_none sKeyword POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sKeyword string 0 54 7.872727272727273 19 HL from deserializer COLUMN_STATS_ACCURATE {\"COLUMN_STATS\":{\"skeyword\":\"true\"}} diff --git a/ql/src/test/results/clientpositive/fm-sketch.q.out b/ql/src/test/results/clientpositive/fm-sketch.q.out index 7a4d395fb4..b8fa726e03 100644 --- a/ql/src/test/results/clientpositive/fm-sketch.q.out +++ b/ql/src/test/results/clientpositive/fm-sketch.q.out @@ -78,7 +78,7 @@ PREHOOK: Input: default@n POSTHOOK: query: desc formatted n key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@n -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key int 0 0 500 1 FM from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -162,7 +162,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key int 0 498 0 196 FM from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -205,7 +205,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key double 0.0 498.0 0 234 FM from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -248,7 +248,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key decimal(10,0) 0 498 0 180 FM from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -317,7 +317,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key date 2012-03-17 2013-08-17 0 3 FM from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} diff --git a/ql/src/test/results/clientpositive/hll.q.out b/ql/src/test/results/clientpositive/hll.q.out index bb880b2d18..3b09f179b6 100644 --- a/ql/src/test/results/clientpositive/hll.q.out +++ b/ql/src/test/results/clientpositive/hll.q.out @@ -78,7 +78,7 @@ PREHOOK: Input: default@n POSTHOOK: query: desc formatted n key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@n -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key int 0 0 500 1 HL from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -162,7 +162,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key int 0 498 0 309 HL from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -205,7 +205,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key double 0.0 498.0 0 309 HL from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -248,7 +248,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key decimal(10,0) 0 498 0 309 HL from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} @@ -317,7 +317,7 @@ PREHOOK: Input: default@i POSTHOOK: query: desc formatted i key POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@i -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment key date 2012-03-17 2013-08-17 0 4 HL from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}} diff --git a/ql/src/test/results/clientpositive/partial_column_stats.q.out b/ql/src/test/results/clientpositive/partial_column_stats.q.out index e8b1a99fe2..55208924f8 100644 --- a/ql/src/test/results/clientpositive/partial_column_stats.q.out +++ b/ql/src/test/results/clientpositive/partial_column_stats.q.out @@ -69,7 +69,7 @@ PREHOOK: Input: default@t1 POSTHOOK: query: desc formatted t1 value POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@t1 -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment value string 0 0 0.0 0 from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"data\":\"true\",\"key\":\"true\",\"value\":\"true\"}} 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 1abe95d31e..d69e4bd11f 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 @@ -55,7 +55,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string from deserializer PREHOOK: query: explain @@ -242,7 +242,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string 0 55 12.763636363636364 13 HL from deserializer PREHOOK: query: desc formatted UserVisits_web_text_none avgTimeOnSite @@ -251,7 +251,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none avgTimeOnSite POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment avgTimeOnSite int 1 9 0 9 HL from deserializer PREHOOK: query: desc formatted UserVisits_web_text_none adRevenue @@ -260,7 +260,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none adRevenue POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment adRevenue float 13.099044799804688 492.98870849609375 0 55 HL from deserializer PREHOOK: query: CREATE TEMPORARY TABLE empty_tab( @@ -289,7 +289,7 @@ PREHOOK: Input: default@empty_tab POSTHOOK: query: desc formatted empty_tab a POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@empty_tab -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment a int from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}} @@ -358,7 +358,7 @@ PREHOOK: Input: default@empty_tab POSTHOOK: query: desc formatted empty_tab a POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@empty_tab -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment a int 0 0 0 0 from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}} @@ -368,7 +368,7 @@ PREHOOK: Input: default@empty_tab POSTHOOK: query: desc formatted empty_tab b POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@empty_tab -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment b double 0.0 0.0 0 0 from deserializer COLUMN_STATS_ACCURATE {\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"a\":\"true\",\"b\":\"true\",\"c\":\"true\",\"d\":\"true\",\"e\":\"true\"}} @@ -447,7 +447,7 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string from deserializer PREHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP @@ -456,7 +456,7 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted test.UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string from deserializer PREHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP @@ -465,7 +465,7 @@ PREHOOK: Input: default@uservisits_web_text_none POSTHOOK: query: desc formatted default.UserVisits_web_text_none sourceIP POSTHOOK: type: DESCTABLE POSTHOOK: Input: default@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sourceIP string 0 55 12.763636363636364 13 HL from deserializer PREHOOK: query: analyze table UserVisits_web_text_none compute statistics for columns sKeyword @@ -489,7 +489,7 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted UserVisits_web_text_none sKeyword POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sKeyword string 0 54 7.872727272727273 19 HL from deserializer PREHOOK: query: desc formatted test.UserVisits_web_text_none sKeyword @@ -498,6 +498,6 @@ PREHOOK: Input: test@uservisits_web_text_none POSTHOOK: query: desc formatted test.UserVisits_web_text_none sKeyword POSTHOOK: type: DESCTABLE POSTHOOK: Input: test@uservisits_web_text_none -# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses comment bitVector +# col_name data_type min max num_nulls distinct_count avg_col_len max_col_len num_trues num_falses bitVector comment sKeyword string 0 54 7.872727272727273 19 HL from deserializer -- 2.13.5 (Apple Git-94)