diff --git ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java index eb9f4e3..31978fe 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java +++ ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java @@ -418,7 +418,9 @@ VALUES_TABLE_CONSTRUCTOR_NOT_SUPPORTED(10296, "Values clause with table constructor not yet supported"), ACID_OP_ON_NONACID_TABLE(10297, "Attempt to do update or delete on table {0} that does not use " + - "an AcidOutputFormat", true), + "an AcidOutputFormat or is not bucketed", true), + ACID_NO_SORTED_BUCKETS(10298, "ACID insert, update, delete not supported on tables that are " + + "sorted, table {0}", true), //========================== 20000 range starts here ========================// SCRIPT_INIT_ERROR(20000, "Unable to initialize custom script."), diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/QBMetaData.java ql/src/java/org/apache/hadoop/hive/ql/parse/QBMetaData.java index 66faf1d..0c973ce 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/QBMetaData.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/QBMetaData.java @@ -104,10 +104,18 @@ public Table getDestTableForAlias(String alias) { return nameToDestTable.get(alias.toLowerCase()); } + public Map getNameToDestTable() { + return nameToDestTable; + } + public Partition getDestPartitionForAlias(String alias) { return nameToDestPartition.get(alias.toLowerCase()); } + public Map getNameToDestPartition() { + return nameToDestPartition; + } + public String getDestFileForAlias(String alias) { return nameToDestFile.get(alias.toLowerCase()); } diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java index c2ed55c..8adef85 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -67,6 +67,7 @@ import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.MetaException; import org.apache.hadoop.hive.metastore.api.Order; +import org.apache.hadoop.hive.metastore.api.hive_metastoreConstants; import org.apache.hadoop.hive.ql.ErrorMsg; import org.apache.hadoop.hive.ql.QueryProperties; import org.apache.hadoop.hive.ql.exec.AbstractMapJoinOperator; @@ -304,6 +305,7 @@ private static final int AUTOGEN_COLALIAS_PRFX_MAXLENGTH = 20; private static final String VALUES_TMP_TABLE_NAME_PREFIX = "Values__Tmp__Table__"; + private static final String ACID_TABLE_PROPERTY = "transactional"; private HashMap opToPartPruner; private HashMap opToPartList; @@ -5892,6 +5894,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) Integer dest_type = qbm.getDestTypeForAlias(dest); Table dest_tab = null; // destination table if any + boolean destTableIsAcid = false; // should the destination table be written to using ACID Partition dest_part = null;// destination partition if any Path queryTmpdir = null; // the intermediate destination directory Path dest_path = null; // the final destination directory @@ -5908,6 +5911,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) case QBMetaData.DEST_TABLE: { dest_tab = qbm.getDestTableForAlias(dest); + destTableIsAcid = isAcidTable(dest_tab); // Is the user trying to insert into a external tables if ((!conf.getBoolVar(HiveConf.ConfVars.HIVE_INSERT_INTO_EXTERNAL_TABLES)) && @@ -6003,9 +6007,10 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) // Create the work for moving the table // NOTE: specify Dynamic partitions in dest_tab for WriteEntity if (!isNonNativeTable) { - AcidUtils.Operation acidOp = getAcidType(table_desc.getOutputFileFormatClass()); - if (acidOp != AcidUtils.Operation.NOT_ACID) { - checkAcidConstraints(qb, table_desc); + AcidUtils.Operation acidOp = AcidUtils.Operation.NOT_ACID; + if (destTableIsAcid) { + acidOp = getAcidType(table_desc.getOutputFileFormatClass()); + checkAcidConstraints(qb, table_desc, dest_tab); } ltd = new LoadTableDesc(queryTmpdir,table_desc, dpCtx, acidOp); ltd.setReplace(!qb.getParseInfo().isInsertIntoTable(dest_tab.getDbName(), @@ -6063,6 +6068,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) dest_part = qbm.getDestPartitionForAlias(dest); dest_tab = dest_part.getTable(); + destTableIsAcid = isAcidTable(dest_tab); if ((!conf.getBoolVar(HiveConf.ConfVars.HIVE_INSERT_INTO_EXTERNAL_TABLES)) && dest_tab.getTableType().equals(TableType.EXTERNAL_TABLE)) { throw new SemanticException( @@ -6110,9 +6116,10 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) lbCtx = constructListBucketingCtx(dest_part.getSkewedColNames(), dest_part.getSkewedColValues(), dest_part.getSkewedColValueLocationMaps(), dest_part.isStoredAsSubDirectories(), conf); - AcidUtils.Operation acidOp = getAcidType(table_desc.getOutputFileFormatClass()); - if (acidOp != AcidUtils.Operation.NOT_ACID) { - checkAcidConstraints(qb, table_desc); + AcidUtils.Operation acidOp = AcidUtils.Operation.NOT_ACID; + if (destTableIsAcid) { + acidOp = getAcidType(table_desc.getOutputFileFormatClass()); + checkAcidConstraints(qb, table_desc, dest_tab); } ltd = new LoadTableDesc(queryTmpdir, table_desc, dest_part.getSpec(), acidOp); ltd.setReplace(!qb.getParseInfo().isInsertIntoTable(dest_tab.getDbName(), @@ -6267,9 +6274,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) ArrayList vecCol = new ArrayList(); if (updating() || deleting()) { - vecCol.add(new ColumnInfo(VirtualColumn.ROWID.getName(), - //TypeInfoUtils.getTypeInfoFromObjectInspector(VirtualColumn.ROWID.getObjectInspector()), - VirtualColumn.ROWID.getTypeInfo(), + vecCol.add(new ColumnInfo(VirtualColumn.ROWID.getName(), VirtualColumn.ROWID.getTypeInfo(), "", true)); } else { try { @@ -6298,8 +6303,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) conf.getBoolVar(HiveConf.ConfVars.HIVEENFORCESORTING)))); // If this table is working with ACID semantics, turn off merging - boolean acidTable = isAcidTable(dest_tab); - canBeMerged &= !acidTable; + canBeMerged &= !destTableIsAcid; FileSinkDesc fileSinkDesc = new FileSinkDesc( queryTmpdir, @@ -6315,7 +6319,7 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) // If this is an insert, update, or delete on an ACID table then mark that so the // FileSinkOperator knows how to properly write to it. - if (acidTable) { + if (destTableIsAcid) { AcidUtils.Operation wt = updating() ? AcidUtils.Operation.UPDATE : (deleting() ? AcidUtils.Operation.DELETE : AcidUtils.Operation.INSERT); fileSinkDesc.setWriteType(wt); @@ -6376,9 +6380,12 @@ private Operator genFileSinkPlan(String dest, QB qb, Operator input) // * no insert overwrites // * no use of vectorization // * turns off reduce deduplication optimization, as that sometimes breaks acid + // * Check that the table is bucketed + // * Check that the table is not sorted // This method assumes you have already decided that this is an Acid write. Don't call it if // that isn't true. - private void checkAcidConstraints(QB qb, TableDesc tableDesc) throws SemanticException { + private void checkAcidConstraints(QB qb, TableDesc tableDesc, + Table table) throws SemanticException { String tableName = tableDesc.getTableName(); if (!qb.getParseInfo().isInsertIntoTable(tableName)) { LOG.debug("Couldn't find table " + tableName + " in insertIntoTable"); @@ -6392,6 +6399,16 @@ private void checkAcidConstraints(QB qb, TableDesc tableDesc) throws SemanticExc conf.setBoolVar(ConfVars.HIVEOPTREDUCEDEDUPLICATION, false); conf.setBoolVar(ConfVars.HIVE_HADOOP_SUPPORTS_SUBDIRECTORIES, true); conf.set(AcidUtils.CONF_ACID_KEY, "true"); + + if (table.getNumBuckets() < 1) { + throw new SemanticException(ErrorMsg.ACID_OP_ON_NONACID_TABLE, table.getTableName()); + } + if (table.getSortCols() != null && table.getSortCols().size() > 0) { + throw new SemanticException(ErrorMsg.ACID_NO_SORTED_BUCKETS, table.getTableName()); + } + + + } /** @@ -12121,9 +12138,9 @@ else return (ltd.getReplace() ? WriteEntity.WriteType.INSERT_OVERWRITE : // Even if the table is of Acid type, if we aren't working with an Acid compliant TxnManager // then return false. private boolean isAcidTable(Table tab) { - if (tab == null || tab.getOutputFormatClass() == null) return false; + if (tab == null) return false; if (!SessionState.get().getTxnMgr().supportsAcid()) return false; - return isAcidOutputFormat(tab.getOutputFormatClass()); + return tab.getProperty(ACID_TABLE_PROPERTY) != null; } private boolean isAcidOutputFormat(Class of) { diff --git ql/src/test/queries/clientnegative/delete_not_bucketed.q ql/src/test/queries/clientnegative/delete_not_bucketed.q new file mode 100644 index 0000000..80dffea --- /dev/null +++ ql/src/test/queries/clientnegative/delete_not_bucketed.q @@ -0,0 +1,7 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_notbucketed(a int, b varchar(128)) stored as orc TBLPROPERTIES ('transactional'='true'); + +delete from acid_notbucketed where a = 3; diff --git ql/src/test/queries/clientnegative/delete_sorted.q ql/src/test/queries/clientnegative/delete_sorted.q new file mode 100644 index 0000000..fd8d579 --- /dev/null +++ ql/src/test/queries/clientnegative/delete_sorted.q @@ -0,0 +1,7 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_insertsort(a int, b varchar(128)) partitioned by (ds string) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); + +delete from acid_insertsort where a = 3; diff --git ql/src/test/queries/clientnegative/insert_sorted.q ql/src/test/queries/clientnegative/insert_sorted.q new file mode 100644 index 0000000..18c942a --- /dev/null +++ ql/src/test/queries/clientnegative/insert_sorted.q @@ -0,0 +1,7 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); + +insert into table acid_insertsort select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; diff --git ql/src/test/queries/clientnegative/insert_values_sorted.q ql/src/test/queries/clientnegative/insert_values_sorted.q new file mode 100644 index 0000000..260e2fb --- /dev/null +++ ql/src/test/queries/clientnegative/insert_values_sorted.q @@ -0,0 +1,7 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); + +insert into table acid_insertsort values (1, 'abc'),(2, 'def'); diff --git ql/src/test/queries/clientnegative/update_not_bucketed.q ql/src/test/queries/clientnegative/update_not_bucketed.q new file mode 100644 index 0000000..8512fa7 --- /dev/null +++ ql/src/test/queries/clientnegative/update_not_bucketed.q @@ -0,0 +1,7 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_notbucketed(a int, b varchar(128)) partitioned by (ds string) stored as orc TBLPROPERTIES ('transactional'='true'); + +update acid_notbucketed set b = 'fred' where a = 3; diff --git ql/src/test/queries/clientnegative/update_partition_col.q ql/src/test/queries/clientnegative/update_partition_col.q index 929cc59..e9c60cc 100644 --- ql/src/test/queries/clientnegative/update_partition_col.q +++ ql/src/test/queries/clientnegative/update_partition_col.q @@ -2,6 +2,6 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table foo(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc; +create table foo(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); update foo set ds = 'fred'; diff --git ql/src/test/queries/clientnegative/update_sorted.q ql/src/test/queries/clientnegative/update_sorted.q new file mode 100644 index 0000000..917c3b5 --- /dev/null +++ ql/src/test/queries/clientnegative/update_sorted.q @@ -0,0 +1,7 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); + +update acid_insertsort set b = 'fred' where b = 'bob'; diff --git ql/src/test/queries/clientpositive/acid_vectorization.q ql/src/test/queries/clientpositive/acid_vectorization.q index a1bf971..3f386c9 100644 --- ql/src/test/queries/clientpositive/acid_vectorization.q +++ ql/src/test/queries/clientpositive/acid_vectorization.q @@ -4,7 +4,7 @@ set hive.enforce.bucketing=true; set hive.exec.dynamic.partition.mode=nonstrict; set hive.vectorized.execution.enabled=true; -CREATE TABLE acid_vectorized(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC; +CREATE TABLE acid_vectorized(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC TBLPROPERTIES ('transactional'='true'); insert into table acid_vectorized select cint, cstring1 from alltypesorc where cint is not null order by cint limit 10; set hive.vectorized.execution.enabled=true; insert into table acid_vectorized values (1, 'bar'); diff --git ql/src/test/queries/clientpositive/delete_all_non_partitioned.q ql/src/test/queries/clientpositive/delete_all_non_partitioned.q index f15391b..9110dcc 100644 --- ql/src/test/queries/clientpositive/delete_all_non_partitioned.q +++ ql/src/test/queries/clientpositive/delete_all_non_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_danp select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint < 0 order by cint limit 10; diff --git ql/src/test/queries/clientpositive/delete_all_partitioned.q ql/src/test/queries/clientpositive/delete_all_partitioned.q index 9ae6a54..f082b6d 100644 --- ql/src/test/queries/clientpositive/delete_all_partitioned.q +++ ql/src/test/queries/clientpositive/delete_all_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc; +create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_dap partition (ds='today') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint < 0 order by cint limit 10; insert into table acid_dap partition (ds='tomorrow') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint > 1000 order by cint limit 10; diff --git ql/src/test/queries/clientpositive/delete_orig_table.q ql/src/test/queries/clientpositive/delete_orig_table.q index d859eae..fd23f4b 100644 --- ql/src/test/queries/clientpositive/delete_orig_table.q +++ ql/src/test/queries/clientpositive/delete_orig_table.q @@ -17,7 +17,7 @@ create table acid_dot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc location '${system:test.tmp.dir}/delete_orig_table'; + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc location '${system:test.tmp.dir}/delete_orig_table' TBLPROPERTIES ('transactional'='true'); select count(*) from acid_dot; diff --git ql/src/test/queries/clientpositive/delete_tmp_table.q ql/src/test/queries/clientpositive/delete_tmp_table.q index 6f5a73d..eb6c095 100644 --- ql/src/test/queries/clientpositive/delete_tmp_table.q +++ ql/src/test/queries/clientpositive/delete_tmp_table.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_dtt select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; diff --git ql/src/test/queries/clientpositive/delete_where_no_match.q ql/src/test/queries/clientpositive/delete_where_no_match.q index 16a3839..8ed979d 100644 --- ql/src/test/queries/clientpositive/delete_where_no_match.q +++ ql/src/test/queries/clientpositive/delete_where_no_match.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_dwnm select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; diff --git ql/src/test/queries/clientpositive/delete_where_non_partitioned.q ql/src/test/queries/clientpositive/delete_where_non_partitioned.q index b703768..dac5375 100644 --- ql/src/test/queries/clientpositive/delete_where_non_partitioned.q +++ ql/src/test/queries/clientpositive/delete_where_non_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_dwnp select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; diff --git ql/src/test/queries/clientpositive/delete_where_partitioned.q ql/src/test/queries/clientpositive/delete_where_partitioned.q index 5959c3c..f84f26a 100644 --- ql/src/test/queries/clientpositive/delete_where_partitioned.q +++ ql/src/test/queries/clientpositive/delete_where_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc; +create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_dwp partition (ds='today') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint < 0 order by cint limit 10; insert into table acid_dwp partition (ds='tomorrow') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint > -10000000 order by cint limit 10; diff --git ql/src/test/queries/clientpositive/delete_whole_partition.q ql/src/test/queries/clientpositive/delete_whole_partition.q index 1444090..8228a32 100644 --- ql/src/test/queries/clientpositive/delete_whole_partition.q +++ ql/src/test/queries/clientpositive/delete_whole_partition.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc; +create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_dwhp partition (ds='today') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint < 0 order by cint limit 10; insert into table acid_dwhp partition (ds='tomorrow') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint > -10000000 order by cint limit 10; diff --git ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q new file mode 100644 index 0000000..c544589 --- /dev/null +++ ql/src/test/queries/clientpositive/insert_acid_dynamic_partition.q @@ -0,0 +1,10 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; +set hive.exec.dynamic.partition.mode=nonstrict; + +create table acid_dynamic(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); + +insert into table acid_dynamic partition (ds) select cint, cast(cstring1 as varchar(128)), cstring2 from alltypesorc where cint is not null and cint < 0 order by cint limit 5; + +select * from acid_dynamic order by a,b; diff --git ql/src/test/queries/clientpositive/insert_acid_not_bucketed.q ql/src/test/queries/clientpositive/insert_acid_not_bucketed.q new file mode 100644 index 0000000..a29b1e7 --- /dev/null +++ ql/src/test/queries/clientpositive/insert_acid_not_bucketed.q @@ -0,0 +1,9 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_notbucketed(a int, b varchar(128)) stored as orc; + +insert into table acid_notbucketed select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; + +select * from acid_notbucketed; diff --git ql/src/test/queries/clientpositive/insert_orig_table.q ql/src/test/queries/clientpositive/insert_orig_table.q index e1114d5..c38bd5a 100644 --- ql/src/test/queries/clientpositive/insert_orig_table.q +++ ql/src/test/queries/clientpositive/insert_orig_table.q @@ -14,7 +14,7 @@ create table acid_iot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc; + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true'); LOAD DATA LOCAL INPATH "../../data/files/alltypesorc" into table acid_iot; diff --git ql/src/test/queries/clientpositive/insert_update_delete.q ql/src/test/queries/clientpositive/insert_update_delete.q index a3ef181..8dbb77c 100644 --- ql/src/test/queries/clientpositive/insert_update_delete.q +++ ql/src/test/queries/clientpositive/insert_update_delete.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +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 ql/src/test/queries/clientpositive/insert_values_acid_not_bucketed.q ql/src/test/queries/clientpositive/insert_values_acid_not_bucketed.q new file mode 100644 index 0000000..fc0cb10 --- /dev/null +++ ql/src/test/queries/clientpositive/insert_values_acid_not_bucketed.q @@ -0,0 +1,9 @@ +set hive.support.concurrency=true; +set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; +set hive.enforce.bucketing=true; + +create table acid_notbucketed(a int, b varchar(128)) stored as orc; + +insert into table acid_notbucketed values (1, 'abc'), (2, 'def'); + +select * from acid_notbucketed; diff --git ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q index bea67a4..71e0e73 100644 --- ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q +++ ql/src/test/queries/clientpositive/insert_values_dynamic_partitioned.q @@ -5,7 +5,7 @@ set hive.enforce.bucketing=true; create table ivdp(i int, de decimal(5,2), - vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc; + vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table ivdp partition (ds) values (1, 109.23, 'and everywhere that mary went', 'today'), diff --git ql/src/test/queries/clientpositive/insert_values_non_partitioned.q ql/src/test/queries/clientpositive/insert_values_non_partitioned.q index f69100c..d0e7b0f 100644 --- ql/src/test/queries/clientpositive/insert_values_non_partitioned.q +++ ql/src/test/queries/clientpositive/insert_values_non_partitioned.q @@ -14,7 +14,7 @@ create table acid_ivnp(ti tinyint, b boolean, s string, vc varchar(128), - ch char(12)) clustered by (i) into 2 buckets stored as orc; + ch char(12)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_ivnp values (1, 257, 65537, 4294967297, 3.14, 3.141592654, 109.23, '2014-08-25 17:21:30.0', '2014-08-25', true, 'mary had a little lamb', 'ring around the rosie', 'red'), diff --git ql/src/test/queries/clientpositive/insert_values_orig_table.q ql/src/test/queries/clientpositive/insert_values_orig_table.q index 703ed81..8fef549 100644 --- ql/src/test/queries/clientpositive/insert_values_orig_table.q +++ ql/src/test/queries/clientpositive/insert_values_orig_table.q @@ -14,7 +14,7 @@ create table acid_ivot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc; + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true'); LOAD DATA LOCAL INPATH "../../data/files/alltypesorc" into table acid_ivot; diff --git ql/src/test/queries/clientpositive/insert_values_partitioned.q ql/src/test/queries/clientpositive/insert_values_partitioned.q index 70bd03b..c8223f7 100644 --- ql/src/test/queries/clientpositive/insert_values_partitioned.q +++ ql/src/test/queries/clientpositive/insert_values_partitioned.q @@ -13,7 +13,7 @@ create table acid_ivp(ti tinyint, dt date, s string, vc varchar(128), - ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc; + ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_ivp partition (ds='today') values (1, 257, 65537, 4294967297, 3.14, 3.141592654, 109.23, '2014-08-25 17:21:30.0', '2014-08-25', 'mary had a little lamb', 'ring around the rosie', 'red'), diff --git ql/src/test/queries/clientpositive/insert_values_tmp_table.q ql/src/test/queries/clientpositive/insert_values_tmp_table.q index a7afa73..4e4c39e 100644 --- ql/src/test/queries/clientpositive/insert_values_tmp_table.q +++ ql/src/test/queries/clientpositive/insert_values_tmp_table.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc; +create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_ivtt values (1, 109.23, 'mary had a little lamb'), diff --git ql/src/test/queries/clientpositive/update_after_multiple_inserts.q ql/src/test/queries/clientpositive/update_after_multiple_inserts.q index b440cf3..6ef209f 100644 --- ql/src/test/queries/clientpositive/update_after_multiple_inserts.q +++ ql/src/test/queries/clientpositive/update_after_multiple_inserts.q @@ -5,7 +5,7 @@ set hive.enforce.bucketing=true; create table acid_uami(i int, de decimal(5,2), - vc varchar(128)) clustered by (i) into 2 buckets stored as orc; + vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_uami values (1, 109.23, 'mary had a little lamb'), diff --git ql/src/test/queries/clientpositive/update_all_non_partitioned.q ql/src/test/queries/clientpositive/update_all_non_partitioned.q index 7c427df..3c01825 100644 --- ql/src/test/queries/clientpositive/update_all_non_partitioned.q +++ ql/src/test/queries/clientpositive/update_all_non_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_uanp select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint < 0 order by cint limit 10; diff --git ql/src/test/queries/clientpositive/update_all_partitioned.q ql/src/test/queries/clientpositive/update_all_partitioned.q index 80d40c1..b407985 100644 --- ql/src/test/queries/clientpositive/update_all_partitioned.q +++ ql/src/test/queries/clientpositive/update_all_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc; +create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_uap partition (ds='today') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint < 0 order by cint limit 10; insert into table acid_uap partition (ds='tomorrow') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint > 10 order by cint limit 10; diff --git ql/src/test/queries/clientpositive/update_all_types.q ql/src/test/queries/clientpositive/update_all_types.q index 8ed74f0..14ffc59 100644 --- ql/src/test/queries/clientpositive/update_all_types.q +++ ql/src/test/queries/clientpositive/update_all_types.q @@ -14,7 +14,7 @@ create table acid_uat(ti tinyint, s string, vc varchar(128), ch char(36), - b boolean) clustered by (i) into 2 buckets stored as orc; + b boolean) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_uat select ctinyint, diff --git ql/src/test/queries/clientpositive/update_orig_table.q ql/src/test/queries/clientpositive/update_orig_table.q index 61622d9..27b4a95 100644 --- ql/src/test/queries/clientpositive/update_orig_table.q +++ ql/src/test/queries/clientpositive/update_orig_table.q @@ -17,7 +17,7 @@ create table acid_uot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc location '${system:test.tmp.dir}/update_orig_table'; + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc location '${system:test.tmp.dir}/update_orig_table' TBLPROPERTIES ('transactional'='true'); update acid_uot set cstring1 = 'fred' where cint < -1070551679; diff --git ql/src/test/queries/clientpositive/update_tmp_table.q ql/src/test/queries/clientpositive/update_tmp_table.q index 5fbad2c..281357f 100644 --- ql/src/test/queries/clientpositive/update_tmp_table.q +++ ql/src/test/queries/clientpositive/update_tmp_table.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc; +create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_utt select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; diff --git ql/src/test/queries/clientpositive/update_two_cols.q ql/src/test/queries/clientpositive/update_two_cols.q index 716df7d..b1972e5 100644 --- ql/src/test/queries/clientpositive/update_two_cols.q +++ ql/src/test/queries/clientpositive/update_two_cols.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc; +create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_utc select cint, cast(cstring1 as varchar(128)), cfloat from alltypesorc where cint < 0 order by cint limit 10; diff --git ql/src/test/queries/clientpositive/update_where_no_match.q ql/src/test/queries/clientpositive/update_where_no_match.q index d3252de..d578862 100644 --- ql/src/test/queries/clientpositive/update_where_no_match.q +++ ql/src/test/queries/clientpositive/update_where_no_match.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_wnm select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; diff --git ql/src/test/queries/clientpositive/update_where_non_partitioned.q ql/src/test/queries/clientpositive/update_where_non_partitioned.q index e52d9e8..06c688f 100644 --- ql/src/test/queries/clientpositive/update_where_non_partitioned.q +++ ql/src/test/queries/clientpositive/update_where_non_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc; +create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_uwnp select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10; diff --git ql/src/test/queries/clientpositive/update_where_partitioned.q ql/src/test/queries/clientpositive/update_where_partitioned.q index d84da5b..858cebb 100644 --- ql/src/test/queries/clientpositive/update_where_partitioned.q +++ ql/src/test/queries/clientpositive/update_where_partitioned.q @@ -2,7 +2,7 @@ set hive.support.concurrency=true; set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager; set hive.enforce.bucketing=true; -create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc; +create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true'); insert into table acid_uwp partition (ds='today') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint < 0 order by cint limit 10; insert into table acid_uwp partition (ds='tomorrow') select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null and cint > 100 order by cint limit 10; diff --git ql/src/test/results/clientnegative/delete_non_acid_table.q.out ql/src/test/results/clientnegative/delete_non_acid_table.q.out index c1e54a8..a9b884a 100644 --- ql/src/test/results/clientnegative/delete_non_acid_table.q.out +++ ql/src/test/results/clientnegative/delete_non_acid_table.q.out @@ -34,4 +34,4 @@ POSTHOOK: Input: default@not_an_acid_table2 -1070883071 0ruyd6Y50JpdGRf6HqD -1070551679 iUR3Q -1069736047 k17Am8uPHWk02cEf1jet -FAILED: SemanticException [Error 10297]: Attempt to do update or delete on table default.not_an_acid_table2 that does not use an AcidOutputFormat +FAILED: SemanticException [Error 10297]: Attempt to do update or delete on table default.not_an_acid_table2 that does not use an AcidOutputFormat or is not bucketed diff --git ql/src/test/results/clientnegative/delete_not_bucketed.q.out ql/src/test/results/clientnegative/delete_not_bucketed.q.out new file mode 100644 index 0000000..d0ba680 --- /dev/null +++ ql/src/test/results/clientnegative/delete_not_bucketed.q.out @@ -0,0 +1,9 @@ +PREHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_notbucketed +FAILED: SemanticException [Error 10297]: Attempt to do update or delete on table acid_notbucketed that does not use an AcidOutputFormat or is not bucketed diff --git ql/src/test/results/clientnegative/delete_sorted.q.out ql/src/test/results/clientnegative/delete_sorted.q.out new file mode 100644 index 0000000..0d248d0 --- /dev/null +++ ql/src/test/results/clientnegative/delete_sorted.q.out @@ -0,0 +1,9 @@ +PREHOOK: query: create table acid_insertsort(a int, b varchar(128)) partitioned by (ds string) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_insertsort +POSTHOOK: query: create table acid_insertsort(a int, b varchar(128)) partitioned by (ds string) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_insertsort +FAILED: SemanticException [Error 10298]: ACID insert, update, delete not supported on tables that are sorted, table acid_insertsort diff --git ql/src/test/results/clientnegative/insert_sorted.q.out ql/src/test/results/clientnegative/insert_sorted.q.out new file mode 100644 index 0000000..50dd5eb --- /dev/null +++ ql/src/test/results/clientnegative/insert_sorted.q.out @@ -0,0 +1,9 @@ +PREHOOK: query: create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_insertsort +POSTHOOK: query: create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_insertsort +FAILED: SemanticException [Error 10298]: ACID insert, update, delete not supported on tables that are sorted, table acid_insertsort diff --git ql/src/test/results/clientnegative/insert_values_sorted.q.out ql/src/test/results/clientnegative/insert_values_sorted.q.out new file mode 100644 index 0000000..50dd5eb --- /dev/null +++ ql/src/test/results/clientnegative/insert_values_sorted.q.out @@ -0,0 +1,9 @@ +PREHOOK: query: create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_insertsort +POSTHOOK: query: create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_insertsort +FAILED: SemanticException [Error 10298]: ACID insert, update, delete not supported on tables that are sorted, table acid_insertsort diff --git ql/src/test/results/clientnegative/update_non_acid_table.q.out ql/src/test/results/clientnegative/update_non_acid_table.q.out index 4bf61db..381b0db 100644 --- ql/src/test/results/clientnegative/update_non_acid_table.q.out +++ ql/src/test/results/clientnegative/update_non_acid_table.q.out @@ -34,4 +34,4 @@ POSTHOOK: Input: default@not_an_acid_table -1070883071 0ruyd6Y50JpdGRf6HqD -1070551679 iUR3Q -1069736047 k17Am8uPHWk02cEf1jet -FAILED: SemanticException [Error 10297]: Attempt to do update or delete on table default.not_an_acid_table that does not use an AcidOutputFormat +FAILED: SemanticException [Error 10297]: Attempt to do update or delete on table default.not_an_acid_table that does not use an AcidOutputFormat or is not bucketed diff --git ql/src/test/results/clientnegative/update_not_bucketed.q.out ql/src/test/results/clientnegative/update_not_bucketed.q.out new file mode 100644 index 0000000..8ebf41d --- /dev/null +++ ql/src/test/results/clientnegative/update_not_bucketed.q.out @@ -0,0 +1,9 @@ +PREHOOK: query: create table acid_notbucketed(a int, b varchar(128)) partitioned by (ds string) stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: create table acid_notbucketed(a int, b varchar(128)) partitioned by (ds string) stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_notbucketed +FAILED: SemanticException [Error 10297]: Attempt to do update or delete on table acid_notbucketed that does not use an AcidOutputFormat or is not bucketed diff --git ql/src/test/results/clientnegative/update_partition_col.q.out ql/src/test/results/clientnegative/update_partition_col.q.out index 003b53f..81c5014 100644 --- ql/src/test/results/clientnegative/update_partition_col.q.out +++ ql/src/test/results/clientnegative/update_partition_col.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table foo(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table foo(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@foo -POSTHOOK: query: create table foo(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table foo(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@foo diff --git ql/src/test/results/clientnegative/update_sorted.q.out ql/src/test/results/clientnegative/update_sorted.q.out new file mode 100644 index 0000000..50dd5eb --- /dev/null +++ ql/src/test/results/clientnegative/update_sorted.q.out @@ -0,0 +1,9 @@ +PREHOOK: query: create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_insertsort +POSTHOOK: query: create table acid_insertsort(a int, b varchar(128)) clustered by (a) sorted by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_insertsort +FAILED: SemanticException [Error 10298]: ACID insert, update, delete not supported on tables that are sorted, table acid_insertsort diff --git ql/src/test/results/clientpositive/acid_vectorization.q.out ql/src/test/results/clientpositive/acid_vectorization.q.out index 4a9d19f..18dada5 100644 --- ql/src/test/results/clientpositive/acid_vectorization.q.out +++ ql/src/test/results/clientpositive/acid_vectorization.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: CREATE TABLE acid_vectorized(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC +PREHOOK: query: CREATE TABLE acid_vectorized(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_vectorized -POSTHOOK: query: CREATE TABLE acid_vectorized(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC +POSTHOOK: query: CREATE TABLE acid_vectorized(a INT, b STRING) CLUSTERED BY(a) INTO 2 BUCKETS STORED AS ORC TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_vectorized diff --git ql/src/test/results/clientpositive/delete_all_non_partitioned.q.out ql/src/test/results/clientpositive/delete_all_non_partitioned.q.out index 0d428ca..38ce075 100644 --- ql/src/test/results/clientpositive/delete_all_non_partitioned.q.out +++ ql/src/test/results/clientpositive/delete_all_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_danp -POSTHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_danp diff --git ql/src/test/results/clientpositive/delete_all_partitioned.q.out ql/src/test/results/clientpositive/delete_all_partitioned.q.out index 4486323..90f8753 100644 --- ql/src/test/results/clientpositive/delete_all_partitioned.q.out +++ ql/src/test/results/clientpositive/delete_all_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dap -POSTHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dap diff --git ql/src/test/results/clientpositive/delete_tmp_table.q.out ql/src/test/results/clientpositive/delete_tmp_table.q.out index ca568b3..4dc7344 100644 --- ql/src/test/results/clientpositive/delete_tmp_table.q.out +++ ql/src/test/results/clientpositive/delete_tmp_table.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dtt -POSTHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dtt diff --git ql/src/test/results/clientpositive/delete_where_no_match.q.out ql/src/test/results/clientpositive/delete_where_no_match.q.out index 1450ee6..cb2adc6 100644 --- ql/src/test/results/clientpositive/delete_where_no_match.q.out +++ ql/src/test/results/clientpositive/delete_where_no_match.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwnm -POSTHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwnm diff --git ql/src/test/results/clientpositive/delete_where_non_partitioned.q.out ql/src/test/results/clientpositive/delete_where_non_partitioned.q.out index d465e8e..1bdb1e6 100644 --- ql/src/test/results/clientpositive/delete_where_non_partitioned.q.out +++ ql/src/test/results/clientpositive/delete_where_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwnp -POSTHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwnp diff --git ql/src/test/results/clientpositive/delete_where_partitioned.q.out ql/src/test/results/clientpositive/delete_where_partitioned.q.out index 9f8581b..fc2e369 100644 --- ql/src/test/results/clientpositive/delete_where_partitioned.q.out +++ ql/src/test/results/clientpositive/delete_where_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwp -POSTHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwp diff --git ql/src/test/results/clientpositive/delete_whole_partition.q.out ql/src/test/results/clientpositive/delete_whole_partition.q.out index a2408eb..043daf4 100644 --- ql/src/test/results/clientpositive/delete_whole_partition.q.out +++ ql/src/test/results/clientpositive/delete_whole_partition.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwhp -POSTHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwhp diff --git ql/src/test/results/clientpositive/insert_acid_dynamic_partition.q.out ql/src/test/results/clientpositive/insert_acid_dynamic_partition.q.out new file mode 100644 index 0000000..07eedf3 --- /dev/null +++ ql/src/test/results/clientpositive/insert_acid_dynamic_partition.q.out @@ -0,0 +1,48 @@ +PREHOOK: query: create table acid_dynamic(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_dynamic +POSTHOOK: query: create table acid_dynamic(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_dynamic +PREHOOK: query: insert into table acid_dynamic partition (ds) select cint, cast(cstring1 as varchar(128)), cstring2 from alltypesorc where cint is not null and cint < 0 order by cint limit 5 +PREHOOK: type: QUERY +PREHOOK: Input: default@alltypesorc +PREHOOK: Output: default@acid_dynamic +POSTHOOK: query: insert into table acid_dynamic partition (ds) select cint, cast(cstring1 as varchar(128)), cstring2 from alltypesorc where cint is not null and cint < 0 order by cint limit 5 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@alltypesorc +POSTHOOK: Output: default@acid_dynamic@ds=4KWs6gw7lv2WYd66P +POSTHOOK: Output: default@acid_dynamic@ds=4hA4KQj2vD3fI6gX82220d +POSTHOOK: Output: default@acid_dynamic@ds=KbaDXiN85adbHRx58v +POSTHOOK: Output: default@acid_dynamic@ds=P76636jJ6qM17d7DIy +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4KWs6gw7lv2WYd66P).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4KWs6gw7lv2WYd66P).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4hA4KQj2vD3fI6gX82220d).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4hA4KQj2vD3fI6gX82220d).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=KbaDXiN85adbHRx58v).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=KbaDXiN85adbHRx58v).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=P76636jJ6qM17d7DIy).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=P76636jJ6qM17d7DIy).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +PREHOOK: query: select * from acid_dynamic order by a,b +PREHOOK: type: QUERY +PREHOOK: Input: default@acid_dynamic +PREHOOK: Input: default@acid_dynamic@ds=4KWs6gw7lv2WYd66P +PREHOOK: Input: default@acid_dynamic@ds=4hA4KQj2vD3fI6gX82220d +PREHOOK: Input: default@acid_dynamic@ds=KbaDXiN85adbHRx58v +PREHOOK: Input: default@acid_dynamic@ds=P76636jJ6qM17d7DIy +#### A masked pattern was here #### +POSTHOOK: query: select * from acid_dynamic order by a,b +POSTHOOK: type: QUERY +POSTHOOK: Input: default@acid_dynamic +POSTHOOK: Input: default@acid_dynamic@ds=4KWs6gw7lv2WYd66P +POSTHOOK: Input: default@acid_dynamic@ds=4hA4KQj2vD3fI6gX82220d +POSTHOOK: Input: default@acid_dynamic@ds=KbaDXiN85adbHRx58v +POSTHOOK: Input: default@acid_dynamic@ds=P76636jJ6qM17d7DIy +#### A masked pattern was here #### +-1073279343 oj1YrV5Wa P76636jJ6qM17d7DIy +-1073051226 A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d +-1072910839 0iqrc5 KbaDXiN85adbHRx58v +-1072081801 dPkN74F7 4KWs6gw7lv2WYd66P +-1072076362 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P diff --git ql/src/test/results/clientpositive/insert_acid_not_bucketed.q.out ql/src/test/results/clientpositive/insert_acid_not_bucketed.q.out new file mode 100644 index 0000000..985ae40 --- /dev/null +++ ql/src/test/results/clientpositive/insert_acid_not_bucketed.q.out @@ -0,0 +1,36 @@ +PREHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_notbucketed +PREHOOK: query: insert into table acid_notbucketed select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10 +PREHOOK: type: QUERY +PREHOOK: Input: default@alltypesorc +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: insert into table acid_notbucketed select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@alltypesorc +POSTHOOK: Output: default@acid_notbucketed +POSTHOOK: Lineage: acid_notbucketed.a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_notbucketed.b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +PREHOOK: query: select * from acid_notbucketed +PREHOOK: type: QUERY +PREHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +POSTHOOK: query: select * from acid_notbucketed +POSTHOOK: type: QUERY +POSTHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +-1073279343 oj1YrV5Wa +-1073051226 A34p7oRr2WvUJNf +-1072910839 0iqrc5 +-1072081801 dPkN74F7 +-1072076362 2uLyD28144vklju213J1mr +-1071480828 aw724t8c5558x2xneC624 +-1071363017 Anj0oF +-1070883071 0ruyd6Y50JpdGRf6HqD +-1070551679 iUR3Q +-1069736047 k17Am8uPHWk02cEf1jet diff --git ql/src/test/results/clientpositive/insert_orig_table.q.out ql/src/test/results/clientpositive/insert_orig_table.q.out index 97a284b..5eea74d 100644 --- ql/src/test/results/clientpositive/insert_orig_table.q.out +++ ql/src/test/results/clientpositive/insert_orig_table.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_iot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_iot @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_iot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_iot diff --git ql/src/test/results/clientpositive/insert_update_delete.q.out ql/src/test/results/clientpositive/insert_update_delete.q.out index e9f9984..9a3cf4b 100644 --- ql/src/test/results/clientpositive/insert_update_delete.q.out +++ ql/src/test/results/clientpositive/insert_update_delete.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_iud -POSTHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_iud diff --git ql/src/test/results/clientpositive/insert_values_acid_not_bucketed.q.out ql/src/test/results/clientpositive/insert_values_acid_not_bucketed.q.out new file mode 100644 index 0000000..4f8ddfa --- /dev/null +++ ql/src/test/results/clientpositive/insert_values_acid_not_bucketed.q.out @@ -0,0 +1,28 @@ +PREHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_notbucketed +PREHOOK: query: insert into table acid_notbucketed values (1, 'abc'), (2, 'def') +PREHOOK: type: QUERY +PREHOOK: Input: default@values__tmp__table__1 +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: insert into table acid_notbucketed values (1, 'abc'), (2, 'def') +POSTHOOK: type: QUERY +POSTHOOK: Input: default@values__tmp__table__1 +POSTHOOK: Output: default@acid_notbucketed +POSTHOOK: Lineage: acid_notbucketed.a EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ] +POSTHOOK: Lineage: acid_notbucketed.b EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2, type:string, comment:), ] +PREHOOK: query: select * from acid_notbucketed +PREHOOK: type: QUERY +PREHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +POSTHOOK: query: select * from acid_notbucketed +POSTHOOK: type: QUERY +POSTHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +1 abc +2 def diff --git ql/src/test/results/clientpositive/insert_values_dynamic_partitioned.q.out ql/src/test/results/clientpositive/insert_values_dynamic_partitioned.q.out index daea059..773feb4 100644 --- ql/src/test/results/clientpositive/insert_values_dynamic_partitioned.q.out +++ ql/src/test/results/clientpositive/insert_values_dynamic_partitioned.q.out @@ -1,12 +1,12 @@ PREHOOK: query: create table ivdp(i int, de decimal(5,2), - vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@ivdp POSTHOOK: query: create table ivdp(i int, de decimal(5,2), - vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@ivdp diff --git ql/src/test/results/clientpositive/insert_values_non_partitioned.q.out ql/src/test/results/clientpositive/insert_values_non_partitioned.q.out index ff041b8..5b1c3cc 100644 --- ql/src/test/results/clientpositive/insert_values_non_partitioned.q.out +++ ql/src/test/results/clientpositive/insert_values_non_partitioned.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_ivnp(ti tinyint, b boolean, s string, vc varchar(128), - ch char(12)) clustered by (i) into 2 buckets stored as orc + ch char(12)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivnp @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_ivnp(ti tinyint, b boolean, s string, vc varchar(128), - ch char(12)) clustered by (i) into 2 buckets stored as orc + ch char(12)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivnp diff --git ql/src/test/results/clientpositive/insert_values_orig_table.q.out ql/src/test/results/clientpositive/insert_values_orig_table.q.out index 69220ec..684cd1b 100644 --- ql/src/test/results/clientpositive/insert_values_orig_table.q.out +++ ql/src/test/results/clientpositive/insert_values_orig_table.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_ivot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivot @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_ivot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivot diff --git ql/src/test/results/clientpositive/insert_values_partitioned.q.out ql/src/test/results/clientpositive/insert_values_partitioned.q.out index 9fb89ff..6681992 100644 --- ql/src/test/results/clientpositive/insert_values_partitioned.q.out +++ ql/src/test/results/clientpositive/insert_values_partitioned.q.out @@ -9,7 +9,7 @@ PREHOOK: query: create table acid_ivp(ti tinyint, dt date, s string, vc varchar(128), - ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivp @@ -24,7 +24,7 @@ POSTHOOK: query: create table acid_ivp(ti tinyint, dt date, s string, vc varchar(128), - ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivp diff --git ql/src/test/results/clientpositive/insert_values_tmp_table.q.out ql/src/test/results/clientpositive/insert_values_tmp_table.q.out index a424c18..170b4a7 100644 --- ql/src/test/results/clientpositive/insert_values_tmp_table.q.out +++ ql/src/test/results/clientpositive/insert_values_tmp_table.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc +PREHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivtt -POSTHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc +POSTHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivtt diff --git ql/src/test/results/clientpositive/tez/delete_all_non_partitioned.q.out ql/src/test/results/clientpositive/tez/delete_all_non_partitioned.q.out index 0d428ca..38ce075 100644 --- ql/src/test/results/clientpositive/tez/delete_all_non_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/delete_all_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_danp -POSTHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_danp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_danp diff --git ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out index 4486323..90f8753 100644 --- ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/delete_all_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dap -POSTHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dap diff --git ql/src/test/results/clientpositive/tez/delete_tmp_table.q.out ql/src/test/results/clientpositive/tez/delete_tmp_table.q.out index ca568b3..4dc7344 100644 --- ql/src/test/results/clientpositive/tez/delete_tmp_table.q.out +++ ql/src/test/results/clientpositive/tez/delete_tmp_table.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dtt -POSTHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create temporary table acid_dtt(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dtt diff --git ql/src/test/results/clientpositive/tez/delete_where_no_match.q.out ql/src/test/results/clientpositive/tez/delete_where_no_match.q.out index 1450ee6..cb2adc6 100644 --- ql/src/test/results/clientpositive/tez/delete_where_no_match.q.out +++ ql/src/test/results/clientpositive/tez/delete_where_no_match.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwnm -POSTHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwnm diff --git ql/src/test/results/clientpositive/tez/delete_where_non_partitioned.q.out ql/src/test/results/clientpositive/tez/delete_where_non_partitioned.q.out index d465e8e..1bdb1e6 100644 --- ql/src/test/results/clientpositive/tez/delete_where_non_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/delete_where_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwnp -POSTHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwnp diff --git ql/src/test/results/clientpositive/tez/delete_where_partitioned.q.out ql/src/test/results/clientpositive/tez/delete_where_partitioned.q.out index 9f8581b..fc2e369 100644 --- ql/src/test/results/clientpositive/tez/delete_where_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/delete_where_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwp -POSTHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwp diff --git ql/src/test/results/clientpositive/tez/delete_whole_partition.q.out ql/src/test/results/clientpositive/tez/delete_whole_partition.q.out index a2408eb..043daf4 100644 --- ql/src/test/results/clientpositive/tez/delete_whole_partition.q.out +++ ql/src/test/results/clientpositive/tez/delete_whole_partition.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_dwhp -POSTHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_dwhp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_dwhp diff --git ql/src/test/results/clientpositive/tez/insert_acid_dynamic_partition.q.out ql/src/test/results/clientpositive/tez/insert_acid_dynamic_partition.q.out new file mode 100644 index 0000000..07eedf3 --- /dev/null +++ ql/src/test/results/clientpositive/tez/insert_acid_dynamic_partition.q.out @@ -0,0 +1,48 @@ +PREHOOK: query: create table acid_dynamic(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_dynamic +POSTHOOK: query: create table acid_dynamic(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_dynamic +PREHOOK: query: insert into table acid_dynamic partition (ds) select cint, cast(cstring1 as varchar(128)), cstring2 from alltypesorc where cint is not null and cint < 0 order by cint limit 5 +PREHOOK: type: QUERY +PREHOOK: Input: default@alltypesorc +PREHOOK: Output: default@acid_dynamic +POSTHOOK: query: insert into table acid_dynamic partition (ds) select cint, cast(cstring1 as varchar(128)), cstring2 from alltypesorc where cint is not null and cint < 0 order by cint limit 5 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@alltypesorc +POSTHOOK: Output: default@acid_dynamic@ds=4KWs6gw7lv2WYd66P +POSTHOOK: Output: default@acid_dynamic@ds=4hA4KQj2vD3fI6gX82220d +POSTHOOK: Output: default@acid_dynamic@ds=KbaDXiN85adbHRx58v +POSTHOOK: Output: default@acid_dynamic@ds=P76636jJ6qM17d7DIy +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4KWs6gw7lv2WYd66P).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4KWs6gw7lv2WYd66P).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4hA4KQj2vD3fI6gX82220d).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=4hA4KQj2vD3fI6gX82220d).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=KbaDXiN85adbHRx58v).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=KbaDXiN85adbHRx58v).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=P76636jJ6qM17d7DIy).a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_dynamic PARTITION(ds=P76636jJ6qM17d7DIy).b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +PREHOOK: query: select * from acid_dynamic order by a,b +PREHOOK: type: QUERY +PREHOOK: Input: default@acid_dynamic +PREHOOK: Input: default@acid_dynamic@ds=4KWs6gw7lv2WYd66P +PREHOOK: Input: default@acid_dynamic@ds=4hA4KQj2vD3fI6gX82220d +PREHOOK: Input: default@acid_dynamic@ds=KbaDXiN85adbHRx58v +PREHOOK: Input: default@acid_dynamic@ds=P76636jJ6qM17d7DIy +#### A masked pattern was here #### +POSTHOOK: query: select * from acid_dynamic order by a,b +POSTHOOK: type: QUERY +POSTHOOK: Input: default@acid_dynamic +POSTHOOK: Input: default@acid_dynamic@ds=4KWs6gw7lv2WYd66P +POSTHOOK: Input: default@acid_dynamic@ds=4hA4KQj2vD3fI6gX82220d +POSTHOOK: Input: default@acid_dynamic@ds=KbaDXiN85adbHRx58v +POSTHOOK: Input: default@acid_dynamic@ds=P76636jJ6qM17d7DIy +#### A masked pattern was here #### +-1073279343 oj1YrV5Wa P76636jJ6qM17d7DIy +-1073051226 A34p7oRr2WvUJNf 4hA4KQj2vD3fI6gX82220d +-1072910839 0iqrc5 KbaDXiN85adbHRx58v +-1072081801 dPkN74F7 4KWs6gw7lv2WYd66P +-1072076362 2uLyD28144vklju213J1mr 4KWs6gw7lv2WYd66P diff --git ql/src/test/results/clientpositive/tez/insert_acid_not_bucketed.q.out ql/src/test/results/clientpositive/tez/insert_acid_not_bucketed.q.out new file mode 100644 index 0000000..985ae40 --- /dev/null +++ ql/src/test/results/clientpositive/tez/insert_acid_not_bucketed.q.out @@ -0,0 +1,36 @@ +PREHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_notbucketed +PREHOOK: query: insert into table acid_notbucketed select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10 +PREHOOK: type: QUERY +PREHOOK: Input: default@alltypesorc +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: insert into table acid_notbucketed select cint, cast(cstring1 as varchar(128)) from alltypesorc where cint is not null order by cint limit 10 +POSTHOOK: type: QUERY +POSTHOOK: Input: default@alltypesorc +POSTHOOK: Output: default@acid_notbucketed +POSTHOOK: Lineage: acid_notbucketed.a SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: acid_notbucketed.b EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +PREHOOK: query: select * from acid_notbucketed +PREHOOK: type: QUERY +PREHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +POSTHOOK: query: select * from acid_notbucketed +POSTHOOK: type: QUERY +POSTHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +-1073279343 oj1YrV5Wa +-1073051226 A34p7oRr2WvUJNf +-1072910839 0iqrc5 +-1072081801 dPkN74F7 +-1072076362 2uLyD28144vklju213J1mr +-1071480828 aw724t8c5558x2xneC624 +-1071363017 Anj0oF +-1070883071 0ruyd6Y50JpdGRf6HqD +-1070551679 iUR3Q +-1069736047 k17Am8uPHWk02cEf1jet diff --git ql/src/test/results/clientpositive/tez/insert_orig_table.q.out ql/src/test/results/clientpositive/tez/insert_orig_table.q.out index 97a284b..5eea74d 100644 --- ql/src/test/results/clientpositive/tez/insert_orig_table.q.out +++ ql/src/test/results/clientpositive/tez/insert_orig_table.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_iot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_iot @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_iot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_iot diff --git ql/src/test/results/clientpositive/tez/insert_update_delete.q.out ql/src/test/results/clientpositive/tez/insert_update_delete.q.out index e9f9984..9a3cf4b 100644 --- ql/src/test/results/clientpositive/tez/insert_update_delete.q.out +++ ql/src/test/results/clientpositive/tez/insert_update_delete.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_iud -POSTHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_iud(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_iud diff --git ql/src/test/results/clientpositive/tez/insert_values_acid_not_bucketed.q.out ql/src/test/results/clientpositive/tez/insert_values_acid_not_bucketed.q.out new file mode 100644 index 0000000..4f8ddfa --- /dev/null +++ ql/src/test/results/clientpositive/tez/insert_values_acid_not_bucketed.q.out @@ -0,0 +1,28 @@ +PREHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: create table acid_notbucketed(a int, b varchar(128)) stored as orc +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@acid_notbucketed +PREHOOK: query: insert into table acid_notbucketed values (1, 'abc'), (2, 'def') +PREHOOK: type: QUERY +PREHOOK: Input: default@values__tmp__table__1 +PREHOOK: Output: default@acid_notbucketed +POSTHOOK: query: insert into table acid_notbucketed values (1, 'abc'), (2, 'def') +POSTHOOK: type: QUERY +POSTHOOK: Input: default@values__tmp__table__1 +POSTHOOK: Output: default@acid_notbucketed +POSTHOOK: Lineage: acid_notbucketed.a EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col1, type:string, comment:), ] +POSTHOOK: Lineage: acid_notbucketed.b EXPRESSION [(values__tmp__table__1)values__tmp__table__1.FieldSchema(name:tmp_values_col2, type:string, comment:), ] +PREHOOK: query: select * from acid_notbucketed +PREHOOK: type: QUERY +PREHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +POSTHOOK: query: select * from acid_notbucketed +POSTHOOK: type: QUERY +POSTHOOK: Input: default@acid_notbucketed +#### A masked pattern was here #### +1 abc +2 def diff --git ql/src/test/results/clientpositive/tez/insert_values_dynamic_partitioned.q.out ql/src/test/results/clientpositive/tez/insert_values_dynamic_partitioned.q.out index daea059..773feb4 100644 --- ql/src/test/results/clientpositive/tez/insert_values_dynamic_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/insert_values_dynamic_partitioned.q.out @@ -1,12 +1,12 @@ PREHOOK: query: create table ivdp(i int, de decimal(5,2), - vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@ivdp POSTHOOK: query: create table ivdp(i int, de decimal(5,2), - vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@ivdp diff --git ql/src/test/results/clientpositive/tez/insert_values_non_partitioned.q.out ql/src/test/results/clientpositive/tez/insert_values_non_partitioned.q.out index ff041b8..5b1c3cc 100644 --- ql/src/test/results/clientpositive/tez/insert_values_non_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/insert_values_non_partitioned.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_ivnp(ti tinyint, b boolean, s string, vc varchar(128), - ch char(12)) clustered by (i) into 2 buckets stored as orc + ch char(12)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivnp @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_ivnp(ti tinyint, b boolean, s string, vc varchar(128), - ch char(12)) clustered by (i) into 2 buckets stored as orc + ch char(12)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivnp diff --git ql/src/test/results/clientpositive/tez/insert_values_orig_table.q.out ql/src/test/results/clientpositive/tez/insert_values_orig_table.q.out index 69220ec..684cd1b 100644 --- ql/src/test/results/clientpositive/tez/insert_values_orig_table.q.out +++ ql/src/test/results/clientpositive/tez/insert_values_orig_table.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_ivot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivot @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_ivot( ctimestamp1 TIMESTAMP, ctimestamp2 TIMESTAMP, cboolean1 BOOLEAN, - cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc + cboolean2 BOOLEAN) clustered by (cint) into 1 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivot diff --git ql/src/test/results/clientpositive/tez/insert_values_partitioned.q.out ql/src/test/results/clientpositive/tez/insert_values_partitioned.q.out index 9fb89ff..6681992 100644 --- ql/src/test/results/clientpositive/tez/insert_values_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/insert_values_partitioned.q.out @@ -9,7 +9,7 @@ PREHOOK: query: create table acid_ivp(ti tinyint, dt date, s string, vc varchar(128), - ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivp @@ -24,7 +24,7 @@ POSTHOOK: query: create table acid_ivp(ti tinyint, dt date, s string, vc varchar(128), - ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc + ch char(12)) partitioned by (ds string) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivp diff --git ql/src/test/results/clientpositive/tez/insert_values_tmp_table.q.out ql/src/test/results/clientpositive/tez/insert_values_tmp_table.q.out index a424c18..170b4a7 100644 --- ql/src/test/results/clientpositive/tez/insert_values_tmp_table.q.out +++ ql/src/test/results/clientpositive/tez/insert_values_tmp_table.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc +PREHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_ivtt -POSTHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc +POSTHOOK: query: create temporary table acid_ivtt(i int, de decimal(5,2), vc varchar(128)) clustered by (vc) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_ivtt diff --git ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out index cb8e319..a2ad3af 100644 --- ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out +++ ql/src/test/results/clientpositive/tez/update_after_multiple_inserts.q.out @@ -1,12 +1,12 @@ PREHOOK: query: create table acid_uami(i int, de decimal(5,2), - vc varchar(128)) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uami POSTHOOK: query: create table acid_uami(i int, de decimal(5,2), - vc varchar(128)) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uami diff --git ql/src/test/results/clientpositive/tez/update_all_non_partitioned.q.out ql/src/test/results/clientpositive/tez/update_all_non_partitioned.q.out index fde6d8d..39dd71b 100644 --- ql/src/test/results/clientpositive/tez/update_all_non_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/update_all_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uanp -POSTHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uanp diff --git ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out index 3fae6a9..286e2ed 100644 --- ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/update_all_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uap -POSTHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uap diff --git ql/src/test/results/clientpositive/tez/update_all_types.q.out ql/src/test/results/clientpositive/tez/update_all_types.q.out index c09293c..f1353d0 100644 --- ql/src/test/results/clientpositive/tez/update_all_types.q.out +++ ql/src/test/results/clientpositive/tez/update_all_types.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_uat(ti tinyint, s string, vc varchar(128), ch char(36), - b boolean) clustered by (i) into 2 buckets stored as orc + b boolean) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uat @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_uat(ti tinyint, s string, vc varchar(128), ch char(36), - b boolean) clustered by (i) into 2 buckets stored as orc + b boolean) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uat diff --git ql/src/test/results/clientpositive/tez/update_tmp_table.q.out ql/src/test/results/clientpositive/tez/update_tmp_table.q.out index 8180f06..3c86a0c 100644 --- ql/src/test/results/clientpositive/tez/update_tmp_table.q.out +++ ql/src/test/results/clientpositive/tez/update_tmp_table.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc +PREHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_utt -POSTHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc +POSTHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_utt diff --git ql/src/test/results/clientpositive/tez/update_two_cols.q.out ql/src/test/results/clientpositive/tez/update_two_cols.q.out index 553608f..5132c0c 100644 --- ql/src/test/results/clientpositive/tez/update_two_cols.q.out +++ ql/src/test/results/clientpositive/tez/update_two_cols.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_utc -POSTHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_utc diff --git ql/src/test/results/clientpositive/tez/update_where_no_match.q.out ql/src/test/results/clientpositive/tez/update_where_no_match.q.out index afef267..c88899e 100644 --- ql/src/test/results/clientpositive/tez/update_where_no_match.q.out +++ ql/src/test/results/clientpositive/tez/update_where_no_match.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_wnm -POSTHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_wnm diff --git ql/src/test/results/clientpositive/tez/update_where_non_partitioned.q.out ql/src/test/results/clientpositive/tez/update_where_non_partitioned.q.out index 5c79379..9c79235 100644 --- ql/src/test/results/clientpositive/tez/update_where_non_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/update_where_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uwnp -POSTHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uwnp diff --git ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out index b83c52a..fef0dc0 100644 --- ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out +++ ql/src/test/results/clientpositive/tez/update_where_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uwp -POSTHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uwp diff --git ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out index cb8e319..a2ad3af 100644 --- ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out +++ ql/src/test/results/clientpositive/update_after_multiple_inserts.q.out @@ -1,12 +1,12 @@ PREHOOK: query: create table acid_uami(i int, de decimal(5,2), - vc varchar(128)) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uami POSTHOOK: query: create table acid_uami(i int, de decimal(5,2), - vc varchar(128)) clustered by (i) into 2 buckets stored as orc + vc varchar(128)) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uami diff --git ql/src/test/results/clientpositive/update_all_non_partitioned.q.out ql/src/test/results/clientpositive/update_all_non_partitioned.q.out index fde6d8d..39dd71b 100644 --- ql/src/test/results/clientpositive/update_all_non_partitioned.q.out +++ ql/src/test/results/clientpositive/update_all_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uanp -POSTHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uanp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uanp diff --git ql/src/test/results/clientpositive/update_all_partitioned.q.out ql/src/test/results/clientpositive/update_all_partitioned.q.out index 3fae6a9..286e2ed 100644 --- ql/src/test/results/clientpositive/update_all_partitioned.q.out +++ ql/src/test/results/clientpositive/update_all_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uap -POSTHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uap(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uap diff --git ql/src/test/results/clientpositive/update_all_types.q.out ql/src/test/results/clientpositive/update_all_types.q.out index c09293c..f1353d0 100644 --- ql/src/test/results/clientpositive/update_all_types.q.out +++ ql/src/test/results/clientpositive/update_all_types.q.out @@ -10,7 +10,7 @@ PREHOOK: query: create table acid_uat(ti tinyint, s string, vc varchar(128), ch char(36), - b boolean) clustered by (i) into 2 buckets stored as orc + b boolean) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uat @@ -26,7 +26,7 @@ POSTHOOK: query: create table acid_uat(ti tinyint, s string, vc varchar(128), ch char(36), - b boolean) clustered by (i) into 2 buckets stored as orc + b boolean) clustered by (i) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uat diff --git ql/src/test/results/clientpositive/update_tmp_table.q.out ql/src/test/results/clientpositive/update_tmp_table.q.out index 8180f06..3c86a0c 100644 --- ql/src/test/results/clientpositive/update_tmp_table.q.out +++ ql/src/test/results/clientpositive/update_tmp_table.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc +PREHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_utt -POSTHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc +POSTHOOK: query: create table acid_utt(a int, b varchar(128)) clustered by (b) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_utt diff --git ql/src/test/results/clientpositive/update_two_cols.q.out ql/src/test/results/clientpositive/update_two_cols.q.out index 553608f..5132c0c 100644 --- ql/src/test/results/clientpositive/update_two_cols.q.out +++ ql/src/test/results/clientpositive/update_two_cols.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_utc -POSTHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_utc(a int, b varchar(128), c float) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_utc diff --git ql/src/test/results/clientpositive/update_where_no_match.q.out ql/src/test/results/clientpositive/update_where_no_match.q.out index afef267..c88899e 100644 --- ql/src/test/results/clientpositive/update_where_no_match.q.out +++ ql/src/test/results/clientpositive/update_where_no_match.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_wnm -POSTHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_wnm(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_wnm diff --git ql/src/test/results/clientpositive/update_where_non_partitioned.q.out ql/src/test/results/clientpositive/update_where_non_partitioned.q.out index 5c79379..9c79235 100644 --- ql/src/test/results/clientpositive/update_where_non_partitioned.q.out +++ ql/src/test/results/clientpositive/update_where_non_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uwnp -POSTHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uwnp(a int, b varchar(128)) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uwnp diff --git ql/src/test/results/clientpositive/update_where_partitioned.q.out ql/src/test/results/clientpositive/update_where_partitioned.q.out index b83c52a..fef0dc0 100644 --- ql/src/test/results/clientpositive/update_where_partitioned.q.out +++ ql/src/test/results/clientpositive/update_where_partitioned.q.out @@ -1,8 +1,8 @@ -PREHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +PREHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') PREHOOK: type: CREATETABLE PREHOOK: Output: database:default PREHOOK: Output: default@acid_uwp -POSTHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc +POSTHOOK: query: create table acid_uwp(a int, b varchar(128)) partitioned by (ds string) clustered by (a) into 2 buckets stored as orc TBLPROPERTIES ('transactional'='true') POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@acid_uwp