diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 56d68f5..7134d49 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -456,6 +456,11 @@ HIVEDEFAULTRCFILESERDE("hive.default.rcfile.serde", "org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe"), + SERDESUSINGMETASTOREFORSCHEMA("hive.serdes.using.metastore.for.schema","org.apache.hadoop.hive.ql.io.orc.OrcSerde," + + "org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe,org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe," + + "org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe,org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe," + + "org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe,org.apache.hadoop.hive.ql.io.parquet.serde.ParquetHiveSerDe," + + "org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe"), //Location of Hive run time structured log file HIVEHISTORYFILELOC("hive.querylog.location", System.getProperty("java.io.tmpdir") + File.separator + System.getProperty("user.name")), diff --git itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java index 23e67e3..c32ead7 100644 --- itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java +++ itests/test-serde/src/main/java/org/apache/hadoop/hive/serde2/TestSerDe.java @@ -37,6 +37,9 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; + /** * TestSerDe. * @@ -94,7 +97,7 @@ public void initialize(Configuration job, Properties tbl) throws SerDeException } else { columnNames = Arrays.asList(columnProperty.split(",")); cachedObjectInspector = MetadataListStructObjectInspector - .getInstance(columnNames); + .getInstance(columnNames,Lists.newArrayList(Splitter.on('\0').split(tbl.getProperty("columns.comments")))); } LOG.info(getClass().getName() + ": initialized with columnNames: " + columnNames); diff --git metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index 06c216f..a461240 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -159,7 +159,6 @@ import org.apache.hadoop.hive.metastore.txn.TxnHandler; import org.apache.hadoop.hive.serde2.Deserializer; import org.apache.hadoop.hive.serde2.SerDeException; -import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.shims.ShimLoader; import org.apache.hadoop.hive.thrift.HadoopThriftAuthBridge; import org.apache.hadoop.hive.thrift.TUGIContainingTransport; @@ -2899,9 +2898,8 @@ public void alter_table_with_environment_context(final String dbname, } catch (NoSuchObjectException e) { throw new UnknownTableException(e.getMessage()); } - boolean getColsFromSerDe = SerDeUtils.shouldGetColsFromSerDe( - tbl.getSd().getSerdeInfo().getSerializationLib()); - if (!getColsFromSerDe) { + if (hiveConf.getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname) + .contains(tbl.getSd().getSerdeInfo().getSerializationLib())) { ret = tbl.getSd().getCols(); } else { try { diff --git metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java index cee1637..209349b 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java @@ -202,7 +202,7 @@ public static boolean updateUnpartitionedTableStatsFast(Database db, Table tbl, } params.put(StatsSetupConst.COLUMN_STATS_ACCURATE, StatsSetupConst.FALSE); } else { - params.remove(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK); + params.remove(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK); params.put(StatsSetupConst.COLUMN_STATS_ACCURATE, StatsSetupConst.TRUE); } } @@ -233,7 +233,7 @@ public static boolean requireCalStats(Configuration hiveConf, Partition oldPart, if(newPart.getParameters().containsKey(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK)) { return true; } - + // requires to calculate stats if new and old have different fast stats if ((oldPart != null) && (oldPart.getParameters() != null)) { for (String stat : StatsSetupConst.fastStats) { @@ -472,14 +472,14 @@ static public boolean validateName(String name) { } return false; } - + /* * At the Metadata level there are no restrictions on Column Names. */ public static final boolean validateColumnName(String name) { return true; } - + static public String validateTblColumns(List cols) { for (FieldSchema fieldSchema : cols) { if (!validateColumnName(fieldSchema.getName())) { @@ -927,14 +927,17 @@ public static Properties getSchema( } StringBuilder colNameBuf = new StringBuilder(); StringBuilder colTypeBuf = new StringBuilder(); + StringBuilder colComment = new StringBuilder(); boolean first = true; for (FieldSchema col : tblsd.getCols()) { if (!first) { colNameBuf.append(","); colTypeBuf.append(":"); + colComment.append('\0'); } colNameBuf.append(col.getName()); colTypeBuf.append(col.getType()); + colComment.append((null != col.getComment()) ? col.getComment() : ""); first = false; } String colNames = colNameBuf.toString(); @@ -945,6 +948,7 @@ public static Properties getSchema( schema.setProperty( org.apache.hadoop.hive.metastore.api.hive_metastoreConstants.META_TABLE_COLUMN_TYPES, colTypes); + schema.setProperty("columns.comments", colComment.toString()); if (sd.getCols() != null) { schema.setProperty( org.apache.hadoop.hive.serde.serdeConstants.SERIALIZATION_DDL, @@ -1150,7 +1154,7 @@ static void logAndThrowMetaException(Exception e) throws MetaException { private static final String FROM_SERIALIZER = "from deserializer"; private static String determineFieldComment(String comment) { - return (comment == null || comment.isEmpty()) ? FROM_SERIALIZER : comment; + return (comment == null) ? FROM_SERIALIZER : comment; } /** @@ -1235,6 +1239,7 @@ public static boolean isNonNativeTable(Table table) { * Filter that filters out hidden files */ private static final PathFilter hiddenFileFilter = new PathFilter() { + @Override public boolean accept(Path p) { String name = p.getName(); return !name.startsWith("_") && !name.startsWith("."); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java index 42df435..699a30d 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -3198,11 +3198,9 @@ private int describeTable(Hive db, DescTableDesc descTbl) throws HiveException { cols = (part == null || tbl.getTableType() == TableType.VIRTUAL_VIEW) ? tbl.getCols() : part.getCols(); - if (!descTbl.isFormatted()) { - if (tableName.equals(colPath)) { - cols.addAll(tbl.getPartCols()); - } - } + if (!descTbl.isFormatted()) { + cols.addAll(tbl.getPartCols()); + } } else { cols = Hive.getFieldsFromDeserializer(colPath, tbl.getDeserializer()); } @@ -3504,8 +3502,11 @@ private int alterTable(Hive db, AlterTableDesc alterTbl) throws HiveException { tbl.getTTable().getSd().getSerdeInfo().getParameters().putAll( alterTbl.getProps()); } - tbl.setFields(Hive.getFieldsFromDeserializer(tbl.getTableName(), tbl. - getDeserializer())); + if (!conf.getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname) + .contains(serdeName)) { + tbl.setFields(Hive.getFieldsFromDeserializer(tbl.getTableName(), tbl. + getDeserializer())); + } } } else if (alterTbl.getOp() == AlterTableDesc.AlterTableTypes.ADDFILEFORMAT) { if(part != null) { diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java index 9a6e336..f5fcfa9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java @@ -33,6 +33,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.JavaUtils; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.ProtectMode; import org.apache.hadoop.hive.metastore.Warehouse; @@ -499,12 +500,12 @@ public void setTPartition( } public List getCols() { - if (!SerDeUtils.shouldGetColsFromSerDe( - tPartition.getSd().getSerdeInfo().getSerializationLib())) { - return tPartition.getSd().getCols(); - } try { + if (Hive.get().getConf().getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname) + .contains(tPartition.getSd().getSerdeInfo().getSerializationLib())) { + return tPartition.getSd().getCols(); + } return Hive.getFieldsFromDeserializer(table.getTableName(), getDeserializer()); } catch (HiveException e) { LOG.error("Unable to get cols from serde: " + diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java index 45ad315..c943bd0 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java @@ -35,6 +35,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.common.JavaUtils; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.apache.hadoop.hive.metastore.ProtectMode; import org.apache.hadoop.hive.metastore.TableType; @@ -610,18 +611,18 @@ private boolean isField(String col) { } public List getCols() { - boolean getColsFromSerDe = SerDeUtils.shouldGetColsFromSerDe( - getSerializationLib()); - if (!getColsFromSerDe) { - return tTable.getSd().getCols(); - } else { - try { + + try { + if (null == getSerializationLib() || Hive.get().getConf().getStringCollection( + ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname).contains(getSerializationLib())) { + return tTable.getSd().getCols(); + } else { return Hive.getFieldsFromDeserializer(getTableName(), getDeserializer()); - } catch (HiveException e) { - LOG.error("Unable to get field from serde: " + getSerializationLib(), e); } - return new ArrayList(); + } catch (HiveException e) { + LOG.error("Unable to get field from serde: " + getSerializationLib(), e); } + return new ArrayList(); } /** diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java index de04cca..2e54027 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/formatting/MetaDataFormatUtils.java @@ -311,7 +311,7 @@ private static void displayAllParameters(Map params, StringBuild } static String getComment(FieldSchema col) { - return col.getComment() != null ? col.getComment() : "None"; + return col.getComment() != null ? col.getComment() : ""; } private static String formatDate(long timeInSeconds) { 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 73603ab..4431ccd 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java @@ -1548,7 +1548,7 @@ private boolean isPresent(String[] list, String elem) { return false; } - + /* * This method is invoked for unqualified column references in join conditions. * This is passed in the Alias to Operator mapping in the QueryBlock so far. @@ -1871,7 +1871,7 @@ void applyEqualityPredicateToQBJoinTree(QBJoinTree joinTree, } @SuppressWarnings("rawtypes") - private void parseJoinCondition(QBJoinTree joinTree, ASTNode joinCond, List leftSrc, + private void parseJoinCondition(QBJoinTree joinTree, ASTNode joinCond, List leftSrc, Map aliasToOpInfo) throws SemanticException { if (joinCond == null) { @@ -2035,14 +2035,14 @@ private void parseJoinCondition(QBJoinTree joinTree, ASTNode joinCond, } @SuppressWarnings("rawtypes") - private void extractJoinCondsFromWhereClause(QBJoinTree joinTree, QB qb, String dest, ASTNode predicate, + private void extractJoinCondsFromWhereClause(QBJoinTree joinTree, QB qb, String dest, ASTNode predicate, Map aliasToOpInfo) throws SemanticException { switch (predicate.getType()) { case HiveParser.KW_AND: - extractJoinCondsFromWhereClause(joinTree, qb, dest, + extractJoinCondsFromWhereClause(joinTree, qb, dest, (ASTNode) predicate.getChild(0), aliasToOpInfo); - extractJoinCondsFromWhereClause(joinTree, qb, dest, + extractJoinCondsFromWhereClause(joinTree, qb, dest, (ASTNode) predicate.getChild(1), aliasToOpInfo); break; case HiveParser.EQUAL_NS: @@ -8937,7 +8937,7 @@ public Operator genPlan(QB qb) throws SemanticException { String dest = dests.iterator().next(); ASTNode whereClause = qb.getParseInfo().getWhrForClause(dest); if ( whereClause != null ) { - extractJoinCondsFromWhereClause(joinTree, qb, dest, + extractJoinCondsFromWhereClause(joinTree, qb, dest, (ASTNode) whereClause.getChild(0), aliasToOpInfo ); } @@ -9904,7 +9904,7 @@ private ASTNode analyzeCreateTable(ASTNode ast, QB qb) crtTblDesc.setStoredAsSubDirectories(storedAsDirs); crtTblDesc.setNullFormat(rowFormatParams.nullFormat); - crtTblDesc.validate(); + crtTblDesc.validate(conf); // outputs is empty, which means this create table happens in the current // database. SessionState.get().setCommandType(HiveOperation.CREATETABLE); diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java index b569ed0..b58a0a3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/TaskCompiler.java @@ -221,7 +221,7 @@ public void compile(final ParseContext pCtx, final List> rootTa /* * Called at the beginning of the compile phase to have another chance to optimize the operator plan */ - protected void optimizeOperatorPlan(ParseContext pCtxSet, Set inputs, + protected void optimizeOperatorPlan(ParseContext pCtxSet, Set inputs, Set outputs) throws SemanticException { } diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java index 98c511e..2537b75 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java @@ -28,6 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hive.common.JavaUtils; +import org.apache.hadoop.hive.conf.HiveConf; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; import org.apache.hadoop.hive.metastore.api.FieldSchema; import org.apache.hadoop.hive.metastore.api.Order; import org.apache.hadoop.hive.ql.ErrorMsg; @@ -403,13 +405,13 @@ public void setSkewedColValues(ArrayList> skewedColValues) { this.skewedColValues = skewedColValues; } - public void validate() + public void validate(HiveConf conf) throws SemanticException { if ((this.getCols() == null) || (this.getCols().size() == 0)) { // for now make sure that serde exists if (StringUtils.isEmpty(this.getSerName()) - || !SerDeUtils.shouldGetColsFromSerDe(this.getSerName())) { + || conf.getStringCollection(ConfVars.SERDESUSINGMETASTOREFORSCHEMA.varname).contains(this.getSerName())) { throw new SemanticException(ErrorMsg.INVALID_TBL_DDL_SERDE.getMsg()); } return; diff --git ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out index ed36d5d..9c0f897 100644 --- ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out +++ ql/src/test/results/clientnegative/alter_partition_coltype_2columns.q.out @@ -25,14 +25,14 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts string None +key string +value string +dt string +ts string # Partition Information # col_name data_type comment -dt string None -ts string None +dt string +ts string FAILED: ParseException line 4:50 mismatched input ',' expecting ) near 'int' in alter partition key type diff --git ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out index c6913b9..62798f0 100644 --- ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out +++ ql/src/test/results/clientnegative/alter_partition_coltype_invalidcolname.q.out @@ -25,14 +25,14 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts string None +key string +value string +dt string +ts string # Partition Information # col_name data_type comment -dt string None -ts string None +dt string +ts string FAILED: SemanticException [Error 10002]: Invalid column reference dd diff --git ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out index 740982c..b27238f 100644 --- ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out +++ ql/src/test/results/clientnegative/alter_partition_coltype_invalidtype.q.out @@ -25,14 +25,14 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts string None +key string +value string +dt string +ts string # Partition Information # col_name data_type comment -dt string None -ts string None +dt string +ts string FAILED: ParseException line 4:47 cannot recognize input near 'time' ')' '' in column type diff --git ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out index e4c2071..4038961 100644 --- ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out +++ ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out @@ -33,12 +33,12 @@ POSTHOOK: query: DESCRIBE FORMATTED testViewPart POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None +key string # Partition Information # col_name data_type comment -value string None +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientnegative/desc_failure2.q.out ql/src/test/results/clientnegative/desc_failure2.q.out index a2e3b36..91d3d68 100644 --- ql/src/test/results/clientnegative/desc_failure2.q.out +++ ql/src/test/results/clientnegative/desc_failure2.q.out @@ -4,12 +4,12 @@ POSTHOOK: query: DESC srcpart POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string FAILED: SemanticException [Error 10006]: Partition not found {ds=2012-04-08, hr=15} diff --git ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out index 2f0fabc..909de03 100644 --- ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out +++ ql/src/test/results/clientnegative/protectmode_part_no_drop.q.out @@ -33,14 +33,14 @@ PREHOOK: query: desc extended tbl_protectmode_no_drop partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_no_drop partition (p='p1') POSTHOOK: type: DESCTABLE -c1 string None -c2 string None -p string None +c1 string +c2 string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### FAILED: SemanticException [Error 30011]: Partition protected from being dropped default@tbl_protectmode_no_drop@p=p1 diff --git ql/src/test/results/clientnegative/protectmode_tbl2.q.out ql/src/test/results/clientnegative/protectmode_tbl2.q.out index e44ae1a..b16b25d 100644 --- ql/src/test/results/clientnegative/protectmode_tbl2.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl2.q.out @@ -48,13 +48,13 @@ PREHOOK: query: desc extended tbl_protectmode2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode2 POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode2 diff --git ql/src/test/results/clientnegative/protectmode_tbl3.q.out ql/src/test/results/clientnegative/protectmode_tbl3.q.out index b05a371..f738f5c 100644 --- ql/src/test/results/clientnegative/protectmode_tbl3.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl3.q.out @@ -33,7 +33,7 @@ PREHOOK: query: desc extended tbl_protectmode_4 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_4 POSTHOOK: type: DESCTABLE -col string None +col string #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_4 diff --git ql/src/test/results/clientnegative/protectmode_tbl4.q.out ql/src/test/results/clientnegative/protectmode_tbl4.q.out index 77c2d0e..4d187ed 100644 --- ql/src/test/results/clientnegative/protectmode_tbl4.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl4.q.out @@ -59,13 +59,13 @@ PREHOOK: query: desc extended tbl_protectmode_tbl4 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_tbl4 POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_tbl4 diff --git ql/src/test/results/clientnegative/protectmode_tbl5.q.out ql/src/test/results/clientnegative/protectmode_tbl5.q.out index f078c91..56a2746 100644 --- ql/src/test/results/clientnegative/protectmode_tbl5.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl5.q.out @@ -59,13 +59,13 @@ PREHOOK: query: desc extended tbl_protectmode_tbl5 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_tbl5 POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### FAILED: SemanticException [Error 10113]: Query against an offline table or partition Table tbl_protectmode_tbl5 diff --git ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out index d451fc7..7ecae4c 100644 --- ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out +++ ql/src/test/results/clientnegative/protectmode_tbl_no_drop.q.out @@ -33,7 +33,7 @@ PREHOOK: query: desc extended tbl_protectmode__no_drop PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode__no_drop POSTHOOK: type: DESCTABLE -col string None +col string #### A masked pattern was here #### PREHOOK: query: drop table tbl_protectmode__no_drop diff --git ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out index cee6b53..171b3dd 100644 --- ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out +++ ql/src/test/results/clientnegative/stats_partialscan_autogether.q.out @@ -56,14 +56,14 @@ POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).k POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] diff --git ql/src/test/results/clientpositive/alter1.q.out ql/src/test/results/clientpositive/alter1.q.out index 2b5ddba..474ebea 100644 --- ql/src/test/results/clientpositive/alter1.q.out +++ ql/src/test/results/clientpositive/alter1.q.out @@ -9,8 +9,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='3') @@ -25,8 +25,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('a'='1', 'c'='4', 'd'='3') @@ -41,8 +41,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='TRUE') @@ -57,8 +57,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: alter table alter1 set tblproperties ('EXTERNAL'='FALSE') @@ -73,8 +73,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serdeproperties('s1'='9') @@ -89,8 +89,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serdeproperties('s1'='10', 's2' ='20') @@ -105,8 +105,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.TestSerDe' with serdeproperties('s1'='9') @@ -121,8 +121,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +a string +b string #### A masked pattern was here #### PREHOOK: query: alter table alter1 set serde 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe' @@ -137,8 +137,8 @@ PREHOOK: query: describe extended alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +a string +b string #### A masked pattern was here #### PREHOOK: query: alter table alter1 replace columns (a int, b int, c string) @@ -153,9 +153,9 @@ PREHOOK: query: describe alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe alter1 POSTHOOK: type: DESCTABLE -a int None -b int None -c string None +a int +b int +c string PREHOOK: query: -- Cleanup DROP TABLE alter1 PREHOOK: type: DROPTABLE @@ -206,8 +206,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='3') @@ -222,8 +222,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('a'='1', 'c'='4', 'd'='3') @@ -238,8 +238,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='TRUE') @@ -254,8 +254,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET TBLPROPERTIES ('EXTERNAL'='FALSE') @@ -270,8 +270,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='9') @@ -286,8 +286,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDEPROPERTIES('s1'='10', 's2' ='20') @@ -302,8 +302,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a int None -b int None +a int +b int #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.TestSerDe' WITH SERDEPROPERTIES ('s1'='9') @@ -318,8 +318,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +a string +b string #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 SET SERDE 'org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe' @@ -334,8 +334,8 @@ PREHOOK: query: DESCRIBE EXTENDED alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter1 POSTHOOK: type: DESCTABLE -a string from deserializer -b string from deserializer +a string +b string #### A masked pattern was here #### PREHOOK: query: ALTER TABLE alter1 REPLACE COLUMNS (a int, b int, c string) @@ -350,9 +350,9 @@ PREHOOK: query: DESCRIBE alter1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE alter1 POSTHOOK: type: DESCTABLE -a int None -b int None -c string None +a int +b int +c string PREHOOK: query: DROP TABLE alter1 PREHOOK: type: DROPTABLE PREHOOK: Input: alter1_db@alter1 diff --git ql/src/test/results/clientpositive/alter2.q.out ql/src/test/results/clientpositive/alter2.q.out index 54fa503..f093fe4 100644 --- ql/src/test/results/clientpositive/alter2.q.out +++ ql/src/test/results/clientpositive/alter2.q.out @@ -9,14 +9,14 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -36,14 +36,14 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -64,14 +64,14 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -99,14 +99,14 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -126,14 +126,14 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -154,14 +154,14 @@ PREHOOK: query: describe extended alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: show partitions alter2 @@ -220,14 +220,14 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -247,14 +247,14 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -275,14 +275,14 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -310,14 +310,14 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -337,14 +337,14 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 @@ -365,14 +365,14 @@ PREHOOK: query: DESCRIBE EXTENDED alter2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED alter2 POSTHOOK: type: DESCTABLE -a int None -b int None -insertdate string None +a int +b int +insertdate string # Partition Information # col_name data_type comment -insertdate string None +insertdate string #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS alter2 diff --git ql/src/test/results/clientpositive/alter3.q.out ql/src/test/results/clientpositive/alter3.q.out index f13e0e4..eb2dff9 100644 --- ql/src/test/results/clientpositive/alter3.q.out +++ ql/src/test/results/clientpositive/alter3.q.out @@ -68,15 +68,15 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter3_renamed POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -pcol1 string None -pcol2 string None +col1 string +pcol1 string +pcol2 string # Partition Information # col_name data_type comment -pcol1 string None -pcol2 string None +pcol1 string +pcol2 string #### A masked pattern was here #### PREHOOK: query: describe extended alter3_renamed partition (pCol1='test_part:', pcol2='test_part:') @@ -84,15 +84,15 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter3_renamed partition (pCol1='test_part:', pcol2='test_part:') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -pcol1 string None -pcol2 string None +col1 string +pcol1 string +pcol2 string # Partition Information # col_name data_type comment -pcol1 string None -pcol2 string None +pcol1 string +pcol2 string #### A masked pattern was here #### PREHOOK: query: select * from alter3_renamed where pcol1='test_part:' and pcol2='test_part:' @@ -143,15 +143,15 @@ POSTHOOK: query: describe extended alter3_like_renamed POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -pcol1 string None -pcol2 string None +col1 string +pcol1 string +pcol2 string # Partition Information # col_name data_type comment -pcol1 string None -pcol2 string None +pcol1 string +pcol2 string #### A masked pattern was here #### PREHOOK: query: -- Cleanup @@ -309,15 +309,15 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -pcol1 string None -pcol2 string None +col1 string +pcol1 string +pcol2 string # Partition Information # col_name data_type comment -pcol1 string None -pcol2 string None +pcol1 string +pcol2 string #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED alter3_renamed PARTITION (pCol1='test_part:', pcol2='test_part:') @@ -327,15 +327,15 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -pcol1 string None -pcol2 string None +col1 string +pcol1 string +pcol2 string # Partition Information # col_name data_type comment -pcol1 string None -pcol2 string None +pcol1 string +pcol2 string #### A masked pattern was here #### PREHOOK: query: SELECT * FROM alter3_renamed WHERE pcol1='test_part:' AND pcol2='test_part:' @@ -394,14 +394,14 @@ POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMP POSTHOOK: Lineage: alter3 PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter3_like PARTITION(pcol1=test_part:,pcol2=test_part:).col1 SIMPLE [(alter3_src)alter3_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -pcol1 string None -pcol2 string None +col1 string +pcol1 string +pcol2 string # Partition Information # col_name data_type comment -pcol1 string None -pcol2 string None +pcol1 string +pcol2 string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/alter4.q.out ql/src/test/results/clientpositive/alter4.q.out index 001b922..a616929 100644 --- ql/src/test/results/clientpositive/alter4.q.out +++ ql/src/test/results/clientpositive/alter4.q.out @@ -9,8 +9,8 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: ALTER TABLE set_bucketing_test NOT CLUSTERED @@ -25,8 +25,8 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: -- Cleanup @@ -79,8 +79,8 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: ALTER TABLE set_bucketing_test NOT CLUSTERED @@ -95,8 +95,8 @@ PREHOOK: query: DESCRIBE EXTENDED set_bucketing_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED set_bucketing_test POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: DROP TABLE set_bucketing_test diff --git ql/src/test/results/clientpositive/alter5.q.out ql/src/test/results/clientpositive/alter5.q.out index d36d40b..da8e188 100644 --- ql/src/test/results/clientpositive/alter5.q.out +++ ql/src/test/results/clientpositive/alter5.q.out @@ -49,13 +49,13 @@ PREHOOK: query: describe extended alter5 partition (dt='a') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE -col1 string None -dt string None +col1 string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: insert overwrite table alter5 partition (dt='a') select col1 from alter5_src @@ -89,13 +89,13 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -dt string None +col1 string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: -- Cleanup @@ -191,13 +191,13 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -dt string None +col1 string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: insert overwrite table alter5 partition (dt='a') select col1 from alter5_src @@ -234,12 +234,12 @@ POSTHOOK: query: describe extended alter5 partition (dt='a') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] POSTHOOK: Lineage: alter5 PARTITION(dt=a).col1 SIMPLE [(alter5_src)alter5_src.FieldSchema(name:col1, type:string, comment:null), ] -col1 string None -dt string None +col1 string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/alter_merge_2.q.out ql/src/test/results/clientpositive/alter_merge_2.q.out index 12c3b09..e5244d8 100644 --- ql/src/test/results/clientpositive/alter_merge_2.q.out +++ ql/src/test/results/clientpositive/alter_merge_2.q.out @@ -16,16 +16,16 @@ PREHOOK: query: desc extended src_rc_merge_test_part partition (ds='2012-01-03', PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None -ts string None +key int +value string +ds string +ts string # Partition Information # col_name data_type comment -ds string None -ts string None +ds string +ts string #### A masked pattern was here #### PREHOOK: query: load data local inpath '../../data/files/smbbucket_1.rc' into table src_rc_merge_test_part partition (ds='2012-01-03', ts='2012-01-03+14:46:31') diff --git ql/src/test/results/clientpositive/alter_merge_stats.q.out ql/src/test/results/clientpositive/alter_merge_stats.q.out index 0dc693d..ec22995 100644 --- ql/src/test/results/clientpositive/alter_merge_stats.q.out +++ ql/src/test/results/clientpositive/alter_merge_stats.q.out @@ -50,8 +50,8 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: analyze table src_rc_merge_test_stat compute statistics @@ -66,8 +66,8 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: alter table src_rc_merge_test_stat concatenate @@ -99,8 +99,8 @@ PREHOOK: query: desc extended src_rc_merge_test_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_stat POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: create table src_rc_merge_test_part_stat(key int, value string) partitioned by (ds string) stored as rcfile @@ -162,14 +162,14 @@ PREHOOK: query: desc extended src_rc_merge_test_part_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part_stat POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: analyze table src_rc_merge_test_part_stat partition(ds='2011') compute statistics @@ -188,14 +188,14 @@ PREHOOK: query: desc extended src_rc_merge_test_part_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part_stat POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: alter table src_rc_merge_test_part_stat partition (ds='2011') concatenate @@ -227,14 +227,14 @@ PREHOOK: query: desc extended src_rc_merge_test_part_stat PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended src_rc_merge_test_part_stat POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: drop table src_rc_merge_test_stat diff --git ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out index 583fc54..80c8df8 100644 --- ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out +++ ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table.q.out @@ -19,13 +19,13 @@ POSTHOOK: query: describe formatted tst1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -65,13 +65,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -134,13 +134,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -177,13 +177,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -230,13 +230,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -268,13 +268,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -323,13 +323,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -361,13 +361,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -421,13 +421,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -475,13 +475,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -529,13 +529,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -583,13 +583,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out index b79a4d4..f9da008 100644 --- ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out +++ ql/src/test/results/clientpositive/alter_numbuckets_partitioned_table2.q.out @@ -17,13 +17,13 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -63,13 +63,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -116,13 +116,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -166,13 +166,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -223,13 +223,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -277,13 +277,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -338,13 +338,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -396,13 +396,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -461,13 +461,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -523,13 +523,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -592,13 +592,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -658,13 +658,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -731,13 +731,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -801,13 +801,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -878,13 +878,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -952,13 +952,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -1033,13 +1033,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -1111,13 +1111,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out index 18dd11c..8121057 100644 --- ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out +++ ql/src/test/results/clientpositive/alter_partition_clusterby_sortby.q.out @@ -31,13 +31,13 @@ POSTHOOK: query: desc formatted alter_table_partition_clusterby_sortby partition POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None -b int None +a int +b int # Partition Information # col_name data_type comment -c string None +c string # Detailed Partition Information Partition Value: [abc] @@ -84,13 +84,13 @@ POSTHOOK: query: desc formatted alter_table_partition_clusterby_sortby partition POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None -b int None +a int +b int # Partition Information # col_name data_type comment -c string None +c string # Detailed Partition Information Partition Value: [abc] @@ -137,13 +137,13 @@ POSTHOOK: query: desc formatted alter_table_partition_clusterby_sortby partition POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None -b int None +a int +b int # Partition Information # col_name data_type comment -c string None +c string # Detailed Partition Information Partition Value: [abc] @@ -181,13 +181,13 @@ desc formatted alter_table_partition_clusterby_sortby POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None -b int None +a int +b int # Partition Information # col_name data_type comment -c string None +c string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/alter_partition_coltype.q.out ql/src/test/results/clientpositive/alter_partition_coltype.q.out index 30d53cc..33b45a8 100644 --- ql/src/test/results/clientpositive/alter_partition_coltype.q.out +++ ql/src/test/results/clientpositive/alter_partition_coltype.q.out @@ -25,16 +25,16 @@ POSTHOOK: query: desc alter_coltype POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts string None +key string +value string +dt string +ts string # Partition Information # col_name data_type comment -dt string None -ts string None +dt string +ts string PREHOOK: query: -- select with paritition predicate. select count(*) from alter_coltype where dt = '100x' PREHOOK: type: QUERY @@ -161,6 +161,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -180,6 +181,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -373,6 +375,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -392,6 +395,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -547,6 +551,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -566,6 +571,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -589,6 +595,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -608,6 +615,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -631,6 +639,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -650,6 +659,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -892,6 +902,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -911,6 +922,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -934,6 +946,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -953,6 +966,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -976,6 +990,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -995,6 +1010,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -1135,6 +1151,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -1154,6 +1171,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -1177,6 +1195,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -1196,6 +1215,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -1219,6 +1239,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -1238,6 +1259,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.alter_coltype @@ -1300,16 +1322,16 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts double None +key string +value string +dt string +ts double # Partition Information # col_name data_type comment -dt string None -ts double None +dt string +ts double PREHOOK: query: desc alter_coltype partition (dt='100x', ts='6:30pm') PREHOOK: type: DESCTABLE POSTHOOK: query: desc alter_coltype partition (dt='100x', ts='6:30pm') @@ -1320,16 +1342,16 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts double None +key string +value string +dt string +ts double # Partition Information # col_name data_type comment -dt string None -ts double None +dt string +ts double PREHOOK: query: desc alter_coltype partition (dt='100x', ts=3.0) PREHOOK: type: DESCTABLE POSTHOOK: query: desc alter_coltype partition (dt='100x', ts=3.0) @@ -1340,16 +1362,16 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts double None +key string +value string +dt string +ts double # Partition Information # col_name data_type comment -dt string None -ts double None +dt string +ts double PREHOOK: query: desc alter_coltype partition (dt=10, ts=3.0) PREHOOK: type: DESCTABLE POSTHOOK: query: desc alter_coltype partition (dt=10, ts=3.0) @@ -1360,16 +1382,16 @@ POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).key SIMPLE [(src1)src POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=3.0).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: alter_coltype PARTITION(dt=100x,ts=6:30pm).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None -ts double None +key string +value string +dt string +ts double # Partition Information # col_name data_type comment -dt string None -ts double None +dt string +ts double PREHOOK: query: drop table alter_coltype PREHOOK: type: DROPTABLE PREHOOK: Input: default@alter_coltype diff --git ql/src/test/results/clientpositive/alter_partition_format_loc.q.out ql/src/test/results/clientpositive/alter_partition_format_loc.q.out index eab0cd8..fd4ee99 100644 --- ql/src/test/results/clientpositive/alter_partition_format_loc.q.out +++ ql/src/test/results/clientpositive/alter_partition_format_loc.q.out @@ -9,8 +9,8 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: alter table alter_partition_format_test set fileformat rcfile @@ -25,8 +25,8 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_LOCATION @@ -41,8 +41,8 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: drop table alter_partition_format_test @@ -73,14 +73,14 @@ PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010') POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: alter table alter_partition_format_test partition(ds='2010') set fileformat rcfile @@ -96,14 +96,14 @@ PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010') POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: type: ALTERPARTITION_LOCATION @@ -119,28 +119,28 @@ PREHOOK: query: desc extended alter_partition_format_test partition(ds='2010') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test partition(ds='2010') POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: alter table alter_partition_format_test set fileformat rcfile @@ -155,14 +155,14 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: type: ALTERTABLE_LOCATION @@ -177,14 +177,14 @@ PREHOOK: query: desc extended alter_partition_format_test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended alter_partition_format_test POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: drop table alter_partition_format_test diff --git ql/src/test/results/clientpositive/alter_skewed_table.q.out ql/src/test/results/clientpositive/alter_skewed_table.q.out index 70e00f4..f0af6ba 100644 --- ql/src/test/results/clientpositive/alter_skewed_table.q.out +++ ql/src/test/results/clientpositive/alter_skewed_table.q.out @@ -11,8 +11,8 @@ POSTHOOK: query: describe formatted original POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -48,8 +48,8 @@ POSTHOOK: query: describe formatted original POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -100,8 +100,8 @@ POSTHOOK: query: describe formatted original2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -137,8 +137,8 @@ POSTHOOK: query: describe formatted original2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -189,8 +189,8 @@ POSTHOOK: query: describe formatted original3 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -228,8 +228,8 @@ POSTHOOK: query: describe formatted original3 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/alter_table_not_sorted.q.out ql/src/test/results/clientpositive/alter_table_not_sorted.q.out index 07fcb32..a9ba843 100644 --- ql/src/test/results/clientpositive/alter_table_not_sorted.q.out +++ ql/src/test/results/clientpositive/alter_table_not_sorted.q.out @@ -11,8 +11,8 @@ POSTHOOK: query: desc formatted alter_table_not_sorted POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None -b int None +a int +b int # Detailed Table Information Database: default @@ -49,8 +49,8 @@ POSTHOOK: query: desc formatted alter_table_not_sorted POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None -b int None +a int +b int # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/alter_table_serde.q.out ql/src/test/results/clientpositive/alter_table_serde.q.out index 2c25f67..491826a 100644 --- ql/src/test/results/clientpositive/alter_table_serde.q.out +++ ql/src/test/results/clientpositive/alter_table_serde.q.out @@ -11,9 +11,9 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -id int None -query string None -name string None +id int +query string +name string #### A masked pattern was here #### PREHOOK: query: alter table test_table set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -28,9 +28,9 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -id int from deserializer -query string from deserializer -name string from deserializer +id int +query string +name string #### A masked pattern was here #### PREHOOK: query: alter table test_table set serdeproperties ('field.delim' = ',') @@ -45,9 +45,9 @@ PREHOOK: query: describe extended test_table PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table POSTHOOK: type: DESCTABLE -id int from deserializer -query string from deserializer -name string from deserializer +id int +query string +name string #### A masked pattern was here #### PREHOOK: query: drop table test_table @@ -78,15 +78,15 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int None -query string None -name string None -dt string None +id int +query string +name string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: alter table test_table set serde 'org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe' @@ -101,15 +101,15 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int None -query string None -name string None -dt string None +id int +query string +name string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: alter table test_table set serdeproperties ('field.delim' = ',') @@ -124,15 +124,15 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int None -query string None -name string None -dt string None +id int +query string +name string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: -- test partitions @@ -152,15 +152,15 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int None -query string None -name string None -dt string None +id int +query string +name string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: alter table test_table partition(dt='2011') set serdeproperties ('field.delim' = ',') @@ -176,15 +176,15 @@ PREHOOK: query: describe extended test_table partition (dt='2011') PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended test_table partition (dt='2011') POSTHOOK: type: DESCTABLE -id int None -query string None -name string None -dt string None +id int +query string +name string +dt string # Partition Information # col_name data_type comment -dt string None +dt string #### A masked pattern was here #### PREHOOK: query: drop table test_table diff --git ql/src/test/results/clientpositive/alter_table_serde2.q.out ql/src/test/results/clientpositive/alter_table_serde2.q.out index 347512c..ec0e647 100644 --- ql/src/test/results/clientpositive/alter_table_serde2.q.out +++ ql/src/test/results/clientpositive/alter_table_serde2.q.out @@ -17,13 +17,13 @@ POSTHOOK: query: DESCRIBE FORMATTED tst1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -63,13 +63,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -118,13 +118,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -169,13 +169,13 @@ POSTHOOK: Lineage: tst1 PARTITION(ds=1).key SIMPLE [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: tst1 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/alter_view_as_select.q.out ql/src/test/results/clientpositive/alter_view_as_select.q.out index 686ceb3..86d8f60 100644 --- ql/src/test/results/clientpositive/alter_view_as_select.q.out +++ ql/src/test/results/clientpositive/alter_view_as_select.q.out @@ -15,10 +15,10 @@ POSTHOOK: query: DESCRIBE FORMATTED testView POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None -ds string None -hr string None +key string +value string +ds string +hr string # Detailed Table Information Database: default @@ -54,7 +54,7 @@ POSTHOOK: query: DESCRIBE FORMATTED testView POSTHOOK: type: DESCTABLE # col_name data_type comment -value string None +value string # Detailed Table Information Database: default @@ -98,8 +98,8 @@ POSTHOOK: query: DESCRIBE FORMATTED testView POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/alter_view_rename.q.out ql/src/test/results/clientpositive/alter_view_rename.q.out index 0aadc34..4854ff3 100644 --- ql/src/test/results/clientpositive/alter_view_rename.q.out +++ ql/src/test/results/clientpositive/alter_view_rename.q.out @@ -16,9 +16,9 @@ PREHOOK: query: DESCRIBE EXTENDED view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view1 POSTHOOK: type: DESCTABLE -foo int None -bar string None -ds string None +foo int +bar string +ds string #### A masked pattern was here #### PREHOOK: query: ALTER VIEW view1 RENAME TO view2 @@ -34,9 +34,9 @@ PREHOOK: query: DESCRIBE EXTENDED view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view2 POSTHOOK: type: DESCTABLE -foo int None -bar string None -ds string None +foo int +bar string +ds string #### A masked pattern was here #### PREHOOK: query: SELECT * FROM view2 diff --git ql/src/test/results/clientpositive/authorization_7.q.out ql/src/test/results/clientpositive/authorization_7.q.out index c9468be..282ae43 100644 --- ql/src/test/results/clientpositive/authorization_7.q.out +++ ql/src/test/results/clientpositive/authorization_7.q.out @@ -13,8 +13,8 @@ PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_authorization_7 POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string PREHOOK: query: DROP TABLE src_authorization_7 PREHOOK: type: DROPTABLE PREHOOK: Input: default@src_authorization_7 @@ -42,8 +42,8 @@ PREHOOK: query: DESCRIBE src_authorization_7 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE src_authorization_7 POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string PREHOOK: query: DROP TABLE src_authorization_7 PREHOOK: type: DROPTABLE PREHOOK: Input: default@src_authorization_7 diff --git ql/src/test/results/clientpositive/authorization_8.q.out ql/src/test/results/clientpositive/authorization_8.q.out index 484f179..f1c8ae2 100644 --- ql/src/test/results/clientpositive/authorization_8.q.out +++ ql/src/test/results/clientpositive/authorization_8.q.out @@ -20,9 +20,9 @@ PREHOOK: query: DESCRIBE view_j5jbymsx8e_1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view_j5jbymsx8e_1 POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None +key int +value string +ds string PREHOOK: query: ALTER VIEW view_j5jbymsx8e_1 RENAME TO view_j5jbymsx8e_2 PREHOOK: type: ALTERVIEW_RENAME PREHOOK: Input: default@view_j5jbymsx8e_1 diff --git ql/src/test/results/clientpositive/autogen_colalias.q.out ql/src/test/results/clientpositive/autogen_colalias.q.out index 5fe1543..7de1b5a 100644 --- ql/src/test/results/clientpositive/autogen_colalias.q.out +++ ql/src/test/results/clientpositive/autogen_colalias.q.out @@ -21,16 +21,16 @@ PREHOOK: query: describe dest_grouped_old1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_old1 POSTHOOK: type: DESCTABLE -_c0 int None -zz int None -key string None -_c3 int None -_c4 bigint None -_c5 double None -_c6 bigint None -_c7 bigint None -_c8 int None -_c9 int None +_c0 int +zz int +key string +_c3 int +_c4 bigint +_c5 double +_c6 bigint +_c7 bigint +_c8 int +_c9 int PREHOOK: query: create table dest_grouped_old2 as select distinct src.key from src PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src @@ -42,7 +42,7 @@ PREHOOK: query: describe dest_grouped_old2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_old2 POSTHOOK: type: DESCTABLE -key string None +key string PREHOOK: query: create table dest_grouped_new1 as select 1+1, 2+2 as zz, ((src.key % 2)+2)/2, test_max(length(src.value)), count(src.value), sin(count(src.value)), count(sin(src.value)), unix_timestamp(), CAST(SUM(IF(value > 10, value, 1)) AS INT), if(src.key > 10, (src.key +5) % 2, 0) @@ -60,16 +60,16 @@ PREHOOK: query: describe dest_grouped_new1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_new1 POSTHOOK: type: DESCTABLE -column_0 int None -zz int None -column_2 double None -test_max_length_src__3 int None -count_src_value_4 bigint None -sin_count_src_value_5 double None -count_sin_src_value_6 bigint None -unix_timestamp_7 bigint None -sum_if_value_10_valu_8 int None -if_src_key_10_src_ke_9 double None +column_0 int +zz int +column_2 double +test_max_length_src__3 int +count_src_value_4 bigint +sin_count_src_value_5 double +count_sin_src_value_6 bigint +unix_timestamp_7 bigint +sum_if_value_10_valu_8 int +if_src_key_10_src_ke_9 double PREHOOK: query: create table dest_grouped_new2 as select distinct src.key from src PREHOOK: type: CREATETABLE_AS_SELECT PREHOOK: Input: default@src @@ -81,7 +81,7 @@ PREHOOK: query: describe dest_grouped_new2 PREHOOK: type: DESCTABLE POSTHOOK: query: describe dest_grouped_new2 POSTHOOK: type: DESCTABLE -key string None +key string PREHOOK: query: -- Drop the temporary function at the end till HIVE-3160 gets fixed DROP TEMPORARY FUNCTION test_max PREHOOK: type: DROPFUNCTION diff --git ql/src/test/results/clientpositive/ba_table1.q.out ql/src/test/results/clientpositive/ba_table1.q.out index 0877dd9..29d0b43 100644 --- ql/src/test/results/clientpositive/ba_table1.q.out +++ ql/src/test/results/clientpositive/ba_table1.q.out @@ -17,8 +17,8 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary None -ba_val binary None +ba_key binary +ba_val binary #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/ba_table2.q.out ql/src/test/results/clientpositive/ba_table2.q.out index 4174287..10c21e3 100644 --- ql/src/test/results/clientpositive/ba_table2.q.out +++ ql/src/test/results/clientpositive/ba_table2.q.out @@ -25,8 +25,8 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary from deserializer -ba_val binary from deserializer +ba_key binary +ba_val binary #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/ba_table_union.q.out ql/src/test/results/clientpositive/ba_table_union.q.out index 8846a01..dc5d353 100644 --- ql/src/test/results/clientpositive/ba_table_union.q.out +++ ql/src/test/results/clientpositive/ba_table_union.q.out @@ -15,8 +15,8 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary None -ba_val binary None +ba_key binary +ba_val binary #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/binary_table_bincolserde.q.out ql/src/test/results/clientpositive/binary_table_bincolserde.q.out index bb3c296..a95d64f 100644 --- ql/src/test/results/clientpositive/binary_table_bincolserde.q.out +++ ql/src/test/results/clientpositive/binary_table_bincolserde.q.out @@ -25,8 +25,8 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary from deserializer -ba_val binary from deserializer +ba_key binary +ba_val binary #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/binary_table_colserde.q.out ql/src/test/results/clientpositive/binary_table_colserde.q.out index a8b195f..af70a9d 100644 --- ql/src/test/results/clientpositive/binary_table_colserde.q.out +++ ql/src/test/results/clientpositive/binary_table_colserde.q.out @@ -25,8 +25,8 @@ PREHOOK: query: describe extended ba_test PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended ba_test POSTHOOK: type: DESCTABLE -ba_key binary from deserializer -ba_val binary from deserializer +ba_key binary +ba_val binary #### A masked pattern was here #### PREHOOK: query: from src insert overwrite table ba_test select cast (src.key as binary), cast (src.value as binary) diff --git ql/src/test/results/clientpositive/bucket5.q.out ql/src/test/results/clientpositive/bucket5.q.out index c2fc368..1db076f 100644 Binary files ql/src/test/results/clientpositive/bucket5.q.out and ql/src/test/results/clientpositive/bucket5.q.out differ diff --git ql/src/test/results/clientpositive/bucket_groupby.q.out ql/src/test/results/clientpositive/bucket_groupby.q.out index 10dcb6e..cd9a914 100644 --- ql/src/test/results/clientpositive/bucket_groupby.q.out +++ ql/src/test/results/clientpositive/bucket_groupby.q.out @@ -9,14 +9,14 @@ PREHOOK: query: describe extended clustergroupby PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended clustergroupby POSTHOOK: type: DESCTABLE -key string None -value string None -ds string None +key string +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: alter table clustergroupby clustered by (key) into 1 buckets @@ -126,14 +126,14 @@ POSTHOOK: query: describe extended clustergroupby POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -ds string None +key string +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: insert overwrite table clustergroupby partition (ds='101') select key, value from src distribute by key @@ -1069,14 +1069,14 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: clustergroupby PARTITION(ds=100).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -ds string None +key string +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: insert overwrite table clustergroupby partition (ds='102') select key, value from src distribute by value sort by key, value @@ -1421,14 +1421,14 @@ POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: clustergroupby PARTITION(ds=101).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: clustergroupby PARTITION(ds=102).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -ds string None +key string +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: insert overwrite table clustergroupby partition (ds='103') select key, value from src distribute by value, key sort by key diff --git ql/src/test/results/clientpositive/char_nested_types.q.out ql/src/test/results/clientpositive/char_nested_types.q.out index 8a01d34..8755433 100644 --- ql/src/test/results/clientpositive/char_nested_types.q.out +++ ql/src/test/results/clientpositive/char_nested_types.q.out @@ -72,7 +72,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: char_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: char_nested_array.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] -c1 array None +c1 array PREHOOK: query: select * from char_nested_array PREHOOK: type: QUERY PREHOOK: Input: default@char_nested_array @@ -119,7 +119,7 @@ POSTHOOK: Lineage: char_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: char_nested_array.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] POSTHOOK: Lineage: char_nested_map.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:key, type:int, comment:null), (char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] -c1 map None +c1 map PREHOOK: query: select * from char_nested_map PREHOOK: type: QUERY PREHOOK: Input: default@char_nested_map @@ -176,7 +176,7 @@ POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:val POSTHOOK: Lineage: char_nested_array.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] POSTHOOK: Lineage: char_nested_map.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:key, type:int, comment:null), (char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] POSTHOOK: Lineage: char_nested_struct.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:key, type:int, comment:null), (char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] -c1 struct None +c1 struct PREHOOK: query: select * from char_nested_struct PREHOOK: type: QUERY PREHOOK: Input: default@char_nested_struct @@ -216,7 +216,7 @@ POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:val POSTHOOK: Lineage: char_nested_array.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] POSTHOOK: Lineage: char_nested_map.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:key, type:int, comment:null), (char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] POSTHOOK: Lineage: char_nested_struct.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:key, type:int, comment:null), (char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] -c1 struct None +c1 struct PREHOOK: query: select * from char_nested_cta PREHOOK: type: QUERY PREHOOK: Input: default@char_nested_cta @@ -256,7 +256,7 @@ POSTHOOK: Lineage: char_nested_1.value EXPRESSION [(src)src.FieldSchema(name:val POSTHOOK: Lineage: char_nested_array.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] POSTHOOK: Lineage: char_nested_map.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:key, type:int, comment:null), (char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] POSTHOOK: Lineage: char_nested_struct.c1 EXPRESSION [(char_nested_1)char_nested_1.FieldSchema(name:key, type:int, comment:null), (char_nested_1)char_nested_1.FieldSchema(name:value, type:char(20), comment:null), ] -c1 struct None +c1 struct PREHOOK: query: select * from char_nested_view PREHOOK: type: QUERY PREHOOK: Input: default@char_nested_view diff --git ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out index 0a45736..944b8c7 100644 --- ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out +++ ql/src/test/results/clientpositive/columnarserde_create_shortcut.q.out @@ -162,8 +162,8 @@ POSTHOOK: Lineage: columnarserde_create_shortcut.d SIMPLE [(src_thrift)src_thrif POSTHOOK: Lineage: columnarserde_create_shortcut.e SIMPLE [(src_thrift)src_thrift.FieldSchema(name:astring, type:string, comment:from deserializer), ] POSTHOOK: Lineage: columnshortcuttable.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: columnshortcuttable.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None +key string +value string PREHOOK: query: SELECT columnShortcutTable.* FROM columnShortcutTable ORDER BY key ASC, value ASC PREHOOK: type: QUERY PREHOOK: Input: default@columnshortcuttable diff --git ql/src/test/results/clientpositive/combine3.q.out ql/src/test/results/clientpositive/combine3.q.out index 4fb7930..b018a72 100644 --- ql/src/test/results/clientpositive/combine3.q.out +++ ql/src/test/results/clientpositive/combine3.q.out @@ -49,16 +49,16 @@ POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).key POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int None -value string None -ds string None -hr string None +key int +value string +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: desc extended combine_3_srcpart_seq_rc partition(ds="2010-08-03", hr="001") @@ -69,16 +69,16 @@ POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).key POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=001).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: combine_3_srcpart_seq_rc PARTITION(ds=2010-08-03,hr=00).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int None -value string None -ds string None -hr string None +key int +value string +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: select key, value, ds, hr from combine_3_srcpart_seq_rc where ds="2010-08-03" order by key, hr limit 30 diff --git ql/src/test/results/clientpositive/convert_enum_to_string.q.out ql/src/test/results/clientpositive/convert_enum_to_string.q.out index 3d504c1..0868a72 100644 --- ql/src/test/results/clientpositive/convert_enum_to_string.q.out +++ ql/src/test/results/clientpositive/convert_enum_to_string.q.out @@ -44,9 +44,9 @@ my_stringset struct<> from deserializer my_enumset struct<> from deserializer my_structset struct<> from deserializer optionals struct<> from deserializer -b string None +b string # Partition Information # col_name data_type comment -b string None +b string diff --git ql/src/test/results/clientpositive/create_1.q.out ql/src/test/results/clientpositive/create_1.q.out index 49e14ad..f6ab23f 100644 --- ql/src/test/results/clientpositive/create_1.q.out +++ ql/src/test/results/clientpositive/create_1.q.out @@ -9,14 +9,14 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE EXTENDED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string #### A masked pattern was here #### PREHOOK: query: CREATE TABLE IF NOT EXISTS table1 (a STRING, b STRING) STORED AS TEXTFILE @@ -34,14 +34,14 @@ PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table2 POSTHOOK: type: DESCTABLE -a string None -b int None +a string +b int PREHOOK: query: DESCRIBE EXTENDED table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table2 POSTHOOK: type: DESCTABLE -a string None -b int None +a string +b int #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table3 (a STRING, b STRING) @@ -59,14 +59,14 @@ PREHOOK: query: DESCRIBE table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table3 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE EXTENDED table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table3 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table4 (a STRING, b STRING) @@ -84,14 +84,14 @@ PREHOOK: query: DESCRIBE table4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table4 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE EXTENDED table4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table4 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table5 (a STRING, b STRING) @@ -109,13 +109,13 @@ PREHOOK: query: DESCRIBE table5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table5 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE EXTENDED table5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table5 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out index 17a7bb9..5409950 100644 --- ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out +++ ql/src/test/results/clientpositive/create_alter_list_bucketing_table1.q.out @@ -21,9 +21,9 @@ POSTHOOK: query: describe formatted stored_as_dirs_multiple POSTHOOK: type: DESCTABLE # col_name data_type comment -col1 string None -col2 int None -col3 string None +col1 string +col2 int +col3 string # Detailed Table Information Database: default @@ -64,9 +64,9 @@ POSTHOOK: query: describe formatted stored_as_dirs_multiple POSTHOOK: type: DESCTABLE # col_name data_type comment -col1 string None -col2 int None -col3 string None +col1 string +col2 int +col3 string # Detailed Table Information Database: default @@ -112,9 +112,9 @@ POSTHOOK: query: describe formatted stored_as_dirs_multiple POSTHOOK: type: DESCTABLE # col_name data_type comment -col1 string None -col2 int None -col3 string None +col1 string +col2 int +col3 string # Detailed Table Information Database: default @@ -167,8 +167,8 @@ POSTHOOK: query: describe formatted stored_as_dirs_single POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -215,8 +215,8 @@ POSTHOOK: query: describe formatted stored_as_dirs_single POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -262,8 +262,8 @@ POSTHOOK: query: describe formatted stored_as_dirs_single POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -309,8 +309,8 @@ POSTHOOK: query: describe formatted stored_as_dirs_single_like POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_default_prop.q.out ql/src/test/results/clientpositive/create_default_prop.q.out index 21a60f8..2958cdd 100644 --- ql/src/test/results/clientpositive/create_default_prop.q.out +++ ql/src/test/results/clientpositive/create_default_prop.q.out @@ -9,7 +9,7 @@ PREHOOK: query: DESC EXTENDED table_p1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p1 POSTHOOK: type: DESCTABLE -a string None +a string #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table_p2 LIKE table_p1 @@ -23,7 +23,7 @@ PREHOOK: query: DESC EXTENDED table_p2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p2 POSTHOOK: type: DESCTABLE -a string None +a string #### A masked pattern was here #### PREHOOK: query: CREATE TABLE table_p3 AS SELECT * FROM table_p1 @@ -37,6 +37,6 @@ PREHOOK: query: DESC EXTENDED table_p3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESC EXTENDED table_p3 POSTHOOK: type: DESCTABLE -a string None +a string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/create_escape.q.out ql/src/test/results/clientpositive/create_escape.q.out index faba8fd..6bf9ccf 100644 --- ql/src/test/results/clientpositive/create_escape.q.out +++ ql/src/test/results/clientpositive/create_escape.q.out @@ -13,14 +13,14 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE EXTENDED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string #### A masked pattern was here #### PREHOOK: query: INSERT OVERWRITE TABLE table1 SELECT key, '\\\t\\' FROM src WHERE key = 86 diff --git ql/src/test/results/clientpositive/create_insert_outputformat.q.out ql/src/test/results/clientpositive/create_insert_outputformat.q.out index 90e1ddd..6407645 100644 --- ql/src/test/results/clientpositive/create_insert_outputformat.q.out +++ ql/src/test/results/clientpositive/create_insert_outputformat.q.out @@ -27,8 +27,8 @@ POSTHOOK: query: describe table_test_output_format POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table_test_output_format.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int None -value string None +key int +value string PREHOOK: query: CREATE TABLE table_test_output_format_sequencefile(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileOutputFormat' @@ -64,8 +64,8 @@ POSTHOOK: Lineage: table_test_output_format.key EXPRESSION [(src)src.FieldSchema POSTHOOK: Lineage: table_test_output_format.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int None -value string None +key int +value string PREHOOK: query: CREATE TABLE table_test_output_format_hivesequencefile(key INT, value STRING) STORED AS INPUTFORMAT 'org.apache.hadoop.mapred.SequenceFileInputFormat' OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat' @@ -107,5 +107,5 @@ POSTHOOK: Lineage: table_test_output_format_hivesequencefile.key EXPRESSION [(sr POSTHOOK: Lineage: table_test_output_format_hivesequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: table_test_output_format_sequencefile.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int None -value string None +key int +value string diff --git ql/src/test/results/clientpositive/create_like.q.out ql/src/test/results/clientpositive/create_like.q.out index 97fdee9..fc9e7d8 100644 --- ql/src/test/results/clientpositive/create_like.q.out +++ ql/src/test/results/clientpositive/create_like.q.out @@ -11,8 +11,8 @@ POSTHOOK: query: DESCRIBE FORMATTED table1 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None -b string None +a string +b string # Detailed Table Information Database: default @@ -47,8 +47,8 @@ POSTHOOK: query: DESCRIBE FORMATTED table2 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None -b string None +a string +b string # Detailed Table Information Database: default @@ -91,8 +91,8 @@ POSTHOOK: query: DESCRIBE FORMATTED table3 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None -b string None +a string +b string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_like2.q.out ql/src/test/results/clientpositive/create_like2.q.out index 82cb042..d624aaf 100644 --- ql/src/test/results/clientpositive/create_like2.q.out +++ ql/src/test/results/clientpositive/create_like2.q.out @@ -32,8 +32,8 @@ POSTHOOK: query: DESC FORMATTED table2 POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None -b string None +a int +b string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_like_tbl_props.q.out ql/src/test/results/clientpositive/create_like_tbl_props.q.out index 8e64eab..a0b3292 100644 --- ql/src/test/results/clientpositive/create_like_tbl_props.q.out +++ ql/src/test/results/clientpositive/create_like_tbl_props.q.out @@ -188,8 +188,8 @@ POSTHOOK: query: DESC FORMATTED test_table4 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_like_view.q.out ql/src/test/results/clientpositive/create_like_view.q.out index c56da79..0d677cf 100644 --- ql/src/test/results/clientpositive/create_like_view.q.out +++ ql/src/test/results/clientpositive/create_like_view.q.out @@ -25,16 +25,16 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE FORMATTED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED table1 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None -b string None +a string +b string # Detailed Table Information Database: default @@ -74,16 +74,16 @@ PREHOOK: query: DESCRIBE table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table2 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE FORMATTED table2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED table2 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None -b string None +a string +b string # Detailed Table Information Database: default @@ -124,16 +124,16 @@ PREHOOK: query: DESCRIBE table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table3 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string PREHOOK: query: DESCRIBE FORMATTED table3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE FORMATTED table3 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None -b string None +a string +b string # Detailed Table Information Database: default @@ -143,7 +143,12 @@ Retention: 0 #### A masked pattern was here #### Table Type: EXTERNAL_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false EXTERNAL TRUE + numFiles 0 + numRows -1 + rawDataSize -1 + totalSize 0 #### A masked pattern was here #### # Storage Information @@ -275,14 +280,14 @@ POSTHOOK: Lineage: table2.a SIMPLE [(src)src.FieldSchema(name:key, type:string, POSTHOOK: Lineage: table2.b SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_nested_type.q.out ql/src/test/results/clientpositive/create_nested_type.q.out index 6da098b..5783d1b 100644 --- ql/src/test/results/clientpositive/create_nested_type.q.out +++ ql/src/test/results/clientpositive/create_nested_type.q.out @@ -19,18 +19,18 @@ PREHOOK: query: DESCRIBE table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE -a string None -b array None -c array> None -d map> None +a string +b array +c array> +d map> PREHOOK: query: DESCRIBE EXTENDED table1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -a string None -b array None -c array> None -d map> None +a string +b array +c array> +d map> #### A masked pattern was here #### PREHOOK: query: LOAD DATA LOCAL INPATH '../../data/files/create_nested_type.txt' OVERWRITE INTO TABLE table1 diff --git ql/src/test/results/clientpositive/create_or_replace_view.q.out ql/src/test/results/clientpositive/create_or_replace_view.q.out index a72d2ab..5cfb08b 100644 --- ql/src/test/results/clientpositive/create_or_replace_view.q.out +++ ql/src/test/results/clientpositive/create_or_replace_view.q.out @@ -15,10 +15,10 @@ POSTHOOK: query: describe formatted v POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None -ds string None -hr string None +key string +value string +ds string +hr string # Detailed Table Information Database: default @@ -97,14 +97,14 @@ POSTHOOK: query: describe formatted v POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -163,13 +163,13 @@ POSTHOOK: query: describe formatted v POSTHOOK: type: DESCTABLE # col_name data_type comment -value string None +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -228,14 +228,14 @@ POSTHOOK: query: describe formatted v POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -311,14 +311,14 @@ POSTHOOK: query: describe formatted v POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_skewed_table1.q.out ql/src/test/results/clientpositive/create_skewed_table1.q.out index d840831..e97b069 100644 --- ql/src/test/results/clientpositive/create_skewed_table1.q.out +++ ql/src/test/results/clientpositive/create_skewed_table1.q.out @@ -25,8 +25,8 @@ POSTHOOK: query: describe formatted list_bucket_single_2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -56,8 +56,8 @@ POSTHOOK: query: describe formatted list_bucket_single POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -87,9 +87,9 @@ POSTHOOK: query: describe formatted list_bucket_multiple POSTHOOK: type: DESCTABLE # col_name data_type comment -col1 string None -col2 int None -col3 string None +col1 string +col2 int +col3 string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_view.q.out ql/src/test/results/clientpositive/create_view.q.out index ddfe85c..68eeeaf 100644 --- ql/src/test/results/clientpositive/create_view.q.out +++ ql/src/test/results/clientpositive/create_view.q.out @@ -212,12 +212,12 @@ PREHOOK: query: DESCRIBE view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view1 POSTHOOK: type: DESCTABLE -value string None +value string PREHOOK: query: DESCRIBE EXTENDED view1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view1 POSTHOOK: type: DESCTABLE -value string None +value string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view1 @@ -226,7 +226,7 @@ POSTHOOK: query: DESCRIBE FORMATTED view1 POSTHOOK: type: DESCTABLE # col_name data_type comment -value string None +value string # Detailed Table Information Database: default @@ -253,14 +253,14 @@ PREHOOK: query: DESCRIBE view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view2 POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string PREHOOK: query: DESCRIBE EXTENDED view2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view2 POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view2 @@ -269,8 +269,8 @@ POSTHOOK: query: DESCRIBE FORMATTED view2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -297,12 +297,12 @@ PREHOOK: query: DESCRIBE view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view3 POSTHOOK: type: DESCTABLE -valoo string None +valoo string PREHOOK: query: DESCRIBE EXTENDED view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view3 POSTHOOK: type: DESCTABLE -valoo string None +valoo string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view3 @@ -311,7 +311,7 @@ POSTHOOK: query: DESCRIBE FORMATTED view3 POSTHOOK: type: DESCTABLE # col_name data_type comment -valoo string None +valoo string # Detailed Table Information Database: default @@ -347,7 +347,7 @@ PREHOOK: query: DESCRIBE EXTENDED view3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view3 POSTHOOK: type: DESCTABLE -valoo string None +valoo string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view3 @@ -356,7 +356,7 @@ POSTHOOK: query: DESCRIBE FORMATTED view3 POSTHOOK: type: DESCTABLE # col_name data_type comment -valoo string None +valoo string # Detailed Table Information Database: default @@ -396,7 +396,7 @@ POSTHOOK: query: -- use DESCRIBE EXTENDED on a base table and an external table -- of comparison for view descriptions DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -key int None +key int #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED src1 @@ -415,7 +415,7 @@ POSTHOOK: query: -- use DESCRIBE EXTENDED on a base table as a point of comparis -- view descriptions DESCRIBE EXTENDED table1 POSTHOOK: type: DESCTABLE -key int None +key int #### A masked pattern was here #### PREHOOK: query: INSERT OVERWRITE TABLE table1 SELECT key FROM src WHERE key = 86 @@ -462,7 +462,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view4 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int None +key int PREHOOK: query: ALTER TABLE table1 ADD COLUMNS (value STRING) PREHOOK: type: ALTERTABLE_ADDCOLS PREHOOK: Input: default@table1 @@ -499,14 +499,14 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int None -value string None +key int +value string PREHOOK: query: DESCRIBE view4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view4 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int None +key int PREHOOK: query: CREATE VIEW view5 AS SELECT v1.key as key1, v2.key as key2 FROM view4 v1 join view4 v2 PREHOOK: type: CREATEVIEW @@ -538,8 +538,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view5 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key1 int None -key2 int None +key1 int +key2 int PREHOOK: query: -- verify that column name and comment in DDL portion -- overrides column alias in SELECT CREATE VIEW view6(valoo COMMENT 'I cannot spell') AS @@ -695,7 +695,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view8 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -c string None +c string #### A masked pattern was here #### FROM table1, viewExpandedText:SELECT `_c0` AS `c` FROM (SELECT `test_translate`('abc', 'a', 'b') @@ -707,7 +707,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -c string None +c string # Detailed Table Information Database: default @@ -774,7 +774,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view9 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -m int None +m int #### A masked pattern was here #### FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`)) @@ -786,7 +786,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -m int None +m int # Detailed Table Information Database: default @@ -851,7 +851,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view9 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -m int None +m int #### A masked pattern was here #### FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`)) @@ -863,7 +863,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -m int None +m int # Detailed Table Information Database: default @@ -917,8 +917,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view10 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string None -value string None +key string +value string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view10 @@ -928,8 +928,8 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -992,7 +992,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view11 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -boom int None +boom int #### A masked pattern was here #### FROM table1, viewExpandedText:SELECT `test_explode`(array(1,2,3)) AS (`boom`) @@ -1004,7 +1004,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -boom int None +boom int # Detailed Table Information Database: default @@ -1060,9 +1060,9 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view12 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string None -value string None -mycol int None +key string +value string +mycol int #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED view12 @@ -1072,9 +1072,9 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -mycol int None +key string +value string +mycol int # Detailed Table Information Database: default @@ -1146,7 +1146,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view13 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int None +key int #### A masked pattern was here #### FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 ON key) s, viewExpandedText:SELECT `s`.`key` @@ -1158,7 +1158,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key int None +key int # Detailed Table Information Database: default @@ -1243,10 +1243,10 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view14 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -k1 string None -v1 string None -k2 string None -v2 string None +k1 string +v1 string +k2 string +v2 string #### A masked pattern was here #### unionsrc2.key as k2, unionsrc2.value as v2 @@ -1274,10 +1274,10 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -k1 string None -v1 string None -k2 string None -v2 string None +k1 string +v1 string +k2 string +v2 string # Detailed Table Information Database: default @@ -1375,8 +1375,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view15 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key string None -value_count bigint None +key string +value_count bigint #### A masked pattern was here #### FROM src @@ -1390,8 +1390,8 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value_count bigint None +key string +value_count bigint # Detailed Table Information Database: default @@ -1462,7 +1462,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED view16 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -value string None +value string #### A masked pattern was here #### FROM src, viewExpandedText:SELECT DISTINCT `src`.`value` @@ -1474,7 +1474,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -value string None +value string # Detailed Table Information Database: default @@ -1540,7 +1540,7 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE view16 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -value string None +value string PREHOOK: query: -- Likewise, DROP VIEW IF EXISTS should ignore a matching table name DROP VIEW IF EXISTS table1 PREHOOK: type: DROPVIEW @@ -1557,8 +1557,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE table1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: table1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] -key int None -value string None +key int +value string PREHOOK: query: -- this should work since currently we don't track view->table -- dependencies for implementing RESTRICT diff --git ql/src/test/results/clientpositive/create_view_partitioned.q.out ql/src/test/results/clientpositive/create_view_partitioned.q.out index ce9abcd..07fdba9 100644 --- ql/src/test/results/clientpositive/create_view_partitioned.q.out +++ ql/src/test/results/clientpositive/create_view_partitioned.q.out @@ -35,13 +35,13 @@ PREHOOK: query: DESCRIBE EXTENDED vp1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED vp1 POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -value string None +value string #### A masked pattern was here #### FROM src @@ -54,12 +54,12 @@ POSTHOOK: query: DESCRIBE FORMATTED vp1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None +key string # Partition Information # col_name data_type comment -value string None +value string # Detailed Table Information Database: default @@ -249,14 +249,14 @@ POSTHOOK: query: DESCRIBE FORMATTED vp2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None -ds string None +key string +value string +ds string # Partition Information # col_name data_type comment -hr string None +hr string # Detailed Table Information Database: default @@ -360,12 +360,12 @@ POSTHOOK: query: DESCRIBE FORMATTED vp3 POSTHOOK: type: DESCTABLE # col_name data_type comment -k string None +k string # Partition Information # col_name data_type comment -v string None +v string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/create_view_translate.q.out ql/src/test/results/clientpositive/create_view_translate.q.out index 7549eae..cffe2ea 100644 --- ql/src/test/results/clientpositive/create_view_translate.q.out +++ ql/src/test/results/clientpositive/create_view_translate.q.out @@ -19,7 +19,7 @@ POSTHOOK: query: describe formatted v POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None +key string # Detailed Table Information Database: default @@ -59,8 +59,8 @@ POSTHOOK: query: describe formatted w POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/ctas.q.out ql/src/test/results/clientpositive/ctas.q.out index 0bda29a..ce9e105 100644 --- ql/src/test/results/clientpositive/ctas.q.out +++ ql/src/test/results/clientpositive/ctas.q.out @@ -2,10 +2,12 @@ PREHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) create table nzhang_Tmp(a int, b string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- EXCLUDE_HADOOP_MAJOR_VERSIONS(0.20, 0.20S) create table nzhang_Tmp(a int, b string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_Tmp PREHOOK: query: select * from nzhang_Tmp PREHOOK: type: QUERY @@ -127,8 +129,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS1 POSTHOOK: type: DESCTABLE # col_name data_type comment -k string None -value string None +k string +value string # Detailed Table Information Database: default @@ -267,8 +269,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -408,8 +410,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS3 POSTHOOK: type: DESCTABLE # col_name data_type comment -half_key double None -conb string None +half_key double +conb string # Detailed Table Information Database: default @@ -471,8 +473,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS3 POSTHOOK: type: DESCTABLE # col_name data_type comment -half_key double None -conb string None +half_key double +conb string # Detailed Table Information Database: default @@ -612,8 +614,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS4 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -722,6 +724,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments defaultdefault columns.types string:string #### A masked pattern was here #### name default.src @@ -741,6 +744,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments defaultdefault columns.types string:string #### A masked pattern was here #### name default.src @@ -880,8 +884,10 @@ POSTHOOK: Input: default@src POSTHOOK: Output: default@nzhang_ctas5 PREHOOK: query: create table nzhang_ctas6 (key string, `to` string) PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table nzhang_ctas6 (key string, `to` string) POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@nzhang_ctas6 PREHOOK: query: insert overwrite table nzhang_ctas6 select key, value from src tablesample (10 rows) PREHOOK: type: QUERY diff --git ql/src/test/results/clientpositive/ctas_colname.q.out ql/src/test/results/clientpositive/ctas_colname.q.out index 3d568ab..f49e6b5 100644 --- ql/src/test/results/clientpositive/ctas_colname.q.out +++ ql/src/test/results/clientpositive/ctas_colname.q.out @@ -87,10 +87,10 @@ POSTHOOK: query: describe formatted summary POSTHOOK: type: DESCTABLE # col_name data_type comment -_col0 double None -_col1 bigint None -_c1 double None -_c2 bigint None +_col0 double +_col1 bigint +_c1 double +_c2 bigint # Detailed Table Information Database: default @@ -201,9 +201,9 @@ POSTHOOK: query: describe formatted x4 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None -rr int None +key string +value string +rr int # Detailed Table Information Database: default @@ -361,9 +361,9 @@ POSTHOOK: query: describe formatted x5 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None -lead1 string None +key string +value string +lead1 string # Detailed Table Information Database: default @@ -501,8 +501,8 @@ POSTHOOK: query: describe formatted x6 POSTHOOK: type: DESCTABLE # col_name data_type comment -_col0 string None -_c1 string None +_col0 string +_c1 string # Detailed Table Information Database: default @@ -620,7 +620,7 @@ POSTHOOK: query: describe formatted x7 POSTHOOK: type: DESCTABLE # col_name data_type comment -_col0 string None +_col0 string # Detailed Table Information Database: default @@ -1049,7 +1049,7 @@ POSTHOOK: query: describe formatted x8 POSTHOOK: type: DESCTABLE # col_name data_type comment -_col0 string None +_col0 string # Detailed Table Information Database: default @@ -1180,8 +1180,8 @@ POSTHOOK: query: describe formatted x9 POSTHOOK: type: DESCTABLE # col_name data_type comment -_c0 string None -key string None +_c0 string +key string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/ctas_hadoop20.q.out ql/src/test/results/clientpositive/ctas_hadoop20.q.out index b86a14c..fc79856 100644 --- ql/src/test/results/clientpositive/ctas_hadoop20.q.out +++ ql/src/test/results/clientpositive/ctas_hadoop20.q.out @@ -129,8 +129,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS1 POSTHOOK: type: DESCTABLE # col_name data_type comment -k string None -value string None +k string +value string # Detailed Table Information Database: default @@ -269,8 +269,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -410,8 +410,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS3 POSTHOOK: type: DESCTABLE # col_name data_type comment -half_key double None -conb string None +half_key double +conb string # Detailed Table Information Database: default @@ -473,8 +473,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS3 POSTHOOK: type: DESCTABLE # col_name data_type comment -half_key double None -conb string None +half_key double +conb string # Detailed Table Information Database: default @@ -614,8 +614,8 @@ POSTHOOK: query: describe formatted nzhang_CTAS4 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -724,6 +724,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments defaultdefault columns.types string:string #### A masked pattern was here #### name default.src @@ -743,6 +744,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments defaultdefault columns.types string:string #### A masked pattern was here #### name default.src @@ -921,7 +923,7 @@ POSTHOOK: query: desc nzhang_ctas8 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: nzhang_ctas6.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: nzhang_ctas6.to SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -_c0 decimal(3,2) None +_c0 decimal(3,2) PREHOOK: query: drop table nzhang_ctas8 PREHOOK: type: DROPTABLE PREHOOK: Input: default@nzhang_ctas8 diff --git ql/src/test/results/clientpositive/ctas_uses_database_location.q.out ql/src/test/results/clientpositive/ctas_uses_database_location.q.out index 024fa8b..8bcee93 100644 --- ql/src/test/results/clientpositive/ctas_uses_database_location.q.out +++ ql/src/test/results/clientpositive/ctas_uses_database_location.q.out @@ -122,8 +122,8 @@ POSTHOOK: query: DESCRIBE FORMATTED table_db1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: db1 diff --git ql/src/test/results/clientpositive/custom_input_output_format.q.out ql/src/test/results/clientpositive/custom_input_output_format.q.out index 9dc6480..03d3291 100644 --- ql/src/test/results/clientpositive/custom_input_output_format.q.out +++ ql/src/test/results/clientpositive/custom_input_output_format.q.out @@ -13,8 +13,8 @@ PREHOOK: query: DESCRIBE EXTENDED src1_rot13_iof PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED src1_rot13_iof POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string #### A masked pattern was here #### PREHOOK: query: SELECT * FROM src1 ORDER BY key, value diff --git ql/src/test/results/clientpositive/database.q.out ql/src/test/results/clientpositive/database.q.out index 448f4e9..d457946 100644 --- ql/src/test/results/clientpositive/database.q.out +++ ql/src/test/results/clientpositive/database.q.out @@ -139,14 +139,14 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- DESCRIBE table in non-default DB DESCRIBE test_table POSTHOOK: type: DESCTABLE -col1 string None +col1 string PREHOOK: query: -- DESCRIBE EXTENDED in non-default DB DESCRIBE EXTENDED test_table PREHOOK: type: DESCTABLE POSTHOOK: query: -- DESCRIBE EXTENDED in non-default DB DESCRIBE EXTENDED test_table POSTHOOK: type: DESCTABLE -col1 string None +col1 string #### A masked pattern was here #### PREHOOK: query: -- CREATE LIKE in non-default DB @@ -168,7 +168,7 @@ PREHOOK: query: DESCRIBE EXTENDED test_table_like PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED test_table_like POSTHOOK: type: DESCTABLE -col1 string None +col1 string #### A masked pattern was here #### PREHOOK: query: -- LOAD and SELECT diff --git ql/src/test/results/clientpositive/database_location.q.out ql/src/test/results/clientpositive/database_location.q.out index e829c63..6586927 100644 --- ql/src/test/results/clientpositive/database_location.q.out +++ ql/src/test/results/clientpositive/database_location.q.out @@ -24,8 +24,8 @@ POSTHOOK: query: DESCRIBE FORMATTED table_db1 POSTHOOK: type: DESCTABLE # col_name data_type comment -name string None -value int None +name string +value int # Detailed Table Information Database: db1 @@ -84,8 +84,8 @@ POSTHOOK: query: DESCRIBE FORMATTED table_db2 POSTHOOK: type: DESCTABLE # col_name data_type comment -name string None -value int None +name string +value int # Detailed Table Information Database: db2 diff --git ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out index 4408256..9ab665c 100644 --- ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out +++ ql/src/test/results/clientpositive/dbtxnmgr_query5.q.out @@ -37,14 +37,14 @@ PREHOOK: query: describe T1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe T1 POSTHOOK: type: DESCTABLE -key string None -val string None -ds string None +key string +val string +ds string # Partition Information # col_name data_type comment -ds string None +ds string PREHOOK: query: drop view V1 PREHOOK: type: DROPVIEW PREHOOK: Input: foo@v1 diff --git ql/src/test/results/clientpositive/ddltime.q.out ql/src/test/results/clientpositive/ddltime.q.out index 5828d9f..7c5154d 100644 --- ql/src/test/results/clientpositive/ddltime.q.out +++ ql/src/test/results/clientpositive/ddltime.q.out @@ -110,14 +110,14 @@ POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string POSTHOOK: Lineage: t1.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table T2 partition (ds = '2010-06-21', hr = '1') select key, value from src where key > 10 @@ -150,14 +150,14 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table T2 partition (ds = '2010-06-21', hr='1') select /*+ HOLD_DDLTIME */ key, value from src where key > 10 @@ -194,14 +194,14 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table T2 partition (ds='2010-06-01', hr='1') select key, value from src where key > 10 @@ -242,13 +242,13 @@ POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: t2 PARTITION(ds=2010-06-21,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/decimal_1.q.out ql/src/test/results/clientpositive/decimal_1.q.out index edeebf3..c227ef2 100644 --- ql/src/test/results/clientpositive/decimal_1.q.out +++ ql/src/test/results/clientpositive/decimal_1.q.out @@ -21,9 +21,9 @@ PREHOOK: query: desc decimal_1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc decimal_1 POSTHOOK: type: DESCTABLE -t decimal(4,2) from deserializer -u decimal(5,0) from deserializer -v decimal(10,0) from deserializer +t decimal(4,2) +u decimal(5,0) +v decimal(10,0) PREHOOK: query: insert overwrite table decimal_1 select cast('17.29' as decimal(4,2)), 3.1415926BD, 3115926.54321BD from src tablesample (1 rows) PREHOOK: type: QUERY diff --git ql/src/test/results/clientpositive/decimal_6.q.out ql/src/test/results/clientpositive/decimal_6.q.out index ddb630f..30934c2 100644 --- ql/src/test/results/clientpositive/decimal_6.q.out +++ ql/src/test/results/clientpositive/decimal_6.q.out @@ -135,5 +135,5 @@ PREHOOK: query: desc DECIMAL_6_3 PREHOOK: type: DESCTABLE POSTHOOK: query: desc DECIMAL_6_3 POSTHOOK: type: DESCTABLE -k double None -v int None +k double +v int diff --git ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out index 1dacca8..529d4f2 100644 --- ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out +++ ql/src/test/results/clientpositive/describe_formatted_view_partitioned.q.out @@ -38,12 +38,12 @@ POSTHOOK: query: DESCRIBE FORMATTED view_partitioned PARTITION (value='val_86') POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None +key string # Partition Information # col_name data_type comment -value string None +value string # Detailed Partition Information Partition Value: [val_86] diff --git ql/src/test/results/clientpositive/describe_pretty.q.out ql/src/test/results/clientpositive/describe_pretty.q.out index 8765f66..204433b 100644 --- ql/src/test/results/clientpositive/describe_pretty.q.out +++ ql/src/test/results/clientpositive/describe_pretty.q.out @@ -91,7 +91,7 @@ col6 string This comment has a very long single word ABCDEF GHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz12 3 which will not fit in a line by itself for small column widths. -col7_nocomment string None +col7_nocomment string PREHOOK: query: DESCRIBE PRETTY test_table PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE PRETTY test_table @@ -109,7 +109,7 @@ col5 string col5 very long multi-line comment where each li into multiple lines. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin in dolor nisl, sodales adipiscing tortor. Integer venenatis col6 string This comment has a very long single word ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvzxyz123 which will not fit in a line by itself for small column widths. -col7_nocomment string None +col7_nocomment string PREHOOK: query: DESCRIBE PRETTY test_table PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE PRETTY test_table @@ -157,7 +157,7 @@ col6 string This comment has fit in a line by itself for small column widths. -col7_nocomment string None +col7_nocomment string PREHOOK: query: DESCRIBE PRETTY test_table PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE PRETTY test_table @@ -192,7 +192,7 @@ col6 string This comment has a very will not fit in a line by itself for small column widths. -col7_nocomment string None +col7_nocomment string PREHOOK: query: CREATE TABLE test_table_very_long_column_name( col1 INT COMMENT 'col1 one line comment', col2_abcdefghiklmnopqrstuvxyz STRING COMMENT 'col2 @@ -329,10 +329,10 @@ col6 string This comment has a very will not fit in a line by itself for small column widths. -col7_nocomment string None -ds string None +col7_nocomment string +ds string # Partition Information col_name data_type comment -ds string None +ds string diff --git ql/src/test/results/clientpositive/describe_syntax.q.out ql/src/test/results/clientpositive/describe_syntax.q.out index e4c4f96..8c3d6e5 100644 --- ql/src/test/results/clientpositive/describe_syntax.q.out +++ ql/src/test/results/clientpositive/describe_syntax.q.out @@ -40,30 +40,30 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table DESCRIBE t1 POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string PREHOOK: query: DESCRIBE EXTENDED t1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED t1 POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED t1 @@ -72,14 +72,14 @@ POSTHOOK: query: DESCRIBE FORMATTED t1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key1 int None -value1 string None +key1 int +value1 string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string # Detailed Table Information Database: db1 @@ -107,30 +107,30 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.table DESCRIBE db1.t1 POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string PREHOOK: query: DESCRIBE EXTENDED db1.t1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED db1.t1 POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED db1.t1 @@ -139,14 +139,14 @@ POSTHOOK: query: DESCRIBE FORMATTED db1.t1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key1 int None -value1 string None +key1 int +value1 string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string # Detailed Table Information Database: db1 @@ -235,30 +235,30 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe table partition DESCRIBE t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string PREHOOK: query: DESCRIBE EXTENDED t1 PARTITION(ds='4', part='5') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED t1 PARTITION(ds='4', part='5') @@ -267,14 +267,14 @@ POSTHOOK: query: DESCRIBE FORMATTED t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE # col_name data_type comment -key1 int None -value1 string None +key1 int +value1 string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string # Detailed Partition Information Partition Value: [4, 5] @@ -302,30 +302,30 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: -- describe database.table partition DESCRIBE db1.t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string PREHOOK: query: DESCRIBE EXTENDED db1.t1 PARTITION(ds='4', part='5') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED db1.t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE -key1 int None -value1 string None -ds string None -part string None +key1 int +value1 string +ds string +part string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string #### A masked pattern was here #### PREHOOK: query: DESCRIBE FORMATTED db1.t1 PARTITION(ds='4', part='5') @@ -334,14 +334,14 @@ POSTHOOK: query: DESCRIBE FORMATTED db1.t1 PARTITION(ds='4', part='5') POSTHOOK: type: DESCTABLE # col_name data_type comment -key1 int None -value1 string None +key1 int +value1 string # Partition Information # col_name data_type comment -ds string None -part string None +ds string +part string # Detailed Partition Information Partition Value: [4, 5] diff --git ql/src/test/results/clientpositive/describe_table.q.out ql/src/test/results/clientpositive/describe_table.q.out index e907248..22c02de 100644 --- ql/src/test/results/clientpositive/describe_table.q.out +++ ql/src/test/results/clientpositive/describe_table.q.out @@ -4,14 +4,14 @@ POSTHOOK: query: describe srcpart POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string PREHOOK: query: describe srcpart.key PREHOOK: type: DESCTABLE POSTHOOK: query: describe srcpart.key @@ -23,28 +23,28 @@ POSTHOOK: query: describe srcpart PARTITION(ds='2008-04-08', hr='12') POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string PREHOOK: query: describe extended srcpart PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended srcpart POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: describe extended srcpart.key @@ -58,14 +58,14 @@ POSTHOOK: query: describe extended srcpart PARTITION(ds='2008-04-08', hr='12') POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: describe formatted srcpart @@ -80,8 +80,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -122,8 +122,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -201,8 +201,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/drop_partitions_filter.q.out ql/src/test/results/clientpositive/drop_partitions_filter.q.out index b77972c..8e55cba 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter.q.out @@ -9,16 +9,16 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -a string None -b int None -c string None -d string None +a string +b int +c string +d string # Partition Information # col_name data_type comment -c string None -d string None +c string +d string PREHOOK: query: alter table ptestfilter add partition (c='US', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Output: default@ptestfilter diff --git ql/src/test/results/clientpositive/drop_partitions_filter2.q.out ql/src/test/results/clientpositive/drop_partitions_filter2.q.out index ce32a93..d9a6f8c 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter2.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter2.q.out @@ -9,16 +9,16 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -a string None -b int None -c int None -d int None +a string +b int +c int +d int # Partition Information # col_name data_type comment -c int None -d int None +c int +d int PREHOOK: query: alter table ptestfilter add partition (c=1, d=1) PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Output: default@ptestfilter diff --git ql/src/test/results/clientpositive/drop_partitions_filter3.q.out ql/src/test/results/clientpositive/drop_partitions_filter3.q.out index c36cb72..69b7d42 100644 --- ql/src/test/results/clientpositive/drop_partitions_filter3.q.out +++ ql/src/test/results/clientpositive/drop_partitions_filter3.q.out @@ -9,16 +9,16 @@ PREHOOK: query: describe ptestfilter PREHOOK: type: DESCTABLE POSTHOOK: query: describe ptestfilter POSTHOOK: type: DESCTABLE -a string None -b int None -c string None -d int None +a string +b int +c string +d int # Partition Information # col_name data_type comment -c string None -d int None +c string +d int PREHOOK: query: alter table ptestfilter add partition (c='1', d=1) PREHOOK: type: ALTERTABLE_ADDPARTS PREHOOK: Output: default@ptestfilter diff --git ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out index e567136..e38211a 100644 --- ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out +++ ql/src/test/results/clientpositive/drop_partitions_ignore_protection.q.out @@ -25,14 +25,14 @@ PREHOOK: query: desc extended tbl_protectmode_no_drop partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_protectmode_no_drop partition (p='p1') POSTHOOK: type: DESCTABLE -c1 string None -c2 string None -p string None +c1 string +c2 string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### PREHOOK: query: -- The partition will be dropped, even though we have enabled no_drop diff --git ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out index 8623f4b..344394d 100644 --- ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out +++ ql/src/test/results/clientpositive/exim_04_evolved_parts.q.out @@ -103,11 +103,11 @@ PREHOOK: query: describe extended exim_employee PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee POSTHOOK: type: DESCTABLE -emp_id int from deserializer -emp_name string from deserializer -emp_dob string from deserializer -emp_sex string from deserializer -emp_dept int from deserializer +emp_id int employee id +emp_name string +emp_dob string employee date of birth +emp_sex string M/F +emp_dept int emp_country string 2-char code emp_state string 2-char code @@ -123,10 +123,10 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='tn') POSTHOOK: type: DESCTABLE emp_id int employee id -emp_name string None +emp_name string emp_dob string employee date of birth emp_sex string M/F -emp_dept int None +emp_dept int emp_country string 2-char code emp_state string 2-char code @@ -141,11 +141,11 @@ PREHOOK: query: describe extended exim_employee partition (emp_country='in', emp PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended exim_employee partition (emp_country='in', emp_state='ka') POSTHOOK: type: DESCTABLE -emp_id int from deserializer -emp_name string from deserializer -emp_dob string from deserializer -emp_sex string from deserializer -emp_dept int from deserializer +emp_id int employee id +emp_name string +emp_dob string employee date of birth +emp_sex string M/F +emp_dept int emp_country string 2-char code emp_state string 2-char code diff --git ql/src/test/results/clientpositive/exim_hidden_files.q.out ql/src/test/results/clientpositive/exim_hidden_files.q.out index 7513262..b603dd4 100644 --- ql/src/test/results/clientpositive/exim_hidden_files.q.out +++ ql/src/test/results/clientpositive/exim_hidden_files.q.out @@ -50,12 +50,12 @@ POSTHOOK: query: describe formatted exim_employee POSTHOOK: type: DESCTABLE # col_name data_type comment -emp_id int None +emp_id int # Partition Information # col_name data_type comment -emp_country string None +emp_country string # Detailed Table Information Database: importer diff --git ql/src/test/results/clientpositive/fileformat_sequencefile.q.out ql/src/test/results/clientpositive/fileformat_sequencefile.q.out index 82b3667..b83450e 100644 --- ql/src/test/results/clientpositive/fileformat_sequencefile.q.out +++ ql/src/test/results/clientpositive/fileformat_sequencefile.q.out @@ -35,8 +35,8 @@ PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED dest1 POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: FROM src diff --git ql/src/test/results/clientpositive/fileformat_text.q.out ql/src/test/results/clientpositive/fileformat_text.q.out index efb0ca2..90213c1 100644 --- ql/src/test/results/clientpositive/fileformat_text.q.out +++ ql/src/test/results/clientpositive/fileformat_text.q.out @@ -35,8 +35,8 @@ PREHOOK: query: DESCRIBE EXTENDED dest1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED dest1 POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string #### A masked pattern was here #### PREHOOK: query: FROM src diff --git ql/src/test/results/clientpositive/import_exported_table.q.out ql/src/test/results/clientpositive/import_exported_table.q.out index 35e5637..b305a2e 100644 --- ql/src/test/results/clientpositive/import_exported_table.q.out +++ ql/src/test/results/clientpositive/import_exported_table.q.out @@ -7,8 +7,8 @@ PREHOOK: query: DESCRIBE j1_41 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE j1_41 POSTHOOK: type: DESCTABLE -a string None -b int None +a string +b int PREHOOK: query: SELECT * from j1_41 PREHOOK: type: QUERY PREHOOK: Input: default@j1_41 diff --git ql/src/test/results/clientpositive/infer_bucket_sort.q.out ql/src/test/results/clientpositive/infer_bucket_sort.q.out index fbb8837..2797023 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort.q.out @@ -33,13 +33,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -92,13 +92,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -155,13 +155,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)a.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -222,13 +222,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)a.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -293,13 +293,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)a.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -368,13 +368,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -447,13 +447,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -530,13 +530,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -617,13 +617,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -708,13 +708,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -803,13 +803,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -902,13 +902,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1005,13 +1005,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1112,13 +1112,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1223,13 +1223,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1338,13 +1338,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1457,13 +1457,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1580,13 +1580,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1707,13 +1707,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)c.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1840,13 +1840,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=1).value EXPRESSION [(src)src.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -1977,13 +1977,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -2116,13 +2116,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -2259,13 +2259,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -2406,13 +2406,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -2557,13 +2557,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out index 8659da5..690aeac 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_bucketed_table.q.out @@ -35,13 +35,13 @@ POSTHOOK: Lineage: test_table_bucketed PARTITION(part=1).key SIMPLE [(src)src.Fi POSTHOOK: Lineage: test_table_bucketed PARTITION(part=1).value EXPRESSION [(src)src.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out index 36b78fa..0a4c323 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_convert_join.q.out @@ -35,13 +35,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)b.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -110,13 +110,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)b.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out index 4cce425..e1dc74f 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_dyn_part.q.out @@ -62,8 +62,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -106,8 +106,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -187,8 +187,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -235,8 +235,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -324,8 +324,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -376,8 +376,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -798,8 +798,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -858,8 +858,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out index 90dfe92..536c94d 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_grouping_operators.q.out @@ -113,14 +113,14 @@ POSTHOOK: Lineage: test_table_out PARTITION(part=1).key SIMPLE [(src)src.FieldSc POSTHOOK: Lineage: test_table_out PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -agg string None +key string +value string +agg string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -181,15 +181,15 @@ POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.Field POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -grouping_key string None -agg string None +key string +value string +grouping_key string +agg string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -330,14 +330,14 @@ POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.Field POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -agg string None +key string +value string +agg string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -412,15 +412,15 @@ POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.Field POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -grouping_key string None -agg string None +key string +value string +grouping_key string +agg string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -582,14 +582,14 @@ POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.Field POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -agg string None +key string +value string +agg string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -678,15 +678,15 @@ POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).key SIMPLE [(src)src.Field POSTHOOK: Lineage: test_table_out_2 PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -grouping_key string None -agg string None +key string +value string +grouping_key string +agg string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out index 839dbab..c15143a 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_list_bucket.q.out @@ -45,13 +45,13 @@ POSTHOOK: Lineage: list_bucketing_table PARTITION(part=1).key SIMPLE [(src)src.F POSTHOOK: Lineage: list_bucketing_table PARTITION(part=1).value EXPRESSION [(src)src.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -126,13 +126,13 @@ POSTHOOK: Lineage: list_bucketing_table2 PARTITION(part=1).key SIMPLE [(src)src. POSTHOOK: Lineage: list_bucketing_table2 PARTITION(part=1).value EXPRESSION [(src)src.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out index 2c23c39..881e0c0 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out @@ -191,13 +191,13 @@ POSTHOOK: Lineage: test_table_out PARTITION(part=1).key SIMPLE [(test_table1)tes POSTHOOK: Lineage: test_table_out PARTITION(part=1).value EXPRESSION [(test_table1)test_table1.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -373,13 +373,13 @@ POSTHOOK: Lineage: test_table_out PARTITION(part=1).key SIMPLE [(test_table1)tes POSTHOOK: Lineage: test_table_out PARTITION(part=1).value EXPRESSION [(test_table1)test_table1.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -552,13 +552,13 @@ POSTHOOK: Lineage: test_table_out PARTITION(part=1).key SIMPLE [(test_table1)tes POSTHOOK: Lineage: test_table_out PARTITION(part=1).value EXPRESSION [(test_table1)test_table1.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -716,13 +716,13 @@ POSTHOOK: Lineage: test_table_out PARTITION(part=1).key SIMPLE [(test_table1)tes POSTHOOK: Lineage: test_table_out PARTITION(part=1).value EXPRESSION [(test_table1)test_table1.null, ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out index 9ac009e..9162b7f 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_merge.q.out @@ -35,13 +35,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)b.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -94,13 +94,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE [(src)a.FieldSchema(n POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE [(src)b.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out index 792ecde..80ca41b 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_multi_insert.q.out @@ -45,13 +45,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -88,13 +88,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [2] @@ -161,13 +161,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -208,13 +208,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [2] @@ -289,13 +289,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -340,13 +340,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [2] @@ -429,13 +429,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -484,13 +484,13 @@ POSTHOOK: Lineage: test_table PARTITION(part=2).key EXPRESSION [(src)src.null, ] POSTHOOK: Lineage: test_table PARTITION(part=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [2] diff --git ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out index 256fca0..24ae095 100644 --- ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out +++ ql/src/test/results/clientpositive/infer_bucket_sort_num_buckets.q.out @@ -133,14 +133,14 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=1).key EXPRESSION [(src POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=1).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 0] @@ -177,14 +177,14 @@ POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=1).key EXPRESSION [(src POSTHOOK: Lineage: test_table PARTITION(ds=2008-04-08,hr=1).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 1] diff --git ql/src/test/results/clientpositive/inoutdriver.q.out ql/src/test/results/clientpositive/inoutdriver.q.out index 3fc01ef..94ab376 100644 --- ql/src/test/results/clientpositive/inoutdriver.q.out +++ ql/src/test/results/clientpositive/inoutdriver.q.out @@ -9,6 +9,6 @@ PREHOOK: query: desc extended test PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended test POSTHOOK: type: DESCTABLE -a int None +a int #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/input1.q.out ql/src/test/results/clientpositive/input1.q.out index af975f0..addda2c 100644 --- ql/src/test/results/clientpositive/input1.q.out +++ ql/src/test/results/clientpositive/input1.q.out @@ -29,5 +29,5 @@ PREHOOK: query: DESCRIBE TEST1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST1 POSTHOOK: type: DESCTABLE -a int None -b double None +a int +b double diff --git ql/src/test/results/clientpositive/input10.q.out ql/src/test/results/clientpositive/input10.q.out index abdb2d1..7a70bca 100644 --- ql/src/test/results/clientpositive/input10.q.out +++ ql/src/test/results/clientpositive/input10.q.out @@ -29,13 +29,13 @@ PREHOOK: query: DESCRIBE TEST10 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST10 POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None -hr string None +key int +value string +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string diff --git ql/src/test/results/clientpositive/input15.q.out ql/src/test/results/clientpositive/input15.q.out index 6008a14..7ee65c5 100644 --- ql/src/test/results/clientpositive/input15.q.out +++ ql/src/test/results/clientpositive/input15.q.out @@ -28,5 +28,5 @@ PREHOOK: query: DESCRIBE TEST15 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST15 POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string diff --git ql/src/test/results/clientpositive/input2.q.out ql/src/test/results/clientpositive/input2.q.out index 89ceefe..33ca479 100644 --- ql/src/test/results/clientpositive/input2.q.out +++ ql/src/test/results/clientpositive/input2.q.out @@ -9,14 +9,14 @@ PREHOOK: query: DESCRIBE TEST2a PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST2a POSTHOOK: type: DESCTABLE -a int None -b double None +a int +b double PREHOOK: query: DESC TEST2a PREHOOK: type: DESCTABLE POSTHOOK: query: DESC TEST2a POSTHOOK: type: DESCTABLE -a int None -b double None +a int +b double PREHOOK: query: CREATE TABLE TEST2b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -28,9 +28,9 @@ PREHOOK: query: DESCRIBE TEST2b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST2b POSTHOOK: type: DESCTABLE -a array None -b double None -c map None +a array +b double +c map PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES diff --git ql/src/test/results/clientpositive/input3.q.out ql/src/test/results/clientpositive/input3.q.out index 7ea0343..94706bc 100644 --- ql/src/test/results/clientpositive/input3.q.out +++ ql/src/test/results/clientpositive/input3.q.out @@ -9,8 +9,8 @@ PREHOOK: query: DESCRIBE TEST3a PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3a POSTHOOK: type: DESCTABLE -a int None -b double None +a int +b double PREHOOK: query: CREATE TABLE TEST3b(A ARRAY, B DOUBLE, C MAP) STORED AS TEXTFILE PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -22,9 +22,9 @@ PREHOOK: query: DESCRIBE TEST3b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3b POSTHOOK: type: DESCTABLE -a array None -b double None -c map None +a array +b double +c map PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES @@ -69,10 +69,10 @@ PREHOOK: query: DESCRIBE TEST3b PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3b POSTHOOK: type: DESCTABLE -a array None -b double None -c map None -x double None +a array +b double +c map +x double PREHOOK: query: EXPLAIN ALTER TABLE TEST3b RENAME TO TEST3c PREHOOK: type: ALTERTABLE_RENAME @@ -103,10 +103,10 @@ PREHOOK: query: DESCRIBE TEST3c PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE TEST3c POSTHOOK: type: DESCTABLE -a array None -b double None -c map None -x double None +a array +b double +c map +x double PREHOOK: query: SHOW TABLES PREHOOK: type: SHOWTABLES POSTHOOK: query: SHOW TABLES @@ -151,7 +151,7 @@ PREHOOK: query: DESCRIBE EXTENDED TEST3c PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED TEST3c POSTHOOK: type: DESCTABLE -r1 int None -r2 double None +r1 int +r2 double #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/input_part10.q.out ql/src/test/results/clientpositive/input_part10.q.out index 1a7ef57..bdc3e63 100644 --- ql/src/test/results/clientpositive/input_part10.q.out +++ ql/src/test/results/clientpositive/input_part10.q.out @@ -103,16 +103,16 @@ POSTHOOK: query: DESCRIBE EXTENDED part_special PARTITION(ds='2008 04 08', ts = POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).a SIMPLE [] POSTHOOK: Lineage: part_special PARTITION(ds=2008 04 08,ts=10:11:12=455).b SIMPLE [] -a string None -b string None -ds string None -ts string None +a string +b string +ds string +ts string # Partition Information # col_name data_type comment -ds string None -ts string None +ds string +ts string #### A masked pattern was here #### PREHOOK: query: SELECT * FROM part_special WHERE ds='2008 04 08' AND ts = '10:11:12=455' diff --git ql/src/test/results/clientpositive/inputddl2.q.out ql/src/test/results/clientpositive/inputddl2.q.out index bc40300..01fa403 100644 --- ql/src/test/results/clientpositive/inputddl2.q.out +++ ql/src/test/results/clientpositive/inputddl2.q.out @@ -28,13 +28,13 @@ PREHOOK: query: DESCRIBE INPUTDDL2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL2 POSTHOOK: type: DESCTABLE -key int None -value string None -ds string None -country string None +key int +value string +ds string +country string # Partition Information # col_name data_type comment -ds string None -country string None +ds string +country string diff --git ql/src/test/results/clientpositive/inputddl3.q.out ql/src/test/results/clientpositive/inputddl3.q.out index 86909c4..6be4312 100644 --- ql/src/test/results/clientpositive/inputddl3.q.out +++ ql/src/test/results/clientpositive/inputddl3.q.out @@ -28,5 +28,5 @@ PREHOOK: query: DESCRIBE INPUTDDL3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL3 POSTHOOK: type: DESCTABLE -key int None -value string None +key int +value string diff --git ql/src/test/results/clientpositive/inputddl4.q.out ql/src/test/results/clientpositive/inputddl4.q.out index 9f17601..459f9c7 100644 --- ql/src/test/results/clientpositive/inputddl4.q.out +++ ql/src/test/results/clientpositive/inputddl4.q.out @@ -25,39 +25,39 @@ PREHOOK: query: DESCRIBE INPUTDDL4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL4 POSTHOOK: type: DESCTABLE -viewtime string None -userid int None -page_url string None -referrer_url string None -friends array None -properties map None +viewtime string +userid int +page_url string +referrer_url string +friends array +properties map ip string IP Address of the User -ds string None -country string None +ds string +country string # Partition Information # col_name data_type comment -ds string None -country string None +ds string +country string PREHOOK: query: DESCRIBE EXTENDED INPUTDDL4 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL4 POSTHOOK: type: DESCTABLE -viewtime string None -userid int None -page_url string None -referrer_url string None -friends array None -properties map None +viewtime string +userid int +page_url string +referrer_url string +friends array +properties map ip string IP Address of the User -ds string None -country string None +ds string +country string # Partition Information # col_name data_type comment -ds string None -country string None +ds string +country string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/inputddl5.q.out ql/src/test/results/clientpositive/inputddl5.q.out index 929c5ee..8ef9253 100644 --- ql/src/test/results/clientpositive/inputddl5.q.out +++ ql/src/test/results/clientpositive/inputddl5.q.out @@ -21,7 +21,7 @@ PREHOOK: query: DESCRIBE INPUTDDL5 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE INPUTDDL5 POSTHOOK: type: DESCTABLE -name string None +name string PREHOOK: query: SELECT INPUTDDL5.name from INPUTDDL5 PREHOOK: type: QUERY PREHOOK: Input: default@inputddl5 diff --git ql/src/test/results/clientpositive/inputddl6.q.out ql/src/test/results/clientpositive/inputddl6.q.out index ae0bc12..9055fa3 100644 --- ql/src/test/results/clientpositive/inputddl6.q.out +++ ql/src/test/results/clientpositive/inputddl6.q.out @@ -33,28 +33,28 @@ PREHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL6 POSTHOOK: type: DESCTABLE -key string None -value string None -ds string None +key string +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PARTITION (ds='2008-04-08') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED INPUTDDL6 PARTITION (ds='2008-04-08') POSTHOOK: type: DESCTABLE -key string None -value string None -ds string None +key string +value string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: SHOW PARTITIONS INPUTDDL6 diff --git ql/src/test/results/clientpositive/inputddl7.q.out ql/src/test/results/clientpositive/inputddl7.q.out index 7387142..d3db941 100644 --- ql/src/test/results/clientpositive/inputddl7.q.out +++ ql/src/test/results/clientpositive/inputddl7.q.out @@ -112,39 +112,39 @@ PREHOOK: query: DESCRIBE EXTENDED T1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T1 POSTHOOK: type: DESCTABLE -name string None +name string #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED T2 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T2 POSTHOOK: type: DESCTABLE -name string None +name string #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED T3 PARTITION (ds='2008-04-09') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T3 PARTITION (ds='2008-04-09') POSTHOOK: type: DESCTABLE -name string None -ds string None +name string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### PREHOOK: query: DESCRIBE EXTENDED T4 PARTITION (ds='2008-04-09') PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED T4 PARTITION (ds='2008-04-09') POSTHOOK: type: DESCTABLE -name string None -ds string None +name string +ds string # Partition Information # col_name data_type comment -ds string None +ds string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/inputddl8.q.out ql/src/test/results/clientpositive/inputddl8.q.out index d8e93b8..c3854e5 100644 --- ql/src/test/results/clientpositive/inputddl8.q.out +++ ql/src/test/results/clientpositive/inputddl8.q.out @@ -27,13 +27,13 @@ lint array from deserializer lstring array from deserializer lintstring array> from deserializer mstringstring map from deserializer -ds string None -country string None +ds string +country string # Partition Information # col_name data_type comment -ds string None -country string None +ds string +country string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/lb_fs_stats.q.out ql/src/test/results/clientpositive/lb_fs_stats.q.out index 5a15684..e182e2c 100644 --- ql/src/test/results/clientpositive/lb_fs_stats.q.out +++ ql/src/test/results/clientpositive/lb_fs_stats.q.out @@ -39,13 +39,13 @@ POSTHOOK: Lineage: test_tab PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(n POSTHOOK: Lineage: test_tab PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/list_bucket_dml_1.q.out ql/src/test/results/clientpositive/list_bucket_dml_1.q.out index e32b9fe..e4a1d99 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_1.q.out and ql/src/test/results/clientpositive/list_bucket_dml_1.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_11.q.out ql/src/test/results/clientpositive/list_bucket_dml_11.q.out index 5d844fe..6f48fa1 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_11.q.out and ql/src/test/results/clientpositive/list_bucket_dml_11.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_12.q.out ql/src/test/results/clientpositive/list_bucket_dml_12.q.out index 894b6d3..8501431 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_12.q.out and ql/src/test/results/clientpositive/list_bucket_dml_12.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_13.q.out ql/src/test/results/clientpositive/list_bucket_dml_13.q.out index 2d21bef..6154a07 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_13.q.out and ql/src/test/results/clientpositive/list_bucket_dml_13.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_2.q.out ql/src/test/results/clientpositive/list_bucket_dml_2.q.out index 1be44cc..432edad 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_2.q.out and ql/src/test/results/clientpositive/list_bucket_dml_2.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_3.q.out ql/src/test/results/clientpositive/list_bucket_dml_3.q.out index 05804d0..a1430c5 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_3.q.out and ql/src/test/results/clientpositive/list_bucket_dml_3.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_4.q.out ql/src/test/results/clientpositive/list_bucket_dml_4.q.out index 30829f0..93f7dff 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_4.q.out and ql/src/test/results/clientpositive/list_bucket_dml_4.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_5.q.out ql/src/test/results/clientpositive/list_bucket_dml_5.q.out index b0a2127..0af2a5b 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_5.q.out and ql/src/test/results/clientpositive/list_bucket_dml_5.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_6.q.out ql/src/test/results/clientpositive/list_bucket_dml_6.q.out index cf6c34d..e64d4f7 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_6.q.out and ql/src/test/results/clientpositive/list_bucket_dml_6.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_7.q.out ql/src/test/results/clientpositive/list_bucket_dml_7.q.out index 863203f..ce12809 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_7.q.out and ql/src/test/results/clientpositive/list_bucket_dml_7.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_8.q.out ql/src/test/results/clientpositive/list_bucket_dml_8.q.out index edb4e07..c6a8bef 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_8.q.out and ql/src/test/results/clientpositive/list_bucket_dml_8.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_dml_9.q.out ql/src/test/results/clientpositive/list_bucket_dml_9.q.out index 3cab1a5..0a63ab9 100644 Binary files ql/src/test/results/clientpositive/list_bucket_dml_9.q.out and ql/src/test/results/clientpositive/list_bucket_dml_9.q.out differ diff --git ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out index 5113e96..915d1a8 100644 --- ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_multiskew_1.q.out @@ -59,14 +59,14 @@ POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=4).key SIMPLE [(src)src.FieldSch POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=4).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [1, 4] @@ -214,6 +214,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -233,6 +234,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -372,6 +374,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -391,6 +394,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -523,6 +527,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -542,6 +547,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -675,6 +681,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -694,6 +701,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily diff --git ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out index fd122df..76fb67b 100644 --- ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_multiskew_2.q.out @@ -57,14 +57,14 @@ POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=4).key SIMPLE [(src)src.FieldSch POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=4).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [1, 4] @@ -202,6 +202,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -221,6 +222,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -244,6 +246,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -263,6 +266,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -409,6 +413,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -428,6 +433,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -597,6 +603,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -616,6 +623,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -639,6 +647,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -658,6 +667,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily diff --git ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out index f762eee..ef8c128 100644 --- ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_multiskew_3.q.out @@ -59,14 +59,14 @@ POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=1).key SIMPLE [(src)src.FieldSch POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [1, 1] @@ -129,14 +129,14 @@ POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=2).key SIMPLE [(src)src.FieldSch POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [1, 2] @@ -210,14 +210,14 @@ POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=3).key SIMPLE [(src)src.FieldSch POSTHOOK: Lineage: fact_daily PARTITION(ds=1,hr=3).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [1, 3] @@ -350,6 +350,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -369,6 +370,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -482,6 +484,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -501,6 +504,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -674,6 +678,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -693,6 +698,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -834,6 +840,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily @@ -853,6 +860,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value + columns.comments columns.types string:string #### A masked pattern was here #### name default.fact_daily diff --git ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out index 98a1a70..eaeb999 100644 --- ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_oneskew_1.q.out @@ -130,12 +130,12 @@ POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=1).x EXPRESSION [(src)src.FieldSche POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=2).x EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -x int None +x int # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -272,6 +272,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x + columns.comments columns.types int #### A masked pattern was here #### name default.fact_daily @@ -292,6 +293,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x + columns.comments columns.types int #### A masked pattern was here #### name default.fact_daily @@ -417,6 +419,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x + columns.comments columns.types int #### A masked pattern was here #### name default.fact_daily @@ -437,6 +440,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x + columns.comments columns.types int #### A masked pattern was here #### name default.fact_daily @@ -558,6 +562,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x + columns.comments columns.types int #### A masked pattern was here #### name default.fact_daily @@ -578,6 +583,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x + columns.comments columns.types int #### A masked pattern was here #### name default.fact_daily diff --git ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out index 99be253..33b700e 100644 --- ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_oneskew_2.q.out @@ -145,13 +145,13 @@ POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=2).x EXPRESSION [(src)src.FieldSche POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=2).y SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -x int None -y string None +x int +y string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -304,6 +304,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily @@ -324,6 +325,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily @@ -465,6 +467,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily @@ -485,6 +488,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily @@ -638,6 +642,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily @@ -658,6 +663,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily @@ -835,6 +841,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily @@ -855,6 +862,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x,y + columns.comments columns.types int:string #### A masked pattern was here #### name default.fact_daily diff --git ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out index cefa684..b1b0c50 100644 --- ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out +++ ql/src/test/results/clientpositive/list_bucket_query_oneskew_3.q.out @@ -194,14 +194,14 @@ POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).y SIMPLE [(src)src.FieldSchema(n POSTHOOK: Lineage: fact_tz PARTITION(ds=1,hr=3).z SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -x int None -y string None -z string None +x int +y string +z string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -346,6 +346,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x,y,z + columns.comments columns.types int:string:string #### A masked pattern was here #### name default.fact_daily @@ -366,6 +367,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x,y,z + columns.comments columns.types int:string:string #### A masked pattern was here #### name default.fact_daily @@ -388,6 +390,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x,y,z + columns.comments columns.types int:string:string #### A masked pattern was here #### name default.fact_daily @@ -408,6 +411,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x,y,z + columns.comments columns.types int:string:string #### A masked pattern was here #### name default.fact_daily @@ -430,6 +434,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE false bucket_count -1 columns x,y,z + columns.comments columns.types int:string:string #### A masked pattern was here #### name default.fact_daily @@ -450,6 +455,7 @@ STAGE PLANS: EXTERNAL TRUE bucket_count -1 columns x,y,z + columns.comments columns.types int:string:string #### A masked pattern was here #### name default.fact_daily diff --git ql/src/test/results/clientpositive/load_dyn_part1.q.out ql/src/test/results/clientpositive/load_dyn_part1.q.out index 84ce714..71924ac 100644 --- ql/src/test/results/clientpositive/load_dyn_part1.q.out +++ ql/src/test/results/clientpositive/load_dyn_part1.q.out @@ -26,14 +26,14 @@ POSTHOOK: query: describe extended nzhang_part1 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part10.q.out ql/src/test/results/clientpositive/load_dyn_part10.q.out index 03be8c2..53eb8f3 100644 --- ql/src/test/results/clientpositive/load_dyn_part10.q.out +++ ql/src/test/results/clientpositive/load_dyn_part10.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part10 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part11.q.out ql/src/test/results/clientpositive/load_dyn_part11.q.out index d3d2792..50701d0 100644 --- ql/src/test/results/clientpositive/load_dyn_part11.q.out +++ ql/src/test/results/clientpositive/load_dyn_part11.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part partition (ds="2010-03-03", hr) select key, value, hr from srcpart where ds is not null and hr is not null diff --git ql/src/test/results/clientpositive/load_dyn_part12.q.out ql/src/test/results/clientpositive/load_dyn_part12.q.out index 9b209f4..bc8e723 100644 --- ql/src/test/results/clientpositive/load_dyn_part12.q.out +++ ql/src/test/results/clientpositive/load_dyn_part12.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part12 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part12 partition (ds="2010-03-03", hr) select key, value, cast(hr*2 as int) from srcpart where ds is not null and hr is not null diff --git ql/src/test/results/clientpositive/load_dyn_part13.q.out ql/src/test/results/clientpositive/load_dyn_part13.q.out index db22dd8..4e39250 100644 --- ql/src/test/results/clientpositive/load_dyn_part13.q.out +++ ql/src/test/results/clientpositive/load_dyn_part13.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part13 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part14.q.out ql/src/test/results/clientpositive/load_dyn_part14.q.out index 44e836e..0bfd90a 100644 --- ql/src/test/results/clientpositive/load_dyn_part14.q.out +++ ql/src/test/results/clientpositive/load_dyn_part14.q.out @@ -17,13 +17,13 @@ PREHOOK: query: describe extended nzhang_part14 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part14 POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -value string None +value string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part2.q.out ql/src/test/results/clientpositive/load_dyn_part2.q.out index 22019c7..8a565f1 100644 --- ql/src/test/results/clientpositive/load_dyn_part2.q.out +++ ql/src/test/results/clientpositive/load_dyn_part2.q.out @@ -13,16 +13,16 @@ PREHOOK: query: describe extended nzhang_part_bucket PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part_bucket POSTHOOK: type: DESCTABLE -key string None -value string None -ds string None -hr string None +key string +value string +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part3.q.out ql/src/test/results/clientpositive/load_dyn_part3.q.out index 5b08184..f3d1b27 100644 --- ql/src/test/results/clientpositive/load_dyn_part3.q.out +++ ql/src/test/results/clientpositive/load_dyn_part3.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part3 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part4.q.out ql/src/test/results/clientpositive/load_dyn_part4.q.out index 732f123..c6728be 100644 --- ql/src/test/results/clientpositive/load_dyn_part4.q.out +++ ql/src/test/results/clientpositive/load_dyn_part4.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part4 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part4 partition (ds='2008-04-08', hr='existing_value') select key, value from src diff --git ql/src/test/results/clientpositive/load_dyn_part5.q.out ql/src/test/results/clientpositive/load_dyn_part5.q.out index 0e5f341..b1e92a9 100644 --- ql/src/test/results/clientpositive/load_dyn_part5.q.out +++ ql/src/test/results/clientpositive/load_dyn_part5.q.out @@ -9,13 +9,13 @@ PREHOOK: query: describe extended nzhang_part5 PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nzhang_part5 POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -value string None +value string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_dyn_part6.q.out ql/src/test/results/clientpositive/load_dyn_part6.q.out index d0901b5..49f4169 100644 --- ql/src/test/results/clientpositive/load_dyn_part6.q.out +++ ql/src/test/results/clientpositive/load_dyn_part6.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part6 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part6 partition (ds="2010-03-03", hr) select key, value, hr from srcpart where ds is not null and hr is not null diff --git ql/src/test/results/clientpositive/load_dyn_part7.q.out ql/src/test/results/clientpositive/load_dyn_part7.q.out index f7f4f76..ec087c2 100644 --- ql/src/test/results/clientpositive/load_dyn_part7.q.out +++ ql/src/test/results/clientpositive/load_dyn_part7.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part7 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: insert overwrite table nzhang_part7 partition (ds='2010-03-03', hr='12') select key, value from srcpart where ds = '2008-04-08' and hr = '12' diff --git ql/src/test/results/clientpositive/load_dyn_part8.q.out ql/src/test/results/clientpositive/load_dyn_part8.q.out index 7c80a96..16d4727 100644 Binary files ql/src/test/results/clientpositive/load_dyn_part8.q.out and ql/src/test/results/clientpositive/load_dyn_part8.q.out differ diff --git ql/src/test/results/clientpositive/load_dyn_part9.q.out ql/src/test/results/clientpositive/load_dyn_part9.q.out index 2794bcb..7ac1e4d 100644 --- ql/src/test/results/clientpositive/load_dyn_part9.q.out +++ ql/src/test/results/clientpositive/load_dyn_part9.q.out @@ -19,14 +19,14 @@ POSTHOOK: query: describe extended nzhang_part9 POSTHOOK: type: DESCTABLE key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: explain diff --git ql/src/test/results/clientpositive/load_fs.q.out ql/src/test/results/clientpositive/load_fs.q.out index e77dd68..9fa9e0d 100644 --- ql/src/test/results/clientpositive/load_fs.q.out +++ ql/src/test/results/clientpositive/load_fs.q.out @@ -61,8 +61,8 @@ PREHOOK: query: desc extended load_overwrite PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended load_overwrite POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string #### A masked pattern was here #### PREHOOK: query: select count(*) from load_overwrite @@ -103,8 +103,8 @@ PREHOOK: query: desc extended load_overwrite2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended load_overwrite2 POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string #### A masked pattern was here #### PREHOOK: query: select count(*) from load_overwrite2 diff --git ql/src/test/results/clientpositive/merge3.q.out ql/src/test/results/clientpositive/merge3.q.out index 0773c52..a5861c4 100644 Binary files ql/src/test/results/clientpositive/merge3.q.out and ql/src/test/results/clientpositive/merge3.q.out differ diff --git ql/src/test/results/clientpositive/multi_sahooks.q.out ql/src/test/results/clientpositive/multi_sahooks.q.out index 14f0eeb..941925d 100644 --- ql/src/test/results/clientpositive/multi_sahooks.q.out +++ ql/src/test/results/clientpositive/multi_sahooks.q.out @@ -15,7 +15,7 @@ PREHOOK: query: desc extended tbl_sahook PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahook POSTHOOK: type: DESCTABLE -c string None +c string #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahook @@ -43,7 +43,7 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -c string None +c string #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahooks @@ -71,7 +71,7 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -c string None +c string #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahooks @@ -101,7 +101,7 @@ PREHOOK: query: desc extended tbl_sahooks PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl_sahooks POSTHOOK: type: DESCTABLE -c string None +c string #### A masked pattern was here #### PREHOOK: query: drop table tbl_sahooks diff --git ql/src/test/results/clientpositive/nested_complex.q.out ql/src/test/results/clientpositive/nested_complex.q.out index 5c3fdac..fdfc9df 100644 --- ql/src/test/results/clientpositive/nested_complex.q.out +++ ql/src/test/results/clientpositive/nested_complex.q.out @@ -31,20 +31,20 @@ PREHOOK: query: describe nestedcomplex PREHOOK: type: DESCTABLE POSTHOOK: query: describe nestedcomplex POSTHOOK: type: DESCTABLE -simple_int int None -max_nested_array array>>>>>>>>>>>>>>>>>>>>>> None -max_nested_map array>>>>>>>>>>>>>>>>>>>>> None -max_nested_struct array>>>>>>>>>>>>>>>>>>>>>> None -simple_string string None +simple_int int +max_nested_array array>>>>>>>>>>>>>>>>>>>>>> +max_nested_map array>>>>>>>>>>>>>>>>>>>>> +max_nested_struct array>>>>>>>>>>>>>>>>>>>>>> +simple_string string PREHOOK: query: describe extended nestedcomplex PREHOOK: type: DESCTABLE POSTHOOK: query: describe extended nestedcomplex POSTHOOK: type: DESCTABLE -simple_int int None -max_nested_array array>>>>>>>>>>>>>>>>>>>>>> None -max_nested_map array>>>>>>>>>>>>>>>>>>>>> None -max_nested_struct array>>>>>>>>>>>>>>>>>>>>>> None -simple_string string None +simple_int int +max_nested_array array>>>>>>>>>>>>>>>>>>>>>> +max_nested_map array>>>>>>>>>>>>>>>>>>>>> +max_nested_struct array>>>>>>>>>>>>>>>>>>>>>> +simple_string string #### A masked pattern was here #### PREHOOK: query: load data local inpath '../../data/files/nested_complex.txt' overwrite into table nestedcomplex diff --git ql/src/test/results/clientpositive/nullformat.q.out ql/src/test/results/clientpositive/nullformat.q.out index 7ea1e95..38fdebe 100644 --- ql/src/test/results/clientpositive/nullformat.q.out +++ ql/src/test/results/clientpositive/nullformat.q.out @@ -23,10 +23,10 @@ PREHOOK: query: DESCRIBE EXTENDED base_tab PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED base_tab POSTHOOK: type: DESCTABLE -a string None -b string None -c string None -d string None +a string +b string +c string +d string #### A masked pattern was here #### PREHOOK: query: -- table with non-default null format @@ -62,8 +62,8 @@ PREHOOK: query: DESCRIBE EXTENDED null_tab1 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED null_tab1 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string #### A masked pattern was here #### PREHOOK: query: SHOW CREATE TABLE null_tab1 diff --git ql/src/test/results/clientpositive/nullformatCTAS.q.out ql/src/test/results/clientpositive/nullformatCTAS.q.out index 1c64658..8ca1857 100644 --- ql/src/test/results/clientpositive/nullformatCTAS.q.out +++ ql/src/test/results/clientpositive/nullformatCTAS.q.out @@ -23,10 +23,10 @@ PREHOOK: query: DESCRIBE EXTENDED base_tab PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED base_tab POSTHOOK: type: DESCTABLE -a string None -b string None -c string None -d string None +a string +b string +c string +d string #### A masked pattern was here #### PREHOOK: query: -- table with non-default null format @@ -141,8 +141,8 @@ PREHOOK: query: DESCRIBE EXTENDED null_tab3 PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED null_tab3 POSTHOOK: type: DESCTABLE -a string None -b string None +a string +b string #### A masked pattern was here #### PREHOOK: query: SHOW CREATE TABLE null_tab3 @@ -164,10 +164,10 @@ LOCATION #### A masked pattern was here #### TBLPROPERTIES ( 'numFiles'='1', - 'COLUMN_STATS_ACCURATE'='true', #### A masked pattern was here #### - 'numRows'='10', + 'COLUMN_STATS_ACCURATE'='true', 'totalSize'='80', + 'numRows'='10', 'rawDataSize'='70') 1.01 1.01 diff --git ql/src/test/results/clientpositive/nullformatdir.q.out ql/src/test/results/clientpositive/nullformatdir.q.out index f052726..2c2a59e 100644 --- ql/src/test/results/clientpositive/nullformatdir.q.out +++ ql/src/test/results/clientpositive/nullformatdir.q.out @@ -23,10 +23,10 @@ PREHOOK: query: DESCRIBE EXTENDED base_tab PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE EXTENDED base_tab POSTHOOK: type: DESCTABLE -a string None -b string None -c string None -d string None +a string +b string +c string +d string #### A masked pattern was here #### ROW FORMAT DELIMITED NULL DEFINED AS 'fooNull' SELECT a,b FROM base_tab diff --git ql/src/test/results/clientpositive/orc_create.q.out ql/src/test/results/clientpositive/orc_create.q.out index 4dd0a87..30a07a6 100644 --- ql/src/test/results/clientpositive/orc_create.q.out +++ ql/src/test/results/clientpositive/orc_create.q.out @@ -47,10 +47,10 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create_staging POSTHOOK: type: DESCTABLE # col_name data_type comment -str string None -mp map None -lst array None -strct struct None +str string +mp map +lst array +strct struct # Detailed Table Information Database: default @@ -92,13 +92,13 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create POSTHOOK: type: DESCTABLE # col_name data_type comment -key int from deserializer -value string from deserializer +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -143,13 +143,13 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create POSTHOOK: type: DESCTABLE # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -185,13 +185,13 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create POSTHOOK: type: DESCTABLE # col_name data_type comment -key int from deserializer -value string from deserializer +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -236,13 +236,13 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create POSTHOOK: type: DESCTABLE # col_name data_type comment -key int from deserializer -value string from deserializer +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -287,10 +287,10 @@ POSTHOOK: query: DESCRIBE FORMATTED orc_create_complex POSTHOOK: type: DESCTABLE # col_name data_type comment -str string from deserializer -mp map from deserializer -lst array from deserializer -strct struct from deserializer +str string +mp map +lst array +strct struct # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out index 27d5c29..fc00fc7 100644 --- ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out +++ ql/src/test/results/clientpositive/orc_vectorization_ppd.q.out @@ -313,10 +313,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -361,10 +361,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -408,10 +408,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -457,10 +457,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -504,10 +504,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -553,10 +553,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -600,10 +600,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -649,10 +649,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -696,10 +696,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -741,10 +741,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -785,10 +785,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] @@ -829,10 +829,10 @@ POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string POSTHOOK: Lineage: srcorc.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: srcorc.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: testorc.d SIMPLE [(vectororc)vectororc.FieldSchema(name:d, type:double, comment:null), ] +POSTHOOK: Lineage: testorc.s1 SIMPLE [(vectororc)vectororc.FieldSchema(name:s1, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s2 SIMPLE [(vectororc)vectororc.FieldSchema(name:s2, type:string, comment:null), ] +POSTHOOK: Lineage: testorc.s3 SIMPLE [(vectororc)vectororc.FieldSchema(name:s3, type:string, comment:null), ] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] POSTHOOK: Lineage: vectororc.d EXPRESSION [] diff --git ql/src/test/results/clientpositive/parallel_orderby.q.out ql/src/test/results/clientpositive/parallel_orderby.q.out index 545f956..d38ccea 100644 --- ql/src/test/results/clientpositive/parallel_orderby.q.out +++ ql/src/test/results/clientpositive/parallel_orderby.q.out @@ -91,8 +91,8 @@ POSTHOOK: query: desc formatted total_ordered POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -200,8 +200,8 @@ POSTHOOK: query: desc formatted total_ordered POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/parquet_create.q.out ql/src/test/results/clientpositive/parquet_create.q.out index d2b98e9..7e28a87 100644 --- ql/src/test/results/clientpositive/parquet_create.q.out +++ ql/src/test/results/clientpositive/parquet_create.q.out @@ -56,11 +56,11 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_create POSTHOOK: type: DESCTABLE # col_name data_type comment -id int from deserializer -str string from deserializer -mp map from deserializer -lst array from deserializer -strct struct from deserializer +id int +str string +mp map +lst array +strct struct # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/parquet_ctas.q.out ql/src/test/results/clientpositive/parquet_ctas.q.out index 65964fa..6acb4c1 100644 --- ql/src/test/results/clientpositive/parquet_ctas.q.out +++ ql/src/test/results/clientpositive/parquet_ctas.q.out @@ -50,8 +50,8 @@ POSTHOOK: query: describe parquet_ctas POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: staging.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: staging.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int from deserializer -value string from deserializer +key int +value string PREHOOK: query: select * from parquet_ctas PREHOOK: type: QUERY PREHOOK: Input: default@parquet_ctas @@ -87,8 +87,8 @@ POSTHOOK: query: describe parquet_ctas_advanced POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: staging.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: staging.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -_c0 int from deserializer -_c1 string from deserializer +_c0 int +_c1 string PREHOOK: query: select * from parquet_ctas_advanced PREHOOK: type: QUERY PREHOOK: Input: default@parquet_ctas_advanced @@ -124,8 +124,8 @@ POSTHOOK: query: describe parquet_ctas_alias POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: staging.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: staging.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -mykey int from deserializer -myvalue string from deserializer +mykey int +myvalue string PREHOOK: query: select * from parquet_ctas_alias PREHOOK: type: QUERY PREHOOK: Input: default@parquet_ctas_alias @@ -161,9 +161,9 @@ POSTHOOK: query: describe parquet_ctas_mixed POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: staging.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: staging.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key int from deserializer -_c1 int from deserializer -myvalue string from deserializer +key int +_c1 int +myvalue string PREHOOK: query: select * from parquet_ctas_mixed PREHOOK: type: QUERY PREHOOK: Input: default@parquet_ctas_mixed diff --git ql/src/test/results/clientpositive/parquet_partitioned.q.out ql/src/test/results/clientpositive/parquet_partitioned.q.out index 9a798a6..81e498f 100644 --- ql/src/test/results/clientpositive/parquet_partitioned.q.out +++ ql/src/test/results/clientpositive/parquet_partitioned.q.out @@ -44,13 +44,13 @@ POSTHOOK: query: DESCRIBE FORMATTED parquet_partitioned POSTHOOK: type: DESCTABLE # col_name data_type comment -id int from deserializer -str string from deserializer +id int +str string # Partition Information # col_name data_type comment -part string None +part string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out index 5ebef1a..eaad9e4 100644 --- ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out +++ ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out @@ -22,12 +22,12 @@ POSTHOOK: query: describe formatted mytbl partition (c2='v1') POSTHOOK: type: DESCTABLE # col_name data_type comment -c1 tinyint None +c1 tinyint # Partition Information # col_name data_type comment -c2 string None +c2 string # Detailed Partition Information Partition Value: [v1] diff --git ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out index d533c8d..3ceb9d8 100644 --- ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out +++ ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out @@ -18,12 +18,12 @@ POSTHOOK: query: describe formatted mytbl partition (c2='v1') POSTHOOK: type: DESCTABLE # col_name data_type comment -c1 tinyint None +c1 tinyint # Partition Information # col_name data_type comment -c2 string None +c2 string # Detailed Partition Information Partition Value: [v1] diff --git ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out index 6892af0..5c5a977 100644 --- ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out +++ ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out @@ -22,12 +22,12 @@ POSTHOOK: query: describe formatted mytbl partition (c2='v1') POSTHOOK: type: DESCTABLE # col_name data_type comment -c1 tinyint None +c1 tinyint # Partition Information # col_name data_type comment -c2 string None +c2 string # Detailed Partition Information Partition Value: [v1] diff --git ql/src/test/results/clientpositive/partition_date2.q.out ql/src/test/results/clientpositive/partition_date2.q.out index e0f55f4..d0af967 100644 --- ql/src/test/results/clientpositive/partition_date2.q.out +++ ql/src/test/results/clientpositive/partition_date2.q.out @@ -379,16 +379,16 @@ POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).key SIMPL POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).key SIMPLE [] POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).value SIMPLE [] -key string None -value string None -dt date None -region int None +key string +value string +dt date +region int # Partition Information # col_name data_type comment -dt date None -region int None +dt date +region int #### A masked pattern was here #### PREHOOK: query: insert overwrite table partition_date2_1 partition(dt=date '1980-01-02', region=3) @@ -477,16 +477,16 @@ POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).key SIMPL POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).key SIMPLE [] POSTHOOK: Lineage: partition_date2_1 PARTITION(dt=2000-01-01,region=2).value SIMPLE [] -key string None -value string None -dt date None -region int None +key string +value string +dt date +region int # Partition Information # col_name data_type comment -dt date None -region int None +dt date +region int #### A masked pattern was here #### PREHOOK: query: -- alter table touch diff --git ql/src/test/results/clientpositive/partition_schema1.q.out ql/src/test/results/clientpositive/partition_schema1.q.out index aabedb8..03fad52 100644 --- ql/src/test/results/clientpositive/partition_schema1.q.out +++ ql/src/test/results/clientpositive/partition_schema1.q.out @@ -21,14 +21,14 @@ POSTHOOK: query: desc partition_schema1 partition(dt='100') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None +key string +value string +dt string # Partition Information # col_name data_type comment -dt string None +dt string PREHOOK: query: alter table partition_schema1 add columns (x string) PREHOOK: type: ALTERTABLE_ADDCOLS PREHOOK: Input: default@partition_schema1 @@ -45,26 +45,26 @@ POSTHOOK: query: desc partition_schema1 POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -x string None -dt string None +key string +value string +x string +dt string # Partition Information # col_name data_type comment -dt string None +dt string PREHOOK: query: desc partition_schema1 partition (dt='100') PREHOOK: type: DESCTABLE POSTHOOK: query: desc partition_schema1 partition (dt='100') POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).key SIMPLE [(src1)src1.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: partition_schema1 PARTITION(dt=100).value SIMPLE [(src1)src1.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None -dt string None +key string +value string +dt string # Partition Information # col_name data_type comment -dt string None +dt string diff --git ql/src/test/results/clientpositive/protectmode.q.out ql/src/test/results/clientpositive/protectmode.q.out index c31c6cf..c7c97ed 100644 --- ql/src/test/results/clientpositive/protectmode.q.out +++ ql/src/test/results/clientpositive/protectmode.q.out @@ -45,7 +45,7 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string None +col string #### A masked pattern was here #### PREHOOK: query: alter table tbl1 disable offline @@ -60,7 +60,7 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string None +col string #### A masked pattern was here #### PREHOOK: query: select * from tbl1 @@ -146,13 +146,13 @@ PREHOOK: query: desc extended tbl2 partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 partition (p='p1') POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### PREHOOK: query: alter table tbl2 enable offline @@ -167,13 +167,13 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### PREHOOK: query: alter table tbl2 enable no_drop @@ -188,13 +188,13 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### PREHOOK: query: alter table tbl2 drop partition (p='p3') @@ -217,13 +217,13 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### PREHOOK: query: alter table tbl2 disable no_drop @@ -238,13 +238,13 @@ PREHOOK: query: desc extended tbl2 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### PREHOOK: query: select * from tbl2 where p='p2' @@ -280,13 +280,13 @@ PREHOOK: query: desc extended tbl2 partition (p='p1') PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl2 partition (p='p1') POSTHOOK: type: DESCTABLE -col string None -p string None +col string +p string # Partition Information # col_name data_type comment -p string None +p string #### A masked pattern was here #### PREHOOK: query: select * from tbl2 where p='p1' diff --git ql/src/test/results/clientpositive/protectmode2.q.out ql/src/test/results/clientpositive/protectmode2.q.out index 83bcb9b..7ad6d0b 100644 --- ql/src/test/results/clientpositive/protectmode2.q.out +++ ql/src/test/results/clientpositive/protectmode2.q.out @@ -21,7 +21,7 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string None +col string #### A masked pattern was here #### PREHOOK: query: alter table tbl1 enable no_drop @@ -36,7 +36,7 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string None +col string #### A masked pattern was here #### PREHOOK: query: alter table tbl1 disable no_drop cascade @@ -51,7 +51,7 @@ PREHOOK: query: desc extended tbl1 PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tbl1 POSTHOOK: type: DESCTABLE -col string None +col string #### A masked pattern was here #### PREHOOK: query: alter table tbl1 disable no_drop @@ -116,12 +116,12 @@ POSTHOOK: query: desc formatted tbl2 POSTHOOK: type: DESCTABLE # col_name data_type comment -col string None +col string # Partition Information # col_name data_type comment -p string None +p string # Detailed Table Information Database: default @@ -158,12 +158,12 @@ POSTHOOK: query: desc formatted tbl2 POSTHOOK: type: DESCTABLE # col_name data_type comment -col string None +col string # Partition Information # col_name data_type comment -p string None +p string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/quotedid_basic.q.out ql/src/test/results/clientpositive/quotedid_basic.q.out index a33574c..7d0e628 100644 --- ql/src/test/results/clientpositive/quotedid_basic.q.out +++ ql/src/test/results/clientpositive/quotedid_basic.q.out @@ -11,9 +11,9 @@ PREHOOK: query: describe t1 PREHOOK: type: DESCTABLE POSTHOOK: query: describe t1 POSTHOOK: type: DESCTABLE -x+1 string None -y&y string None -!@#$%^&*()_q string None +x+1 string +y&y string +!@#$%^&*()_q string PREHOOK: query: select `x+1`, `y&y`, `!@#$%^&*()_q` from t1 PREHOOK: type: QUERY PREHOOK: Input: default@t1 @@ -314,8 +314,8 @@ PREHOOK: query: describe t4 PREHOOK: type: DESCTABLE POSTHOOK: query: describe t4 POSTHOOK: type: DESCTABLE -x+1` string None -y&y string None +x+1` string +y&y string PREHOOK: query: insert into table t4 select * from src PREHOOK: type: QUERY PREHOOK: Input: default@src diff --git ql/src/test/results/clientpositive/quotedid_tblproperty.q.out ql/src/test/results/clientpositive/quotedid_tblproperty.q.out index 153f148..2e5abe8 100644 --- ql/src/test/results/clientpositive/quotedid_tblproperty.q.out +++ ql/src/test/results/clientpositive/quotedid_tblproperty.q.out @@ -13,5 +13,5 @@ PREHOOK: query: describe xyz PREHOOK: type: DESCTABLE POSTHOOK: query: describe xyz POSTHOOK: type: DESCTABLE -valid_colname string from deserializer -invalid.colname string from deserializer +valid_colname string +invalid.colname string diff --git ql/src/test/results/clientpositive/rcfile_bigdata.q.out ql/src/test/results/clientpositive/rcfile_bigdata.q.out index 455f896..b573a8c 100644 --- ql/src/test/results/clientpositive/rcfile_bigdata.q.out +++ ql/src/test/results/clientpositive/rcfile_bigdata.q.out @@ -33,8 +33,8 @@ POSTHOOK: query: describe columnTable_Bigdata POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: columntable_bigdata.key SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: columntable_bigdata.value SCRIPT [(src)src.FieldSchema(name:key, type:string, comment:default), (src)src.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None +key string +value string PREHOOK: query: select count(columnTable_Bigdata.key) from columnTable_Bigdata PREHOOK: type: QUERY PREHOOK: Input: default@columntable_bigdata diff --git ql/src/test/results/clientpositive/rcfile_columnar.q.out ql/src/test/results/clientpositive/rcfile_columnar.q.out index 50ee6d7..6c52bb0 100644 --- ql/src/test/results/clientpositive/rcfile_columnar.q.out +++ ql/src/test/results/clientpositive/rcfile_columnar.q.out @@ -33,8 +33,8 @@ POSTHOOK: query: describe columnTable POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: columntable.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: columntable.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None +key string +value string PREHOOK: query: SELECT columnTable.* FROM columnTable ORDER BY key ASC, value ASC PREHOOK: type: QUERY PREHOOK: Input: default@columntable diff --git ql/src/test/results/clientpositive/rcfile_default_format.q.out ql/src/test/results/clientpositive/rcfile_default_format.q.out index 33bf57c..3f6b6a3 100644 --- ql/src/test/results/clientpositive/rcfile_default_format.q.out +++ ql/src/test/results/clientpositive/rcfile_default_format.q.out @@ -11,7 +11,7 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_format POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None +key string # Detailed Table Information Database: default @@ -46,8 +46,8 @@ POSTHOOK: query: DESCRIBE FORMATTED rcfile_default_format_ctas POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -97,7 +97,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None +key string # Detailed Table Information Database: default @@ -139,8 +139,8 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -182,8 +182,8 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string from deserializer -value string from deserializer +key string +value string # Detailed Table Information Database: default @@ -225,7 +225,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string from deserializer +key string # Detailed Table Information Database: default @@ -262,8 +262,8 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string from deserializer -value string from deserializer +key string +value string # Detailed Table Information Database: default @@ -305,7 +305,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: rcfile_default_format_txtfile.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] # col_name data_type comment -key string from deserializer +key string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/rename_column.q.out ql/src/test/results/clientpositive/rename_column.q.out index 4de0724..1f00db8 100644 --- ql/src/test/results/clientpositive/rename_column.q.out +++ ql/src/test/results/clientpositive/rename_column.q.out @@ -9,9 +9,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a int None -b int None -c int None +a int +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a STRING PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -24,9 +24,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a string None -b int None -c int None +a string +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -39,9 +39,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a1 int None -b int None -c int None +a1 int +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -54,9 +54,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a2 int None -b int None -c int None +a2 int +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -69,9 +69,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int None -a int None -c int None +b int +a int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT COMMENT 'test comment1' PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -84,9 +84,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int None +b int a1 int test comment1 -c int None +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT COMMENT 'test comment2' FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -100,8 +100,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE a2 int test comment2 -b int None -c int None +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@kv_rename_test @@ -114,9 +114,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int None +b int a int test comment2 -c int None +c int PREHOOK: query: DROP TABLE kv_rename_test PREHOOK: type: DROPTABLE PREHOOK: Input: default@kv_rename_test @@ -159,9 +159,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a int None -b int None -c int None +a int +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a STRING PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -174,9 +174,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a string None -b int None -c int None +a string +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -189,9 +189,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a1 int None -b int None -c int None +a1 int +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -204,9 +204,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -a2 int None -b int None -c int None +a2 int +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -219,9 +219,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int None -a int None -c int None +b int +a int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a a1 INT COMMENT 'test comment1' PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -234,9 +234,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int None +b int a1 int test comment1 -c int None +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE a1 a2 INT COMMENT 'test comment2' FIRST PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -250,8 +250,8 @@ PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE a2 int test comment2 -b int None -c int None +b int +c int PREHOOK: query: ALTER TABLE kv_rename_test CHANGE COLUMN a2 a INT AFTER b PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: kv_rename_test_db@kv_rename_test @@ -264,9 +264,9 @@ PREHOOK: query: DESCRIBE kv_rename_test PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE kv_rename_test POSTHOOK: type: DESCTABLE -b int None +b int a int test comment2 -c int None +c int PREHOOK: query: DROP TABLE kv_rename_test PREHOOK: type: DROPTABLE PREHOOK: Input: kv_rename_test_db@kv_rename_test diff --git ql/src/test/results/clientpositive/serde_reported_schema.q.out ql/src/test/results/clientpositive/serde_reported_schema.q.out index d8a479f..db5ce6a 100644 --- ql/src/test/results/clientpositive/serde_reported_schema.q.out +++ ql/src/test/results/clientpositive/serde_reported_schema.q.out @@ -22,12 +22,12 @@ POSTHOOK: type: DESCTABLE myint int from deserializer mystring string from deserializer underscore_int int from deserializer -b string None +b string # Partition Information # col_name data_type comment -b string None +b string #### A masked pattern was here #### PREHOOK: query: alter table int_string add partition (b='part1') @@ -44,11 +44,11 @@ POSTHOOK: type: DESCTABLE myint int from deserializer mystring string from deserializer underscore_int int from deserializer -b string None +b string # Partition Information # col_name data_type comment -b string None +b string #### A masked pattern was here #### diff --git ql/src/test/results/clientpositive/stats0.q.out ql/src/test/results/clientpositive/stats0.q.out index d951153..f4aaf98 100644 Binary files ql/src/test/results/clientpositive/stats0.q.out and ql/src/test/results/clientpositive/stats0.q.out differ diff --git ql/src/test/results/clientpositive/stats1.q.out ql/src/test/results/clientpositive/stats1.q.out index 99b0e60..90c5ad1 100644 --- ql/src/test/results/clientpositive/stats1.q.out +++ ql/src/test/results/clientpositive/stats1.q.out @@ -177,8 +177,8 @@ POSTHOOK: Lineage: tmptable.key EXPRESSION [(src1)s2.FieldSchema(name:key, type: POSTHOOK: Lineage: tmptable.value EXPRESSION [(src)s1.null, (src1)s2.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -229,8 +229,8 @@ POSTHOOK: Lineage: tmptable.key EXPRESSION [(src1)s2.FieldSchema(name:key, type: POSTHOOK: Lineage: tmptable.value EXPRESSION [(src)s1.null, (src1)s2.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats10.q.out ql/src/test/results/clientpositive/stats10.q.out index e23f8ca..dda7a3f 100644 --- ql/src/test/results/clientpositive/stats10.q.out +++ ql/src/test/results/clientpositive/stats10.q.out @@ -429,13 +429,13 @@ POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchem POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [1] @@ -474,13 +474,13 @@ POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchem POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2] @@ -519,13 +519,13 @@ POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).key EXPRESSION [(src)src.FieldSchem POSTHOOK: Lineage: bucket3_1 PARTITION(ds=2).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats11.q.out ql/src/test/results/clientpositive/stats11.q.out index c3158a7..b5e75c0 100644 --- ql/src/test/results/clientpositive/stats11.q.out +++ ql/src/test/results/clientpositive/stats11.q.out @@ -69,13 +69,13 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08' POSTHOOK: type: DESCTABLE # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2008-04-08] @@ -116,13 +116,13 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08' POSTHOOK: type: DESCTABLE # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2008-04-08] @@ -163,13 +163,13 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08' POSTHOOK: type: DESCTABLE # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2008-04-08] @@ -210,13 +210,13 @@ POSTHOOK: query: desc formatted srcbucket_mapjoin_part partition(ds='2008-04-08' POSTHOOK: type: DESCTABLE # col_name data_type comment -key int None -value string None +key int +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2008-04-08] @@ -405,6 +405,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -434,6 +435,7 @@ STAGE PLANS: bucket_count 4 bucket_field_name key columns key,value + columns.comments columns.types int:string #### A masked pattern was here #### name default.srcbucket_mapjoin_part @@ -454,6 +456,7 @@ STAGE PLANS: bucket_count 4 bucket_field_name key columns key,value + columns.comments columns.types int:string #### A masked pattern was here #### name default.srcbucket_mapjoin_part @@ -491,6 +494,7 @@ STAGE PLANS: bucket_count 2 bucket_field_name key columns key,value + columns.comments columns.types int:string #### A masked pattern was here #### name default.srcbucket_mapjoin @@ -511,6 +515,7 @@ STAGE PLANS: bucket_count 2 bucket_field_name key columns key,value + columns.comments columns.types int:string #### A masked pattern was here #### name default.srcbucket_mapjoin @@ -548,6 +553,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -578,6 +584,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -601,6 +608,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -615,6 +623,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -644,6 +653,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -667,6 +677,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -681,6 +692,7 @@ STAGE PLANS: properties: bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -973,6 +985,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -1023,6 +1036,7 @@ STAGE PLANS: bucket_count 4 bucket_field_name key columns key,value + columns.comments columns.types int:string #### A masked pattern was here #### name default.srcbucket_mapjoin_part @@ -1043,6 +1057,7 @@ STAGE PLANS: bucket_count 4 bucket_field_name key columns key,value + columns.comments columns.types int:string #### A masked pattern was here #### name default.srcbucket_mapjoin_part @@ -1078,6 +1093,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -1113,6 +1129,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -1141,6 +1158,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -1160,6 +1178,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -1194,6 +1213,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -1222,6 +1242,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result @@ -1241,6 +1262,7 @@ STAGE PLANS: COLUMN_STATS_ACCURATE true bucket_count -1 columns key,value1,value2 + columns.comments columns.types string:string:string #### A masked pattern was here #### name default.bucketmapjoin_tmp_result diff --git ql/src/test/results/clientpositive/stats12.q.out ql/src/test/results/clientpositive/stats12.q.out index 4e0c060..eb34ce6 100644 Binary files ql/src/test/results/clientpositive/stats12.q.out and ql/src/test/results/clientpositive/stats12.q.out differ diff --git ql/src/test/results/clientpositive/stats13.q.out ql/src/test/results/clientpositive/stats13.q.out index b30c543..2d407a8 100644 Binary files ql/src/test/results/clientpositive/stats13.q.out and ql/src/test/results/clientpositive/stats13.q.out differ diff --git ql/src/test/results/clientpositive/stats14.q.out ql/src/test/results/clientpositive/stats14.q.out index f05b8ff..0136d79 100644 --- ql/src/test/results/clientpositive/stats14.q.out +++ ql/src/test/results/clientpositive/stats14.q.out @@ -168,8 +168,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -211,8 +211,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 11] @@ -259,8 +259,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 12] @@ -335,8 +335,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats15.q.out ql/src/test/results/clientpositive/stats15.q.out index f05b8ff..0136d79 100644 --- ql/src/test/results/clientpositive/stats15.q.out +++ ql/src/test/results/clientpositive/stats15.q.out @@ -168,8 +168,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -211,8 +211,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 11] @@ -259,8 +259,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 12] @@ -335,8 +335,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats16.q.out ql/src/test/results/clientpositive/stats16.q.out index 84d564c..41ecb4f 100644 --- ql/src/test/results/clientpositive/stats16.q.out +++ ql/src/test/results/clientpositive/stats16.q.out @@ -15,8 +15,8 @@ POSTHOOK: query: desc formatted stats16 POSTHOOK: type: DESCTABLE # col_name data_type comment -key int None -value string None +key int +value string # Detailed Table Information Database: default @@ -66,8 +66,8 @@ POSTHOOK: Lineage: stats16.key EXPRESSION [(src)src.FieldSchema(name:key, type:s POSTHOOK: Lineage: stats16.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key int None -value string None +key int +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats18.q.out ql/src/test/results/clientpositive/stats18.q.out index a6eece4..55c366f 100644 --- ql/src/test/results/clientpositive/stats18.q.out +++ ql/src/test/results/clientpositive/stats18.q.out @@ -35,8 +35,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] @@ -87,8 +87,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] diff --git ql/src/test/results/clientpositive/stats19.q.out ql/src/test/results/clientpositive/stats19.q.out index bcc639a..d607183 100644 --- ql/src/test/results/clientpositive/stats19.q.out +++ ql/src/test/results/clientpositive/stats19.q.out @@ -107,8 +107,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] @@ -177,8 +177,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] @@ -251,8 +251,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] @@ -435,8 +435,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] @@ -529,8 +529,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] @@ -627,8 +627,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2010-04-08, 13] diff --git ql/src/test/results/clientpositive/stats2.q.out ql/src/test/results/clientpositive/stats2.q.out index 7e157ea..e0788f7 100644 --- ql/src/test/results/clientpositive/stats2.q.out +++ ql/src/test/results/clientpositive/stats2.q.out @@ -95,8 +95,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -197,8 +197,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats20.q.out ql/src/test/results/clientpositive/stats20.q.out index 30db4a9..407a8ab 100644 --- ql/src/test/results/clientpositive/stats20.q.out +++ ql/src/test/results/clientpositive/stats20.q.out @@ -27,13 +27,13 @@ POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldS POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default @@ -81,13 +81,13 @@ POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).key SIMPLE [(src)src.FieldS POSTHOOK: Lineage: stats_partitioned PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats3.q.out ql/src/test/results/clientpositive/stats3.q.out index d8a087b..26eb08c 100644 --- ql/src/test/results/clientpositive/stats3.q.out +++ ql/src/test/results/clientpositive/stats3.q.out @@ -46,6 +46,7 @@ STAGE PLANS: properties: bucket_count -1 columns col1 + columns.comments columns.types string #### A masked pattern was here #### name default.hive_test_src @@ -73,7 +74,7 @@ POSTHOOK: query: desc formatted hive_test_src POSTHOOK: type: DESCTABLE # col_name data_type comment -col1 string None +col1 string # Detailed Table Information Database: default @@ -224,13 +225,13 @@ POSTHOOK: Lineage: hive_test_dst PARTITION(pcol1=test_part,pcol2=test_Part).col1 POSTHOOK: Lineage: hive_test_dst PARTITION(pcol1=test_part,pcol2=test_Part).col1 SIMPLE [(hive_test_src)hive_test_src.FieldSchema(name:col1, type:string, comment:null), ] # col_name data_type comment -col1 string None +col1 string # Partition Information # col_name data_type comment -pcol1 string None -pcol2 string None +pcol1 string +pcol2 string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats4.q.out ql/src/test/results/clientpositive/stats4.q.out index a91ce77..6abe18a 100644 --- ql/src/test/results/clientpositive/stats4.q.out +++ ql/src/test/results/clientpositive/stats4.q.out @@ -2323,8 +2323,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -2371,8 +2371,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -2419,8 +2419,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-12-31, 11] @@ -2467,8 +2467,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-12-31, 12] @@ -2515,8 +2515,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -2558,8 +2558,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats5.q.out ql/src/test/results/clientpositive/stats5.q.out index 14de4f8..ae754bd 100644 --- ql/src/test/results/clientpositive/stats5.q.out +++ ql/src/test/results/clientpositive/stats5.q.out @@ -38,8 +38,8 @@ POSTHOOK: query: describe formatted analyze_src POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats6.q.out ql/src/test/results/clientpositive/stats6.q.out index 74f71ad..70f016f 100644 --- ql/src/test/results/clientpositive/stats6.q.out +++ ql/src/test/results/clientpositive/stats6.q.out @@ -92,8 +92,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -140,8 +140,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -188,8 +188,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 11] @@ -236,8 +236,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 12] @@ -284,8 +284,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats7.q.out ql/src/test/results/clientpositive/stats7.q.out index 0fbe98f..b0f4a62 100644 --- ql/src/test/results/clientpositive/stats7.q.out +++ ql/src/test/results/clientpositive/stats7.q.out @@ -103,8 +103,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -151,8 +151,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -199,8 +199,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats8.q.out ql/src/test/results/clientpositive/stats8.q.out index 1bd9427..392f654 100644 --- ql/src/test/results/clientpositive/stats8.q.out +++ ql/src/test/results/clientpositive/stats8.q.out @@ -99,8 +99,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -147,8 +147,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -237,8 +237,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -332,8 +332,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 11] @@ -427,8 +427,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 12] @@ -534,8 +534,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -582,8 +582,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -630,8 +630,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 11] @@ -678,8 +678,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 12] @@ -726,8 +726,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats9.q.out ql/src/test/results/clientpositive/stats9.q.out index 404d588..17411b1 100644 --- ql/src/test/results/clientpositive/stats9.q.out +++ ql/src/test/results/clientpositive/stats9.q.out @@ -54,8 +54,8 @@ POSTHOOK: Lineage: analyze_srcbucket.key SIMPLE [(srcbucket)srcbucket.FieldSchem POSTHOOK: Lineage: analyze_srcbucket.value SIMPLE [(srcbucket)srcbucket.FieldSchema(name:value, type:string, comment:null), ] # col_name data_type comment -key int None -value string None +key int +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats_counter.q.out ql/src/test/results/clientpositive/stats_counter.q.out index 40d8656..1fc8ecb 100644 --- ql/src/test/results/clientpositive/stats_counter.q.out +++ ql/src/test/results/clientpositive/stats_counter.q.out @@ -21,8 +21,8 @@ POSTHOOK: query: desc formatted dummy1 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -64,8 +64,8 @@ POSTHOOK: query: desc formatted dummy2 POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats_counter_partitioned.q.out ql/src/test/results/clientpositive/stats_counter_partitioned.q.out index b41b357..fb91636 100644 --- ql/src/test/results/clientpositive/stats_counter_partitioned.q.out +++ ql/src/test/results/clientpositive/stats_counter_partitioned.q.out @@ -49,14 +49,14 @@ POSTHOOK: query: describe formatted dummy partition (ds='2008', hr='11') POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008, 11] @@ -89,14 +89,14 @@ POSTHOOK: query: describe formatted dummy partition (ds='2008', hr='12') POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008, 12] @@ -174,14 +174,14 @@ POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [10, 11] @@ -218,14 +218,14 @@ POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).key SIMPLE [(src)src.FieldSchema POSTHOOK: Lineage: dummy PARTITION(ds=10,hr=12).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [10, 12] @@ -335,12 +335,12 @@ POSTHOOK: Lineage: dummy PARTITION(hr=1997).key SIMPLE [(tbl)tbl.FieldSchema(nam POSTHOOK: Lineage: dummy PARTITION(hr=1998).key SIMPLE [(tbl)tbl.FieldSchema(name:key, type:int, comment:null), ] # col_name data_type comment -key int None +key int # Partition Information # col_name data_type comment -hr int None +hr int # Detailed Partition Information Partition Value: [1997] @@ -381,12 +381,12 @@ POSTHOOK: Lineage: dummy PARTITION(hr=1997).key SIMPLE [(tbl)tbl.FieldSchema(nam POSTHOOK: Lineage: dummy PARTITION(hr=1998).key SIMPLE [(tbl)tbl.FieldSchema(name:key, type:int, comment:null), ] # col_name data_type comment -key int None +key int # Partition Information # col_name data_type comment -hr int None +hr int # Detailed Partition Information Partition Value: [1994] @@ -427,12 +427,12 @@ POSTHOOK: Lineage: dummy PARTITION(hr=1997).key SIMPLE [(tbl)tbl.FieldSchema(nam POSTHOOK: Lineage: dummy PARTITION(hr=1998).key SIMPLE [(tbl)tbl.FieldSchema(name:key, type:int, comment:null), ] # col_name data_type comment -key int None +key int # Partition Information # col_name data_type comment -hr int None +hr int # Detailed Partition Information Partition Value: [1998] @@ -473,12 +473,12 @@ POSTHOOK: Lineage: dummy PARTITION(hr=1997).key SIMPLE [(tbl)tbl.FieldSchema(nam POSTHOOK: Lineage: dummy PARTITION(hr=1998).key SIMPLE [(tbl)tbl.FieldSchema(name:key, type:int, comment:null), ] # col_name data_type comment -key int None +key int # Partition Information # col_name data_type comment -hr int None +hr int # Detailed Partition Information Partition Value: [1996] diff --git ql/src/test/results/clientpositive/stats_empty_partition.q.out ql/src/test/results/clientpositive/stats_empty_partition.q.out index 6987f64..92eb35c 100644 --- ql/src/test/results/clientpositive/stats_empty_partition.q.out +++ ql/src/test/results/clientpositive/stats_empty_partition.q.out @@ -29,13 +29,13 @@ POSTHOOK: Lineage: tmptable PARTITION(part=1).key SIMPLE [(src)src.FieldSchema(n POSTHOOK: Lineage: tmptable PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/stats_invalidation.q.out ql/src/test/results/clientpositive/stats_invalidation.q.out index a9e5e7b..5754518 100644 --- ql/src/test/results/clientpositive/stats_invalidation.q.out +++ ql/src/test/results/clientpositive/stats_invalidation.q.out @@ -35,8 +35,8 @@ POSTHOOK: Lineage: stats_invalid.key SIMPLE [(src)src.FieldSchema(name:key, type POSTHOOK: Lineage: stats_invalid.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -81,9 +81,9 @@ POSTHOOK: Lineage: stats_invalid.key SIMPLE [(src)src.FieldSchema(name:key, type POSTHOOK: Lineage: stats_invalid.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None -new_col string None +key string +value string +new_col string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/stats_list_bucket.q.out ql/src/test/results/clientpositive/stats_list_bucket.q.out index 6a319a0..7573f52 100644 --- ql/src/test/results/clientpositive/stats_list_bucket.q.out +++ ql/src/test/results/clientpositive/stats_list_bucket.q.out @@ -18,6 +18,7 @@ skewed by (c1, c2) on (('466','val_466'),('287','val_287'),('82','val_82')) stored as directories stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table stats_list_bucket ( c1 string, c2 string @@ -26,6 +27,7 @@ skewed by (c1, c2) on (('466','val_466'),('287','val_287'),('82','val_82')) stored as directories stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_list_bucket PREHOOK: query: -- Make sure we use hashed IDs during stats publishing. -- Try partitioned table with list bucketing. @@ -55,14 +57,14 @@ POSTHOOK: Lineage: stats_list_bucket PARTITION(ds=2008-04-08,hr=11).c1 SIMPLE [( POSTHOOK: Lineage: stats_list_bucket PARTITION(ds=2008-04-08,hr=11).c2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -c1 string None -c2 string None +c1 string +c2 string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -72,6 +74,7 @@ Table: stats_list_bucket Protect Mode: None #### A masked pattern was here #### Partition Parameters: + COLUMN_STATS_ACCURATE true numFiles 4 numRows 500 rawDataSize 4812 @@ -104,6 +107,7 @@ skewed by (c1, c2) on (('466','val_466'),('287','val_287'),('82','val_82')) stored as directories stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- Also try non-partitioned table with list bucketing. -- Stats should show the same number of rows. @@ -115,6 +119,7 @@ skewed by (c1, c2) on (('466','val_466'),('287','val_287'),('82','val_82')) stored as directories stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@stats_list_bucket_1 POSTHOOK: Lineage: stats_list_bucket PARTITION(ds=2008-04-08,hr=11).c1 SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: stats_list_bucket PARTITION(ds=2008-04-08,hr=11).c2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] @@ -142,8 +147,8 @@ POSTHOOK: Lineage: stats_list_bucket_1.c1 SIMPLE [(src)src.FieldSchema(name:key, POSTHOOK: Lineage: stats_list_bucket_1.c2 SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -c1 string None -c2 string None +c1 string +c2 string # Detailed Table Information Database: default @@ -153,11 +158,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE true numFiles 4 - numPartitions 0 numRows 500 rawDataSize 4812 - totalSize 5522 + totalSize 408 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/stats_noscan_1.q.out ql/src/test/results/clientpositive/stats_noscan_1.q.out index 990acec..5178993 100644 --- ql/src/test/results/clientpositive/stats_noscan_1.q.out +++ ql/src/test/results/clientpositive/stats_noscan_1.q.out @@ -121,8 +121,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -169,8 +169,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -217,8 +217,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 11] @@ -265,8 +265,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 12] @@ -313,8 +313,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Table Information Database: default @@ -495,8 +495,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -551,8 +551,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 12] @@ -607,8 +607,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 11] @@ -663,8 +663,8 @@ value string default # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 12] diff --git ql/src/test/results/clientpositive/stats_noscan_2.q.out ql/src/test/results/clientpositive/stats_noscan_2.q.out index afbc69c..2a8de2d 100644 --- ql/src/test/results/clientpositive/stats_noscan_2.q.out +++ ql/src/test/results/clientpositive/stats_noscan_2.q.out @@ -39,7 +39,7 @@ POSTHOOK: query: describe formatted anaylyze_external POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None +a int # Detailed Table Information Database: default @@ -81,7 +81,7 @@ POSTHOOK: query: describe formatted anaylyze_external POSTHOOK: type: DESCTABLE # col_name data_type comment -a int None +a int # Detailed Table Information Database: default @@ -221,13 +221,13 @@ POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).key SIMPLE [(src)s POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).val SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -val string None +key string +val string # Partition Information # col_name data_type comment -insertdate string None +insertdate string # Detailed Partition Information Partition Value: [2008-01-01] @@ -276,13 +276,13 @@ POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).key SIMPLE [(src)s POSTHOOK: Lineage: texternal PARTITION(insertdate=2008-01-01).val SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -val string None +key string +val string # Partition Information # col_name data_type comment -insertdate string None +insertdate string # Detailed Partition Information Partition Value: [2008-01-01] diff --git ql/src/test/results/clientpositive/stats_only_null.q.out ql/src/test/results/clientpositive/stats_only_null.q.out index 5400023..2413058 100644 --- ql/src/test/results/clientpositive/stats_only_null.q.out +++ ql/src/test/results/clientpositive/stats_only_null.q.out @@ -285,15 +285,15 @@ POSTHOOK: Lineage: stats_null_part PARTITION(dt=2011).c SIMPLE [(temps_null)temp POSTHOOK: Lineage: stats_null_part PARTITION(dt=2011).d SIMPLE [(temps_null)temps_null.FieldSchema(name:d, type:smallint, comment:null), ] # col_name data_type comment -a double None -b int None -c string None -d smallint None +a double +b int +c string +d smallint # Partition Information # col_name data_type comment -dt string None +dt string # Detailed Partition Information Partition Value: [2010] @@ -338,15 +338,15 @@ POSTHOOK: Lineage: stats_null_part PARTITION(dt=2011).c SIMPLE [(temps_null)temp POSTHOOK: Lineage: stats_null_part PARTITION(dt=2011).d SIMPLE [(temps_null)temps_null.FieldSchema(name:d, type:smallint, comment:null), ] # col_name data_type comment -a double None -b int None -c string None -d smallint None +a double +b int +c string +d smallint # Partition Information # col_name data_type comment -dt string None +dt string # Detailed Partition Information Partition Value: [2011] diff --git ql/src/test/results/clientpositive/stats_partscan_1.q.out ql/src/test/results/clientpositive/stats_partscan_1.q.out index 7cc6e97..03cc6f6 100644 --- ql/src/test/results/clientpositive/stats_partscan_1.q.out +++ ql/src/test/results/clientpositive/stats_partscan_1.q.out @@ -66,14 +66,14 @@ POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).k POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -163,14 +163,14 @@ POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).k POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -211,14 +211,14 @@ POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).k POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 11] diff --git ql/src/test/results/clientpositive/stats_partscan_1_23.q.out ql/src/test/results/clientpositive/stats_partscan_1_23.q.out index beebfad..23ba474 100644 --- ql/src/test/results/clientpositive/stats_partscan_1_23.q.out +++ ql/src/test/results/clientpositive/stats_partscan_1_23.q.out @@ -10,6 +10,7 @@ CREATE table analyze_srcpart_partial_scan (key STRING, value STRING) partitioned by (ds string, hr string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- INCLUDE_HADOOP_MAJOR_VERSIONS(0.23) -- This test uses mapred.max.split.size/mapred.max.split.size for controlling -- number of input splits. @@ -22,6 +23,7 @@ CREATE table analyze_srcpart_partial_scan (key STRING, value STRING) partitioned by (ds string, hr string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@analyze_srcpart_partial_scan PREHOOK: query: insert overwrite table analyze_srcpart_partial_scan partition (ds, hr) select * from srcpart where ds is not null PREHOOK: type: QUERY @@ -64,14 +66,14 @@ POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).k POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -81,6 +83,11 @@ Table: analyze_srcpart_partial_scan Protect Mode: None #### A masked pattern was here #### Partition Parameters: + COLUMN_STATS_ACCURATE false + numFiles 22 + numRows -1 + rawDataSize -1 + totalSize 6954 #### A masked pattern was here #### # Storage Information @@ -156,14 +163,14 @@ POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).k POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -173,6 +180,7 @@ Table: analyze_srcpart_partial_scan Protect Mode: None #### A masked pattern was here #### Partition Parameters: + COLUMN_STATS_ACCURATE true numFiles 22 numRows 500 rawDataSize 4812 @@ -203,14 +211,14 @@ POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).k POSTHOOK: Lineage: analyze_srcpart_partial_scan PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 11] @@ -220,6 +228,11 @@ Table: analyze_srcpart_partial_scan Protect Mode: None #### A masked pattern was here #### Partition Parameters: + COLUMN_STATS_ACCURATE false + numFiles 22 + numRows -1 + rawDataSize -1 + totalSize 6954 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/statsfs.q.out ql/src/test/results/clientpositive/statsfs.q.out index ed2192f..08a853e 100644 --- ql/src/test/results/clientpositive/statsfs.q.out +++ ql/src/test/results/clientpositive/statsfs.q.out @@ -49,13 +49,13 @@ POSTHOOK: query: describe formatted t1 partition (ds='2010') POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2010] @@ -88,13 +88,13 @@ POSTHOOK: query: describe formatted t1 partition (ds='2011') POSTHOOK: type: DESCTABLE # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2011] @@ -172,13 +172,13 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2011).key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: t1 PARTITION(ds=2011).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2010] @@ -215,13 +215,13 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2011).key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: t1 PARTITION(ds=2011).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Partition Information Partition Value: [2011] @@ -309,8 +309,8 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2011).key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: t1 PARTITION(ds=2011).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -390,8 +390,8 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2011).key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: t1 PARTITION(ds=2011).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -504,14 +504,14 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2011).key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: t1 PARTITION(ds=2011).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-08, 11] @@ -558,14 +558,14 @@ POSTHOOK: Lineage: t1 PARTITION(ds=2011).key SIMPLE [(src)src.FieldSchema(name:k POSTHOOK: Lineage: t1 PARTITION(ds=2011).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string # Detailed Partition Information Partition Value: [2008-04-09, 12] diff --git ql/src/test/results/clientpositive/tablename_with_select.q.out ql/src/test/results/clientpositive/tablename_with_select.q.out index 81d696a..b5ff0b4 100644 --- ql/src/test/results/clientpositive/tablename_with_select.q.out +++ ql/src/test/results/clientpositive/tablename_with_select.q.out @@ -9,8 +9,8 @@ PREHOOK: query: DESCRIBE tmp_select PREHOOK: type: DESCTABLE POSTHOOK: query: DESCRIBE tmp_select POSTHOOK: type: DESCTABLE -a int None -b string None +a int +b string PREHOOK: query: INSERT OVERWRITE TABLE tmp_select SELECT key, value FROM src PREHOOK: type: QUERY PREHOOK: Input: default@src diff --git ql/src/test/results/clientpositive/truncate_column.q.out ql/src/test/results/clientpositive/truncate_column.q.out index a352aa0..88b2b49 100644 --- ql/src/test/results/clientpositive/truncate_column.q.out +++ ql/src/test/results/clientpositive/truncate_column.q.out @@ -29,8 +29,8 @@ POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:stri POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -97,8 +97,8 @@ POSTHOOK: Lineage: test_tab.key SIMPLE [(src)src.FieldSchema(name:key, type:stri POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -183,8 +183,8 @@ POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type: POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -259,8 +259,8 @@ POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type: POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Detailed Table Information Database: default @@ -351,8 +351,8 @@ POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type: POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string from deserializer -value string from deserializer +key string +value string # Detailed Table Information Database: default @@ -432,8 +432,8 @@ POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type: POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string from deserializer -value string from deserializer +key string +value string # Detailed Table Information Database: default @@ -515,8 +515,8 @@ POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type: POSTHOOK: Lineage: test_tab.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string from deserializer -value string from deserializer +key string +value string # Detailed Table Information Database: default @@ -615,13 +615,13 @@ POSTHOOK: Lineage: test_tab_part PARTITION(part=1).key SIMPLE [(src)src.FieldSch POSTHOOK: Lineage: test_tab_part PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] @@ -706,13 +706,13 @@ POSTHOOK: Lineage: test_tab_part PARTITION(part=1).key SIMPLE [(src)src.FieldSch POSTHOOK: Lineage: test_tab_part PARTITION(part=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] # col_name data_type comment -key string None -value string None +key string +value string # Partition Information # col_name data_type comment -part string None +part string # Detailed Partition Information Partition Value: [1] diff --git ql/src/test/results/clientpositive/unicode_notation.q.out ql/src/test/results/clientpositive/unicode_notation.q.out index b650fa1..221e255 100644 --- ql/src/test/results/clientpositive/unicode_notation.q.out +++ ql/src/test/results/clientpositive/unicode_notation.q.out @@ -15,7 +15,7 @@ POSTHOOK: query: desc formatted k1 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None +a string # Detailed Table Information Database: default @@ -59,7 +59,7 @@ POSTHOOK: query: desc formatted k1 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None +a string # Detailed Table Information Database: default @@ -103,7 +103,7 @@ POSTHOOK: query: desc formatted k1 POSTHOOK: type: DESCTABLE # col_name data_type comment -a string None +a string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/union_remove_1.q.out ql/src/test/results/clientpositive/union_remove_1.q.out index 74d20bc..02ac7e7 100644 --- ql/src/test/results/clientpositive/union_remove_1.q.out +++ ql/src/test/results/clientpositive/union_remove_1.q.out @@ -10,6 +10,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- There is no need to write the temporary results of the sub-queries, and then read them @@ -22,17 +23,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -182,8 +188,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -193,6 +199,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_10.q.out ql/src/test/results/clientpositive/union_remove_10.q.out index 76cc5fc..9a7613b 100644 --- ql/src/test/results/clientpositive/union_remove_10.q.out +++ ql/src/test/results/clientpositive/union_remove_10.q.out @@ -14,6 +14,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 subqueries is performed (one of which is a map-only query, and the -- other one contains a nested union where one of the sub-queries requires a map-reduce @@ -30,17 +31,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -248,8 +254,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -259,6 +265,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 340 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_11.q.out ql/src/test/results/clientpositive/union_remove_11.q.out index 68efb49..b43dca1 100644 --- ql/src/test/results/clientpositive/union_remove_11.q.out +++ ql/src/test/results/clientpositive/union_remove_11.q.out @@ -14,6 +14,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 subqueries is performed (one of which is a map-only query, and the -- other one contains a nested union where also contains map only sub-queries), @@ -30,17 +31,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -226,8 +232,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -237,6 +243,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 1 + numRows -1 + rawDataSize -1 + totalSize 115 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_12.q.out ql/src/test/results/clientpositive/union_remove_12.q.out index d2dd47c..64becc9 100644 --- ql/src/test/results/clientpositive/union_remove_12.q.out +++ ql/src/test/results/clientpositive/union_remove_12.q.out @@ -13,6 +13,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 subqueries is performed (one of which is a map-only query, and the -- other one is a map-join query), followed by select star and a file sink. @@ -28,17 +29,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -194,8 +200,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)a.FieldSchema(name:key, POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)b.FieldSchema(name:val, type:string, comment:null), ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -205,6 +211,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_13.q.out ql/src/test/results/clientpositive/union_remove_13.q.out index fa0849c..bef7e96 100644 --- ql/src/test/results/clientpositive/union_remove_13.q.out +++ ql/src/test/results/clientpositive/union_remove_13.q.out @@ -13,6 +13,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 subqueries is performed (one of which is a mapred query, and the -- other one is a map-join query), followed by select star and a file sink. @@ -28,17 +29,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -217,8 +223,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)a.FieldSchema(name:key, POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)b.FieldSchema(name:val, type:string, comment:null), (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -228,6 +234,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_14.q.out ql/src/test/results/clientpositive/union_remove_14.q.out index f837dea..88b844f 100644 --- ql/src/test/results/clientpositive/union_remove_14.q.out +++ ql/src/test/results/clientpositive/union_remove_14.q.out @@ -14,6 +14,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 subqueries is performed (one of which is a map-only query, and the -- other one contains a join, which should be performed as a map-join query at runtime), @@ -30,17 +31,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -196,8 +202,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)a.FieldSchema(name:key, POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)b.FieldSchema(name:val, type:string, comment:null), ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -207,6 +213,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_15.q.out ql/src/test/results/clientpositive/union_remove_15.q.out index d439ec7..051b49d 100644 --- ql/src/test/results/clientpositive/union_remove_15.q.out +++ ql/src/test/results/clientpositive/union_remove_15.q.out @@ -13,6 +13,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- and the results are written to a table using dynamic partitions. @@ -28,17 +29,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 partition (ds) @@ -195,13 +201,13 @@ POSTHOOK: Lineage: outputtbl1 PARTITION(ds=2).key EXPRESSION [(inputtbl1)inputtb POSTHOOK: Lineage: outputtbl1 PARTITION(ds=2).values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/union_remove_16.q.out ql/src/test/results/clientpositive/union_remove_16.q.out index eeba6a3..13547dc 100644 --- ql/src/test/results/clientpositive/union_remove_16.q.out +++ ql/src/test/results/clientpositive/union_remove_16.q.out @@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- and the results are written to a table using dynamic partitions. @@ -26,17 +27,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 partition (ds) @@ -219,13 +225,13 @@ POSTHOOK: Lineage: outputtbl1 PARTITION(ds=2).key EXPRESSION [(inputtbl1)inputtb POSTHOOK: Lineage: outputtbl1 PARTITION(ds=2).values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/union_remove_17.q.out ql/src/test/results/clientpositive/union_remove_17.q.out index 1fdc4e8..bf473ff 100644 --- ql/src/test/results/clientpositive/union_remove_17.q.out +++ ql/src/test/results/clientpositive/union_remove_17.q.out @@ -10,6 +10,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- and the results are written to a table using dynamic partitions. @@ -22,17 +23,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 partition (ds) @@ -150,13 +156,13 @@ POSTHOOK: Lineage: outputtbl1 PARTITION(ds=2).key EXPRESSION [(inputtbl1)inputtb POSTHOOK: Lineage: outputtbl1 PARTITION(ds=2).values EXPRESSION [] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/union_remove_18.q.out ql/src/test/results/clientpositive/union_remove_18.q.out index 04c5e74..d41e9fe 100644 --- ql/src/test/results/clientpositive/union_remove_18.q.out +++ ql/src/test/results/clientpositive/union_remove_18.q.out @@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, ds string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- There is no need to write the temporary results of the sub-queries, and then read them @@ -26,17 +27,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, ds string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) partitioned by (ds string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 partition (ds) @@ -213,13 +219,13 @@ POSTHOOK: Lineage: outputtbl1 PARTITION(ds=28).key EXPRESSION [(inputtbl1)inputt POSTHOOK: Lineage: outputtbl1 PARTITION(ds=28).values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Partition Information # col_name data_type comment -ds string None +ds string # Detailed Table Information Database: default diff --git ql/src/test/results/clientpositive/union_remove_19.q.out ql/src/test/results/clientpositive/union_remove_19.q.out index d442585..43526ee 100644 --- ql/src/test/results/clientpositive/union_remove_19.q.out +++ ql/src/test/results/clientpositive/union_remove_19.q.out @@ -10,6 +10,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- There is no need to write the temporary results of the sub-queries, and then read them @@ -22,17 +23,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -182,8 +188,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -193,6 +199,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_2.q.out ql/src/test/results/clientpositive/union_remove_2.q.out index b922366..74ef777 100644 --- ql/src/test/results/clientpositive/union_remove_2.q.out +++ ql/src/test/results/clientpositive/union_remove_2.q.out @@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 3 subqueries is performed (exactly one of which requires a map-reduce job) -- followed by select star and a file sink. @@ -24,17 +25,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -189,8 +195,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -200,6 +206,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 3 + numRows -1 + rawDataSize -1 + totalSize 408 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_20.q.out ql/src/test/results/clientpositive/union_remove_20.q.out index 9530c90..81304fc 100644 --- ql/src/test/results/clientpositive/union_remove_20.q.out +++ ql/src/test/results/clientpositive/union_remove_20.q.out @@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select and a file sink -- However, the order of the columns in the select list is different. So, union cannot @@ -24,17 +25,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(values bigint, key string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(values bigint, key string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -184,8 +190,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -values bigint None -key string None +values bigint +key string # Detailed Table Information Database: default @@ -195,6 +201,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_21.q.out ql/src/test/results/clientpositive/union_remove_21.q.out index f737744..068b84e 100644 --- ql/src/test/results/clientpositive/union_remove_21.q.out +++ ql/src/test/results/clientpositive/union_remove_21.q.out @@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select and a file sink -- However, all the columns are not selected. So, union cannot @@ -24,17 +25,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -182,7 +188,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), (inputtbl1)inputtbl1.FieldSchema(name:key, type:string, comment:null), ] # col_name data_type comment -key string None +key string # Detailed Table Information Database: default @@ -192,6 +198,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_22.q.out ql/src/test/results/clientpositive/union_remove_22.q.out index f095e5b..3e8d691 100644 --- ql/src/test/results/clientpositive/union_remove_22.q.out +++ ql/src/test/results/clientpositive/union_remove_22.q.out @@ -10,6 +10,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select and a file sink -- However, some columns are repeated. So, union cannot be removed. @@ -22,17 +23,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint, values2 bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint, values2 bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -184,9 +190,9 @@ POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inp POSTHOOK: Lineage: outputtbl1.values2 EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None -values2 bigint None +key string +values bigint +values2 bigint # Detailed Table Information Database: default @@ -196,6 +202,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_23.q.out ql/src/test/results/clientpositive/union_remove_23.q.out index 51b8e09..0782737 100644 --- ql/src/test/results/clientpositive/union_remove_23.q.out +++ ql/src/test/results/clientpositive/union_remove_23.q.out @@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- There is no need to write the temporary results of the sub-queries, and then read them @@ -24,17 +25,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -223,8 +229,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)b.null, (inputtbl1)a.null, (inputtbl1)b.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -234,6 +240,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_24.q.out ql/src/test/results/clientpositive/union_remove_24.q.out index a54a478..2591b57 100644 --- ql/src/test/results/clientpositive/union_remove_24.q.out +++ ql/src/test/results/clientpositive/union_remove_24.q.out @@ -9,6 +9,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- There is no need to write the temporary results of the sub-queries, and then read them @@ -20,17 +21,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key double, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key double, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE outputTbl1 @@ -180,8 +186,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key double None -values bigint None +key double +values bigint # Detailed Table Information Database: default @@ -191,6 +197,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_3.q.out ql/src/test/results/clientpositive/union_remove_3.q.out index f7a64cd..823dffd 100644 --- ql/src/test/results/clientpositive/union_remove_3.q.out +++ ql/src/test/results/clientpositive/union_remove_3.q.out @@ -11,6 +11,7 @@ PREHOOK: query: -- This is to test the union->remove->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->remove->filesink optimization -- Union of 3 subqueries is performed (all of which are map-only queries) -- followed by select star and a file sink. @@ -24,17 +25,22 @@ POSTHOOK: query: -- This is to test the union->remove->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -174,8 +180,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -185,6 +191,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 1 + numRows -1 + rawDataSize -1 + totalSize 72 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_4.q.out ql/src/test/results/clientpositive/union_remove_4.q.out index 817856e..759b250 100644 --- ql/src/test/results/clientpositive/union_remove_4.q.out +++ ql/src/test/results/clientpositive/union_remove_4.q.out @@ -10,6 +10,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- There is no need to write the temporary results of the sub-queries, and then read them @@ -22,17 +23,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -226,8 +232,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -237,6 +243,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_5.q.out ql/src/test/results/clientpositive/union_remove_5.q.out index 824d5bb..a7546e4 100644 --- ql/src/test/results/clientpositive/union_remove_5.q.out +++ ql/src/test/results/clientpositive/union_remove_5.q.out @@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 3 subqueries is performed (exactly one of which requires a map-reduce job) -- followed by select star and a file sink. @@ -26,17 +27,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -235,8 +241,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -246,6 +252,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 3 + numRows -1 + rawDataSize -1 + totalSize 408 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_7.q.out ql/src/test/results/clientpositive/union_remove_7.q.out index 62b7dd5..c3213e5 100644 --- ql/src/test/results/clientpositive/union_remove_7.q.out +++ ql/src/test/results/clientpositive/union_remove_7.q.out @@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 map-reduce subqueries is performed followed by select star and a file sink -- There is no need to write the temporary results of the sub-queries, and then read them @@ -26,17 +27,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -186,8 +192,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, (inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -197,6 +203,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_8.q.out ql/src/test/results/clientpositive/union_remove_8.q.out index 8f0b378..676c412 100644 --- ql/src/test/results/clientpositive/union_remove_8.q.out +++ ql/src/test/results/clientpositive/union_remove_8.q.out @@ -13,6 +13,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 3 subqueries is performed (exactly one of which requires a map-reduce job) -- followed by select star and a file sink. @@ -28,17 +29,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -193,8 +199,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -204,6 +210,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 3 + numRows -1 + rawDataSize -1 + totalSize 408 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/union_remove_9.q.out ql/src/test/results/clientpositive/union_remove_9.q.out index 28ca8da..24ad12d 100644 --- ql/src/test/results/clientpositive/union_remove_9.q.out +++ ql/src/test/results/clientpositive/union_remove_9.q.out @@ -12,6 +12,7 @@ PREHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization -- Union of 2 subqueries is performed (one of which contains a union and is map-only), -- and the other one is a map-reduce query followed by select star and a file sink. @@ -26,17 +27,22 @@ POSTHOOK: query: -- This is to test the union->selectstar->filesink optimization create table inputTbl1(key string, val string) stored as textfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@inputTbl1 PREHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default POSTHOOK: query: create table outputTbl1(key string, values bigint) stored as rcfile POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default POSTHOOK: Output: default@outputTbl1 PREHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 PREHOOK: type: LOAD +#### A masked pattern was here #### PREHOOK: Output: default@inputtbl1 POSTHOOK: query: load data local inpath '../../data/files/T1.txt' into table inputTbl1 POSTHOOK: type: LOAD +#### A masked pattern was here #### POSTHOOK: Output: default@inputtbl1 PREHOOK: query: explain insert overwrite table outputTbl1 @@ -232,8 +238,8 @@ POSTHOOK: Lineage: outputtbl1.key EXPRESSION [(inputtbl1)inputtbl1.FieldSchema(n POSTHOOK: Lineage: outputtbl1.values EXPRESSION [(inputtbl1)inputtbl1.null, ] # col_name data_type comment -key string None -values bigint None +key string +values bigint # Detailed Table Information Database: default @@ -243,6 +249,11 @@ Retention: 0 #### A masked pattern was here #### Table Type: MANAGED_TABLE Table Parameters: + COLUMN_STATS_ACCURATE false + numFiles 2 + numRows -1 + rawDataSize -1 + totalSize 272 #### A masked pattern was here #### # Storage Information diff --git ql/src/test/results/clientpositive/updateAccessTime.q.out ql/src/test/results/clientpositive/updateAccessTime.q.out index 2695c8d..72a9f25 100644 --- ql/src/test/results/clientpositive/updateAccessTime.q.out +++ ql/src/test/results/clientpositive/updateAccessTime.q.out @@ -13,8 +13,8 @@ PREHOOK: query: desc extended tstsrc PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tstsrc POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string #### A masked pattern was here #### PREHOOK: query: select count(1) from tstsrc @@ -30,8 +30,8 @@ PREHOOK: query: desc extended tstsrc PREHOOK: type: DESCTABLE POSTHOOK: query: desc extended tstsrc POSTHOOK: type: DESCTABLE -key string None -value string None +key string +value string #### A masked pattern was here #### PREHOOK: query: drop table tstsrc @@ -94,14 +94,14 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: desc extended tstsrcpart partition (ds='2008-04-08', hr='11') @@ -118,14 +118,14 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: desc extended tstsrcpart partition (ds='2008-04-08', hr='12') @@ -142,14 +142,14 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: select count(1) from tstsrcpart where ds = '2008-04-08' and hr = '11' @@ -185,14 +185,14 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: desc extended tstsrcpart partition (ds='2008-04-08', hr='11') @@ -209,14 +209,14 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: desc extended tstsrcpart partition (ds='2008-04-08', hr='12') @@ -233,14 +233,14 @@ POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpar POSTHOOK: Lineage: tstsrcpart PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ] key string default value string default -ds string None -hr string None +ds string +hr string # Partition Information # col_name data_type comment -ds string None -hr string None +ds string +hr string #### A masked pattern was here #### PREHOOK: query: drop table tstsrcpart diff --git ql/src/test/results/clientpositive/varchar_nested_types.q.out ql/src/test/results/clientpositive/varchar_nested_types.q.out index 51f0c8a..f74f32d 100644 --- ql/src/test/results/clientpositive/varchar_nested_types.q.out +++ ql/src/test/results/clientpositive/varchar_nested_types.q.out @@ -72,7 +72,7 @@ POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: varchar_nested_1.key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: varchar_nested_array.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] -c1 array None +c1 array PREHOOK: query: select * from varchar_nested_array PREHOOK: type: QUERY PREHOOK: Input: default@varchar_nested_array @@ -119,7 +119,7 @@ POSTHOOK: Lineage: varchar_nested_1.key EXPRESSION [(src)src.FieldSchema(name:ke POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name:value, type:string, comment:default), ] POSTHOOK: Lineage: varchar_nested_array.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] POSTHOOK: Lineage: varchar_nested_map.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:key, type:int, comment:null), (varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] -c1 map None +c1 map PREHOOK: query: select * from varchar_nested_map PREHOOK: type: QUERY PREHOOK: Input: default@varchar_nested_map @@ -176,7 +176,7 @@ POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name: POSTHOOK: Lineage: varchar_nested_array.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] POSTHOOK: Lineage: varchar_nested_map.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:key, type:int, comment:null), (varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] POSTHOOK: Lineage: varchar_nested_struct.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:key, type:int, comment:null), (varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] -c1 struct None +c1 struct PREHOOK: query: select * from varchar_nested_struct PREHOOK: type: QUERY PREHOOK: Input: default@varchar_nested_struct @@ -216,7 +216,7 @@ POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name: POSTHOOK: Lineage: varchar_nested_array.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] POSTHOOK: Lineage: varchar_nested_map.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:key, type:int, comment:null), (varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] POSTHOOK: Lineage: varchar_nested_struct.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:key, type:int, comment:null), (varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] -c1 struct None +c1 struct PREHOOK: query: select * from varchar_nested_cta PREHOOK: type: QUERY PREHOOK: Input: default@varchar_nested_cta @@ -256,7 +256,7 @@ POSTHOOK: Lineage: varchar_nested_1.value EXPRESSION [(src)src.FieldSchema(name: POSTHOOK: Lineage: varchar_nested_array.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] POSTHOOK: Lineage: varchar_nested_map.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:key, type:int, comment:null), (varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] POSTHOOK: Lineage: varchar_nested_struct.c1 EXPRESSION [(varchar_nested_1)varchar_nested_1.FieldSchema(name:key, type:int, comment:null), (varchar_nested_1)varchar_nested_1.FieldSchema(name:value, type:varchar(20), comment:null), ] -c1 struct None +c1 struct PREHOOK: query: select * from varchar_nested_view PREHOOK: type: QUERY PREHOOK: Input: default@varchar_nested_view diff --git ql/src/test/results/clientpositive/vectorization_part.q.out ql/src/test/results/clientpositive/vectorization_part.q.out index 2ac4ddd..187bea1 100644 --- ql/src/test/results/clientpositive/vectorization_part.q.out +++ ql/src/test/results/clientpositive/vectorization_part.q.out @@ -13,18 +13,18 @@ POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') s POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2011 -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc @@ -33,30 +33,30 @@ POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') s POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2012 -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] PREHOOK: query: select count(cdouble), cint from alltypesorc_part where ds='2011' group by cint limit 10 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc_part @@ -67,28 +67,28 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_part POSTHOOK: Input: default@alltypesorc_part@ds=2011 #### A masked pattern was here #### -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] 100 528534767 diff --git ql/src/test/results/clientpositive/vectorization_part_project.q.out ql/src/test/results/clientpositive/vectorization_part_project.q.out index 36a45df..c3121e5 100644 --- ql/src/test/results/clientpositive/vectorization_part_project.q.out +++ ql/src/test/results/clientpositive/vectorization_part_project.q.out @@ -13,18 +13,18 @@ POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2011') s POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2011 -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] PREHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') select * from alltypesorc limit 100 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc @@ -33,58 +33,58 @@ POSTHOOK: query: insert overwrite table alltypesorc_part partition (ds='2012') s POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_part@ds=2012 -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] PREHOOK: query: explain select (cdouble+2) from alltypesorc_part limit 10 PREHOOK: type: QUERY POSTHOOK: query: explain select (cdouble+2) from alltypesorc_part limit 10 POSTHOOK: type: QUERY -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 is a root stage @@ -128,30 +128,30 @@ POSTHOOK: Input: default@alltypesorc_part POSTHOOK: Input: default@alltypesorc_part@ds=2011 POSTHOOK: Input: default@alltypesorc_part@ds=2012 #### A masked pattern was here #### -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2011).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cbigint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cbigint, type:bigint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean1, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cboolean2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cboolean2, type:boolean, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cdouble SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cfloat SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cfloat, type:float, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).csmallint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:csmallint, type:smallint, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).cstring2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring2, type:string, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp1 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctimestamp2 SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp2, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_part PARTITION(ds=2012).ctinyint SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:ctinyint, type:tinyint, comment:null), ] -13324.0 -4211.0 -15811.0 diff --git ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out index 5403204..4f07f57 100644 --- ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out +++ ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out @@ -58,8 +58,8 @@ POSTHOOK: query: insert into table vsmb_bucket_1 select cint, cstring1 from allt POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@vsmb_bucket_1 -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] PREHOOK: query: insert into table vsmb_bucket_2 select cint, cstring1 from alltypesorc limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc @@ -68,10 +68,10 @@ POSTHOOK: query: insert into table vsmb_bucket_2 select cint, cstring1 from allt POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@vsmb_bucket_2 -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] PREHOOK: query: insert into table vsmb_bucket_RC select cint, cstring1 from alltypesorc limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc @@ -80,12 +80,12 @@ POSTHOOK: query: insert into table vsmb_bucket_RC select cint, cstring1 from all POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@vsmb_bucket_rc -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] PREHOOK: query: insert into table vsmb_bucket_TXT select cint, cstring1 from alltypesorc limit 2 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc @@ -94,28 +94,28 @@ POSTHOOK: query: insert into table vsmb_bucket_TXT select cint, cstring1 from al POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@vsmb_bucket_txt -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] PREHOOK: query: explain select /*+MAPJOIN(a)*/ * from vsmb_bucket_1 a join vsmb_bucket_2 b on a.key = b.key PREHOOK: type: QUERY POSTHOOK: query: explain select /*+MAPJOIN(a)*/ * from vsmb_bucket_1 a join vsmb_bucket_2 b on a.key = b.key POSTHOOK: type: QUERY -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 is a root stage @@ -162,14 +162,14 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@vsmb_bucket_1 POSTHOOK: Input: default@vsmb_bucket_2 #### A masked pattern was here #### -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p @@ -180,14 +180,14 @@ PREHOOK: type: QUERY POSTHOOK: query: explain select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_RC b on a.key = b.key POSTHOOK: type: QUERY -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 is a root stage @@ -234,14 +234,14 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@vsmb_bucket_1 POSTHOOK: Input: default@vsmb_bucket_rc #### A masked pattern was here #### -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p @@ -262,14 +262,14 @@ POSTHOOK: query: -- RC file does not yet provide the vectorized CommonRCFileform explain select /*+MAPJOIN(b)*/ * from vsmb_bucket_1 a join vsmb_bucket_TXT b on a.key = b.key POSTHOOK: type: QUERY -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] STAGE DEPENDENCIES: Stage-1 is a root stage Stage-0 is a root stage @@ -316,14 +316,14 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@vsmb_bucket_1 POSTHOOK: Input: default@vsmb_bucket_txt #### A masked pattern was here #### -POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] +POSTHOOK: Lineage: vsmb_bucket_1.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_1.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_2.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_rc.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.key SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: vsmb_bucket_txt.value SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p 528534767 cvLH6Eat2yFsyy7p diff --git ql/src/test/results/clientpositive/vectorized_context.q.out ql/src/test/results/clientpositive/vectorized_context.q.out index 7a2f773..6f0cb21 100644 --- ql/src/test/results/clientpositive/vectorized_context.q.out +++ ql/src/test/results/clientpositive/vectorized_context.q.out @@ -23,8 +23,8 @@ where cint not in ( POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@store -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] PREHOOK: query: create table store_sales(ss_store_sk int, ss_hdemo_sk int, ss_net_profit double) stored as orc PREHOOK: type: CREATETABLE @@ -34,8 +34,8 @@ stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@store_sales -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] PREHOOK: query: insert overwrite table store_sales select cint, cint, cdouble from alltypesorc @@ -52,11 +52,11 @@ where cint not in ( POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@store_sales -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] PREHOOK: query: create table household_demographics(hd_demo_sk int) stored as orc PREHOOK: type: CREATETABLE @@ -66,11 +66,11 @@ stored as orc POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@household_demographics -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] PREHOOK: query: insert overwrite table household_demographics select cint from alltypesorc @@ -87,12 +87,12 @@ where cint not in ( POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@household_demographics -POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] PREHOOK: query: explain select store.s_city, ss_net_profit from store_sales @@ -107,12 +107,12 @@ JOIN store ON store_sales.ss_store_sk = store.s_store_sk JOIN household_demographics ON store_sales.ss_hdemo_sk = household_demographics.hd_demo_sk limit 100 POSTHOOK: type: QUERY -POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] STAGE DEPENDENCIES: Stage-6 is a root stage Stage-4 depends on stages: Stage-6 @@ -222,12 +222,12 @@ POSTHOOK: Input: default@household_demographics POSTHOOK: Input: default@store POSTHOOK: Input: default@store_sales #### A masked pattern was here #### -POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] LFgU5WT87C2yJ4W4YU0r8Pp NULL v3p153e2bSkGS70v04G NULL 0pOH7A4O8aQ37NuBqn NULL @@ -336,12 +336,12 @@ POSTHOOK: query: drop table store POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@store POSTHOOK: Output: default@store -POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] PREHOOK: query: drop table store_sales PREHOOK: type: DROPTABLE PREHOOK: Input: default@store_sales @@ -350,12 +350,12 @@ POSTHOOK: query: drop table store_sales POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@store_sales POSTHOOK: Output: default@store_sales -POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] PREHOOK: query: drop table household_demographics PREHOOK: type: DROPTABLE PREHOOK: Input: default@household_demographics @@ -364,9 +364,9 @@ POSTHOOK: query: drop table household_demographics POSTHOOK: type: DROPTABLE POSTHOOK: Input: default@household_demographics POSTHOOK: Output: default@household_demographics -POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:from deserializer), ] -POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:from deserializer), ] -POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:from deserializer), ] +POSTHOOK: Lineage: household_demographics.hd_demo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store.s_city SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cstring1, type:string, comment:null), ] +POSTHOOK: Lineage: store.s_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_hdemo_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_net_profit SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cdouble, type:double, comment:null), ] +POSTHOOK: Lineage: store_sales.ss_store_sk SIMPLE [(alltypesorc)alltypesorc.FieldSchema(name:cint, type:int, comment:null), ] diff --git ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out index 1000b36..f432af0 100644 --- ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out +++ ql/src/test/results/clientpositive/vectorized_rcfile_columnar.q.out @@ -39,8 +39,8 @@ POSTHOOK: query: describe columnTable POSTHOOK: type: DESCTABLE POSTHOOK: Lineage: columntable.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ] POSTHOOK: Lineage: columntable.value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ] -key string None -value string None +key string +value string PREHOOK: query: SELECT key, value FROM columnTable PREHOOK: type: QUERY PREHOOK: Input: default@columntable diff --git ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out index 70c654c..c964692 100644 --- ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out +++ ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out @@ -27,8 +27,8 @@ LIMIT 40 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_string -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] PREHOOK: query: CREATE TABLE alltypesorc_wrong(stimestamp1 string) STORED AS ORC PREHOOK: type: CREATETABLE PREHOOK: Output: database:default @@ -36,8 +36,8 @@ POSTHOOK: query: CREATE TABLE alltypesorc_wrong(stimestamp1 string) STORED AS OR POSTHOOK: type: CREATETABLE POSTHOOK: Output: database:default POSTHOOK: Output: default@alltypesorc_wrong -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] PREHOOK: query: INSERT INTO TABLE alltypesorc_wrong SELECT 'abcd' FROM alltypesorc LIMIT 1 PREHOOK: type: QUERY PREHOOK: Input: default@alltypesorc @@ -46,8 +46,8 @@ POSTHOOK: query: INSERT INTO TABLE alltypesorc_wrong SELECT 'abcd' FROM alltypes POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_wrong -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] PREHOOK: query: INSERT INTO TABLE alltypesorc_wrong SELECT '2000:01:01 00-00-00' FROM alltypesorc LIMIT 1 PREHOOK: type: QUERY @@ -57,8 +57,8 @@ POSTHOOK: query: INSERT INTO TABLE alltypesorc_wrong SELECT '2000:01:01 00-00-00 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_wrong -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] PREHOOK: query: INSERT INTO TABLE alltypesorc_wrong SELECT '0000-00-00 99:99:99' FROM alltypesorc LIMIT 1 @@ -69,8 +69,8 @@ POSTHOOK: query: INSERT INTO TABLE alltypesorc_wrong SELECT '0000-00-00 99:99:99 POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc POSTHOOK: Output: default@alltypesorc_wrong -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -98,8 +98,8 @@ POSTHOOK: query: EXPLAIN SELECT second(ctimestamp1) FROM alltypesorc_string POSTHOOK: type: QUERY -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -159,8 +159,8 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -228,8 +228,8 @@ POSTHOOK: query: EXPLAIN SELECT second(stimestamp1) FROM alltypesorc_string POSTHOOK: type: QUERY -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -289,8 +289,8 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -358,8 +358,8 @@ POSTHOOK: query: EXPLAIN SELECT second(ctimestamp1) = second(stimestamp1) FROM alltypesorc_string POSTHOOK: type: QUERY -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -421,8 +421,8 @@ FROM alltypesorc_string POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_string #### A masked pattern was here #### -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -492,8 +492,8 @@ EXPLAIN SELECT second(stimestamp1) FROM alltypesorc_wrong POSTHOOK: type: QUERY -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] @@ -553,8 +553,8 @@ FROM alltypesorc_wrong POSTHOOK: type: QUERY POSTHOOK: Input: default@alltypesorc_wrong #### A masked pattern was here #### -POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] -POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:from deserializer), ] +POSTHOOK: Lineage: alltypesorc_string.ctimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] +POSTHOOK: Lineage: alltypesorc_string.stimestamp1 EXPRESSION [(alltypesorc)alltypesorc.FieldSchema(name:ctimestamp1, type:timestamp, comment:null), ] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] POSTHOOK: Lineage: alltypesorc_wrong.stimestamp1 SIMPLE [] diff --git serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java index 4b9a4f9..0b8e0e5 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/RegexSerDe.java @@ -47,6 +47,9 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; +import com.google.common.base.Splitter; +import com.google.common.collect.Lists; + /** * RegexSerDe uses regular expression (regex) to deserialize data. It doesn't * support data serialization. @@ -141,7 +144,7 @@ public void initialize(Configuration conf, Properties tbl) // StandardStruct uses ArrayList to store the row. rowOI = ObjectInspectorFactory.getStandardStructObjectInspector( - columnNames, columnOIs); + columnNames,columnOIs,Lists.newArrayList(Splitter.on('\0').split(tbl.getProperty("columns.comments")))); row = new ArrayList(numColumns); // Constructing the row object, etc, which will be reused for all rows. diff --git serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java index d972321..d226d21 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java @@ -68,49 +68,6 @@ public static final Log LOG = LogFactory.getLog(SerDeUtils.class.getName()); - public static void registerSerDe(String name, Class serde) {} - - private static List nativeSerDeNames = new ArrayList(); - static { - nativeSerDeNames - .add(org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe.class - .getName()); - nativeSerDeNames - .add(org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class - .getName()); - // For backward compatibility - nativeSerDeNames.add("org.apache.hadoop.hive.serde.thrift.columnsetSerDe"); - nativeSerDeNames - .add(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName()); - nativeSerDeNames.add(org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe.class.getName()); - } - - public static boolean shouldGetColsFromSerDe(String serde) { - return (serde != null) && !nativeSerDeNames.contains(serde); - } - - private static boolean initCoreSerDes = registerCoreSerDes(); - - protected static boolean registerCoreSerDes() { - // Eagerly load SerDes so they will register their symbolic names even on - // Lazy Loading JVMs - try { - // loading these classes will automatically register the short names - Class - .forName(org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class - .getName()); - Class.forName(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class - .getName()); - Class - .forName(org.apache.hadoop.hive.serde2.thrift.ThriftDeserializer.class - .getName()); - } catch (ClassNotFoundException e) { - throw new RuntimeException( - "IMPOSSIBLE Exception: Unable to initialize core serdes", e); - } - return true; - } - /** * Escape a String in JSON format. */