diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 479fa46..3db4d40 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -967,7 +967,7 @@ public void setSparkConfigUpdated(boolean isSparkConfigUpdated) { "than this threshold, it will try to convert the common join into map join"), - HIVE_SCHEMA_EVOLUTION("hive.exec.schema.evolution", true, + HIVE_SCHEMA_EVOLUTION("hive.exec.schema.evolution", false, "Use schema evolution to convert self-describing file format's data to the schema desired by the reader."), HIVESAMPLERANDOMNUM("hive.sample.seednumber", 0, diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java index 3aafe89..a5489a9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/FetchOperator.java @@ -604,7 +604,8 @@ private StructObjectInspector getPartitionedRowOI(StructObjectInspector valueOI) } private boolean needConversion(PartitionDesc partitionDesc) { - if (Utilities.isInputFileFormatSelfDescribing(partitionDesc)) { + boolean isAcid = AcidUtils.isTablePropertyTransactional(partitionDesc.getTableDesc().getProperties()); + if (Utilities.isSchemaEvolutionEnabled(job, isAcid) && Utilities.isInputFileFormatSelfDescribing(partitionDesc)) { return false; } return needConversion(partitionDesc.getTableDesc(), Arrays.asList(partitionDesc)); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java index 99724c1..ec0d95c 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/MapOperator.java @@ -39,6 +39,7 @@ import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; import org.apache.hadoop.hive.ql.exec.MapOperator.MapOpCtx; import org.apache.hadoop.hive.ql.exec.mr.ExecMapperContext; +import org.apache.hadoop.hive.ql.io.AcidUtils; import org.apache.hadoop.hive.ql.io.RecordIdentifier; import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat; import org.apache.hadoop.hive.ql.metadata.HiveException; @@ -205,7 +206,8 @@ private MapOpCtx initObjectInspector(Configuration hconf, MapOpCtx opCtx, opCtx.deserializer = pd.getDeserializer(hconf); StructObjectInspector partRawRowObjectInspector; - if (Utilities.isInputFileFormatSelfDescribing(pd)) { + boolean isAcid = AcidUtils.isTablePropertyTransactional(td.getProperties()); + if (Utilities.isSchemaEvolutionEnabled(hconf, isAcid) && Utilities.isInputFileFormatSelfDescribing(pd)) { partRawRowObjectInspector = tableRowOI; } else { partRawRowObjectInspector = @@ -313,7 +315,8 @@ private MapOpCtx initObjectInspector(Configuration hconf, MapOpCtx opCtx, Deserializer partDeserializer = pd.getDeserializer(hconf); StructObjectInspector partRawRowObjectInspector; - if (Utilities.isInputFileFormatSelfDescribing(pd)) { + boolean isAcid = AcidUtils.isTablePropertyTransactional(tableDesc.getProperties()); + if (Utilities.isSchemaEvolutionEnabled(hconf, isAcid) && Utilities.isInputFileFormatSelfDescribing(pd)) { Deserializer tblDeserializer = tableDesc.getDeserializer(hconf); partRawRowObjectInspector = (StructObjectInspector) tblDeserializer.getObjectInspector(); } else { diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index 9a7d990..62b91fa 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -3510,6 +3510,10 @@ public static int getDPColOffset(FileSinkDesc conf) { return statsTmpDirs; } + public static boolean isSchemaEvolutionEnabled(Configuration conf, boolean isAcid) { + return isAcid || HiveConf.getBoolVar(conf, ConfVars.HIVE_SCHEMA_EVOLUTION); + } + public static boolean isInputFileFormatSelfDescribing(PartitionDesc pd) { Class inputFormatClass = pd.getInputFileFormatClass(); return SelfDescribingInputFormatInterface.class.isAssignableFrom(inputFormatClass); diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java index 359cbf7..caa51be 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java @@ -250,7 +250,7 @@ public static RecordReader createReaderFromFile(Reader file, /** * Do we have schema on read in the configuration variables? */ - TypeDescription schema = getDesiredRowTypeDescr(conf); + TypeDescription schema = getDesiredRowTypeDescr(conf, /* isAcid */ false); Reader.Options options = new Reader.Options().range(offset, length); options.schema(schema); @@ -1523,7 +1523,7 @@ public float getProgress() throws IOException { /** * Do we have schema on read in the configuration variables? */ - TypeDescription schema = getDesiredRowTypeDescr(conf); + TypeDescription schema = getDesiredRowTypeDescr(conf, /* isAcid */ true); final Reader reader; final int bucket; @@ -2051,7 +2051,7 @@ public static TypeDescription convertTypeInfo(TypeInfo info) { } - public static TypeDescription getDesiredRowTypeDescr(Configuration conf) { + public static TypeDescription getDesiredRowTypeDescr(Configuration conf, boolean isAcid) { String columnNameProperty = null; String columnTypeProperty = null; @@ -2060,7 +2060,7 @@ public static TypeDescription getDesiredRowTypeDescr(Configuration conf) { ArrayList schemaEvolutionTypeDescrs = null; boolean haveSchemaEvolutionProperties = false; - if (HiveConf.getBoolVar(conf, ConfVars.HIVE_SCHEMA_EVOLUTION)) { + if (isAcid || HiveConf.getBoolVar(conf, ConfVars.HIVE_SCHEMA_EVOLUTION) ) { columnNameProperty = conf.get(IOConstants.SCHEMA_EVOLUTION_COLUMNS); columnTypeProperty = conf.get(IOConstants.SCHEMA_EVOLUTION_COLUMNS_TYPES); @@ -2082,7 +2082,17 @@ public static TypeDescription getDesiredRowTypeDescr(Configuration conf) { } } - if (!haveSchemaEvolutionProperties) { + if (haveSchemaEvolutionProperties) { + LOG.info("Using schema evolution configuration variables " + + "schema.evolution.columns " + + schemaEvolutionColumnNames.toString() + + " / schema.evolution.columns.types " + + schemaEvolutionTypeDescrs.toString() + + " (isAcid " + + isAcid + + ")"); + + } else { // Try regular properties; columnNameProperty = conf.get(serdeConstants.LIST_COLUMNS); @@ -2100,6 +2110,14 @@ public static TypeDescription getDesiredRowTypeDescr(Configuration conf) { if (schemaEvolutionTypeDescrs.size() != schemaEvolutionColumnNames.size()) { return null; } + LOG.info("Using column configuration variables " + + "columns " + + schemaEvolutionColumnNames.toString() + + " / columns.types " + + schemaEvolutionTypeDescrs.toString() + + " (isAcid " + + isAcid + + ")"); } // Desired schema does not include virtual columns or partition columns. diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRawRecordMerger.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRawRecordMerger.java index e5f9786..2c8dae2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRawRecordMerger.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRawRecordMerger.java @@ -447,7 +447,7 @@ private void discoverKeyBounds(Reader reader, this.length = options.getLength(); this.validTxnList = validTxnList; - TypeDescription typeDescr = OrcInputFormat.getDesiredRowTypeDescr(conf); + TypeDescription typeDescr = OrcInputFormat.getDesiredRowTypeDescr(conf, /* isAcid */ true); if (typeDescr == null) { throw new IOException(ErrorMsg.SCHEMA_REQUIRED_TO_READ_ACID_TABLES.getErrorCodedMsg()); } diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/VectorizedOrcInputFormat.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/VectorizedOrcInputFormat.java index e08aaf3..1244533 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/VectorizedOrcInputFormat.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/VectorizedOrcInputFormat.java @@ -66,7 +66,7 @@ /** * Do we have schema on read in the configuration variables? */ - TypeDescription schema = OrcInputFormat.getDesiredRowTypeDescr(conf); + TypeDescription schema = OrcInputFormat.getDesiredRowTypeDescr(conf, /* isAcid */ false); List types = file.getTypes(); Reader.Options options = new Reader.Options(); diff --git ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q index 6fe9d45..800c5f8 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_part.q @@ -2,7 +2,7 @@ set hive.mapred.mode=nonstrict; set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - +SET hive.exec.schema.evolution=false; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; @@ -11,6 +11,7 @@ set hive.exec.dynamic.partition.mode=nonstrict; -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Partitioned +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT diff --git ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q index 8c933e1..b006acb 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_acid_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - +SET hive.exec.schema.evolution=false; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; @@ -10,6 +10,7 @@ set hive.exec.dynamic.partition.mode=nonstrict; -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Table +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT diff --git ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q index 1581192..fc935d5 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_part.q @@ -2,7 +2,7 @@ set hive.mapred.mode=nonstrict; set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - +SET hive.exec.schema.evolution=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; @@ -11,6 +11,7 @@ set hive.exec.dynamic.partition.mode=nonstrict; -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Vectorized, MapWork, Partitioned +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT diff --git ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q index d6e82f5..e49a0f3 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_acidvec_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - +SET hive.exec.schema.evolution=false; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; @@ -10,6 +10,7 @@ set hive.exec.dynamic.partition.mode=nonstrict; -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Vectorized, MapWork, Table +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT diff --git ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q index be3e4da..9c66243 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_part.q @@ -1,5 +1,6 @@ set hive.mapred.mode=nonstrict; set hive.cli.print.header=true; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=more; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q index 8e7e373..5bdd620 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_fetchwork_table.q @@ -1,6 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=more; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q index d1b0d97..0fbcadb 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_nonvec_mapwork_part.q @@ -1,5 +1,6 @@ set hive.mapred.mode=nonstrict; set hive.cli.print.header=true; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q index 676756d..30b19bb 100644 --- ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q +++ ql/src/test/queries/clientpositive/schema_evol_orc_vec_mapwork_part.q @@ -1,5 +1,6 @@ set hive.mapred.mode=nonstrict; set hive.cli.print.header=true; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=more; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q index 7de5367..44f7264 100644 --- ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q +++ ql/src/test/queries/clientpositive/schema_evol_text_fetchwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q index 7de5367..44f7264 100644 --- ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q +++ ql/src/test/queries/clientpositive/schema_evol_text_mapwork_table.q @@ -1,7 +1,7 @@ set hive.cli.print.header=true; set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; - +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q index eaa3dc3..4d78642 100644 --- ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q +++ ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_part.q @@ -1,5 +1,6 @@ set hive.mapred.mode=nonstrict; set hive.cli.print.header=true; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=more; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_table.q ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_table.q index 67c2fc3..0834351 100644 --- ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_table.q +++ ql/src/test/queries/clientpositive/schema_evol_text_nonvec_fetchwork_table.q @@ -1,4 +1,5 @@ set hive.cli.print.header=true; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=more; diff --git ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q index aa2cd5e..173e417 100644 --- ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q +++ ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_part.q @@ -1,5 +1,6 @@ set hive.mapred.mode=nonstrict; set hive.cli.print.header=true; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=false; set hive.fetch.task.conversion=none; set hive.exec.dynamic.partition.mode=nonstrict; diff --git ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q index 499d36d..83cab14 100644 --- ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q +++ ql/src/test/queries/clientpositive/schema_evol_text_nonvec_mapwork_table.q @@ -1,4 +1,5 @@ set hive.cli.print.header=true; +SET hive.exec.schema.evolution=true; SET hive.vectorized.execution.enabled=true; set hive.fetch.task.conversion=none; diff --git ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_part.q.out ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_part.q.out index 92d8b01..a922175 100644 --- ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_part.q.out +++ ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_part.q.out @@ -1,6 +1,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Partitioned +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT @@ -12,6 +13,7 @@ PREHOOK: Output: default@partitioned1 POSTHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Partitioned +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT diff --git ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_table.q.out ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_table.q.out index 0317a99..4885aeb 100644 --- ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_table.q.out +++ ql/src/test/results/clientpositive/schema_evol_orc_acid_mapwork_table.q.out @@ -1,6 +1,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Table +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT @@ -12,6 +13,7 @@ PREHOOK: Output: default@table1 POSTHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Non-Vectorized, MapWork, Table +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT diff --git ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_part.q.out ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_part.q.out index babac1a..c5af165 100644 --- ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_part.q.out +++ ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_part.q.out @@ -1,6 +1,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Vectorized, MapWork, Partitioned +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT @@ -12,6 +13,7 @@ PREHOOK: Output: default@partitioned1 POSTHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Vectorized, MapWork, Partitioned +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT diff --git ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_table.q.out ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_table.q.out index 3edaff0..2b1e5c3 100644 --- ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_table.q.out +++ ql/src/test/results/clientpositive/schema_evol_orc_acidvec_mapwork_table.q.out @@ -1,6 +1,7 @@ PREHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Vectorized, MapWork, Table +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT @@ -12,6 +13,7 @@ PREHOOK: Output: default@table1 POSTHOOK: query: -- SORT_QUERY_RESULTS -- -- FILE VARIATION: ORC, ACID Vectorized, MapWork, Table +-- *IMPORTANT NOTE* We set hive.exec.schema.evolution=false above since schema evolution is always used for ACID. -- -- -- SECTION VARIATION: ALTER TABLE ADD COLUMNS ... STATIC INSERT