diff --git a/pom.xml b/pom.xml index 5202248..6e68b59 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ 0.9.3 2.10.0 2.3 - 1.5.1 + 1.6.0-SNAPSHOT 1.10.19 2.0.0-M5 4.1.17.Final diff --git a/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q b/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q index ca5dc6f..c2d9840 100644 --- a/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q +++ b/ql/src/test/queries/clientpositive/orc_schema_evolution_float.q @@ -1,8 +1,6 @@ set hive.vectorized.execution.enabled=false; set hive.optimize.index.filter=false; set hive.metastore.disallow.incompatible.col.type.changes=false; --- set this to 'decimal_64' after resolving HIVE-19792 -set hive.vectorized.input.format.supports.enabled=none; drop table float_text; create table float_text(f float); diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q index 53c16e0..427734f 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive.q @@ -12,8 +12,6 @@ set hive.exec.dynamic.partition.mode=nonstrict; set hive.metastore.disallow.incompatible.col.type.changes=false; set hive.default.fileformat=orc; set hive.llap.io.enabled=false; --- set this to 'decimal_64' after resolving HIVE-19792 -set hive.vectorized.input.format.supports.enabled=none; -- SORT_QUERY_RESULTS -- diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q index f2fb2f0..1eca9e3 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_part_all_primitive_llap_io.q @@ -13,8 +13,6 @@ set hive.metastore.disallow.incompatible.col.type.changes=false; set hive.default.fileformat=orc; set hive.llap.io.enabled=true; set hive.llap.io.encode.enabled=true; --- set this to 'decimal_64' after resolving HIVE-19792 -set hive.vectorized.input.format.supports.enabled=none; -- SORT_QUERY_RESULTS -- diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q index e811f1d..6e35f5a 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive.q @@ -12,8 +12,6 @@ set hive.exec.dynamic.partition.mode=nonstrict; set hive.metastore.disallow.incompatible.col.type.changes=false; set hive.default.fileformat=orc; set hive.llap.io.enabled=false; --- set this to 'decimal_64' after resolving HIVE-19792 -set hive.vectorized.input.format.supports.enabled=none; -- SORT_QUERY_RESULTS -- diff --git a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q index bae6cc8..576f994 100644 --- a/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q +++ b/ql/src/test/queries/clientpositive/schema_evol_orc_vec_part_all_primitive_llap_io.q @@ -13,8 +13,6 @@ set hive.metastore.disallow.incompatible.col.type.changes=false; set hive.default.fileformat=orc; set hive.llap.io.enabled=true; set hive.llap.io.encode.enabled=true; --- set this to 'decimal_64' after resolving HIVE-19792 -set hive.vectorized.input.format.supports.enabled=none; -- SORT_QUERY_RESULTS -- diff --git a/ql/src/test/queries/clientpositive/type_change_test_int.q b/ql/src/test/queries/clientpositive/type_change_test_int.q index 2a49871..112a674 100644 --- a/ql/src/test/queries/clientpositive/type_change_test_int.q +++ b/ql/src/test/queries/clientpositive/type_change_test_int.q @@ -1,6 +1,3 @@ --- set this to 'decimal_64' after resolving HIVE-19792 -set hive.vectorized.input.format.supports.enabled=none; - -- Create a base table to be used for loading data: Begin drop table if exists testAltCol_n1; create table testAltCol_n1 diff --git a/ql/src/test/queries/clientpositive/type_change_test_int_vectorized.q b/ql/src/test/queries/clientpositive/type_change_test_int_vectorized.q index 6a940ac..9e93a2f 100644 --- a/ql/src/test/queries/clientpositive/type_change_test_int_vectorized.q +++ b/ql/src/test/queries/clientpositive/type_change_test_int_vectorized.q @@ -1,5 +1,3 @@ --- set this to 'decimal_64' after resolving HIVE-19792 -set hive.vectorized.input.format.supports.enabled=none; -- Create a base table to be used for loading data: Begin drop table if exists testAltCol; create table testAltCol diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive.q.out index c835afd..df5374a 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive.q.out @@ -293,8 +293,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -545,8 +544,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -719,8 +717,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -877,8 +874,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -1092,7 +1088,7 @@ STAGE PLANS: Statistics: Num rows: 13 Data size: 9347 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true - vectorizationSchemaColumns: [0:insert_num:int, 1:c1:char(8), 2:c2:char(32), 3:c3:varchar(15), 4:c4:varchar(18), 5:c5:decimal(10,2), 6:c6:decimal(25,15), 7:b:string, 8:part:int, 9:ROW__ID:struct] + vectorizationSchemaColumns: [0:insert_num:int, 1:c1:char(8), 2:c2:char(32), 3:c3:varchar(15), 4:c4:varchar(18), 5:c5:decimal(10,2)/DECIMAL_64, 6:c6:decimal(25,15), 7:b:string, 8:part:int, 9:ROW__ID:struct] Select Operator expressions: insert_num (type: int), part (type: int), c1 (type: char(8)), c2 (type: char(32)), c3 (type: varchar(15)), c4 (type: varchar(18)), c5 (type: decimal(10,2)), c6 (type: decimal(25,15)), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 @@ -1116,8 +1112,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -1125,7 +1120,7 @@ STAGE PLANS: rowBatchContext: dataColumnCount: 8 includeColumns: [0, 1, 2, 3, 4, 5, 6, 7] - dataColumns: insert_num:int, c1:char(8), c2:char(32), c3:varchar(15), c4:varchar(18), c5:decimal(10,2), c6:decimal(25,15), b:string + dataColumns: insert_num:int, c1:char(8), c2:char(32), c3:varchar(15), c4:varchar(18), c5:decimal(10,2)/DECIMAL_64, c6:decimal(25,15), b:string partitionColumnCount: 1 partitionColumns: part:int scratchColumnTypeNames: [] diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive_llap_io.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive_llap_io.q.out index 9c2460f..97128d9 100644 --- a/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive_llap_io.q.out +++ b/ql/src/test/results/clientpositive/llap/schema_evol_orc_vec_part_all_primitive_llap_io.q.out @@ -294,8 +294,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -547,8 +546,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -722,8 +720,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -881,8 +878,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -1096,7 +1092,7 @@ STAGE PLANS: Statistics: Num rows: 13 Data size: 9347 Basic stats: COMPLETE Column stats: PARTIAL TableScan Vectorization: native: true - vectorizationSchemaColumns: [0:insert_num:int, 1:c1:char(8), 2:c2:char(32), 3:c3:varchar(15), 4:c4:varchar(18), 5:c5:decimal(10,2), 6:c6:decimal(25,15), 7:b:string, 8:part:int, 9:ROW__ID:struct] + vectorizationSchemaColumns: [0:insert_num:int, 1:c1:char(8), 2:c2:char(32), 3:c3:varchar(15), 4:c4:varchar(18), 5:c5:decimal(10,2)/DECIMAL_64, 6:c6:decimal(25,15), 7:b:string, 8:part:int, 9:ROW__ID:struct] Select Operator expressions: insert_num (type: int), part (type: int), c1 (type: char(8)), c2 (type: char(32)), c3 (type: varchar(15)), c4 (type: varchar(18)), c5 (type: decimal(10,2)), c6 (type: decimal(25,15)), b (type: string) outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8 @@ -1121,8 +1117,7 @@ STAGE PLANS: enabled: true enabledConditionsMet: hive.vectorized.use.vectorized.input.format IS true inputFormatFeatureSupport: [DECIMAL_64] - vectorizationSupportRemovedReasons: [[] is disabled because it is not in hive.vectorized.input.format.supports.enabled []] - featureSupportInUse: [] + featureSupportInUse: [DECIMAL_64] inputFileFormats: org.apache.hadoop.hive.ql.io.orc.OrcInputFormat allNative: false usesVectorUDFAdaptor: false @@ -1130,7 +1125,7 @@ STAGE PLANS: rowBatchContext: dataColumnCount: 8 includeColumns: [0, 1, 2, 3, 4, 5, 6, 7] - dataColumns: insert_num:int, c1:char(8), c2:char(32), c3:varchar(15), c4:varchar(18), c5:decimal(10,2), c6:decimal(25,15), b:string + dataColumns: insert_num:int, c1:char(8), c2:char(32), c3:varchar(15), c4:varchar(18), c5:decimal(10,2)/DECIMAL_64, c6:decimal(25,15), b:string partitionColumnCount: 1 partitionColumns: part:int scratchColumnTypeNames: []