diff --git accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java index 46c3c1a..370d7f7 100644 --- accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java +++ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloRowSerializer.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hive.serde2.ByteStream; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.LazyUtils; import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector; diff --git accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java index 66ab01e..ff4f86c 100644 --- accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java +++ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDe.java @@ -32,7 +32,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeStats; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; diff --git accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java index ef77697..d0799b3 100644 --- accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java +++ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/AccumuloSerDeParameters.java @@ -30,8 +30,7 @@ import org.apache.hadoop.hive.accumulo.columns.HiveAccumuloRowIdColumnMapping; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.SerDeException; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.util.ReflectionUtils; import org.apache.log4j.Logger; @@ -71,7 +70,7 @@ public AccumuloSerDeParameters(Configuration conf, Properties tableProperties, S this.tableProperties = tableProperties; this.serdeName = serdeName; - lazySerDeParameters = LazySimpleSerDe.initSerdeParams(conf, tableProperties, serdeName); + lazySerDeParameters = new SerDeParameters(conf, tableProperties, serdeName); // The default encoding for this table when not otherwise specified String defaultStorage = tableProperties.getProperty(DEFAULT_STORAGE_TYPE); diff --git accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java index 1180679..cbf17c0 100644 --- accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java +++ accumulo-handler/src/java/org/apache/hadoop/hive/accumulo/serde/DefaultAccumuloRowIdFactory.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; @@ -42,7 +42,7 @@ public class DefaultAccumuloRowIdFactory implements AccumuloRowIdFactory { protected AccumuloSerDeParameters accumuloSerDeParams; - protected LazySimpleSerDe.SerDeParameters serdeParams; + protected SerDeParameters serdeParams; protected Properties properties; protected HiveAccumuloRowIdColumnMapping rowIdMapping; protected AccumuloRowSerializer serializer; diff --git accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java index e0b51cb..3943a6d 100644 --- accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java +++ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/TestLazyAccumuloRow.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; import org.apache.hadoop.hive.serde2.lazy.LazyInteger; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.LazyString; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; import org.apache.hadoop.hive.serde2.lazydio.LazyDioInteger; @@ -58,7 +58,7 @@ public void testExpectedDeserializationOfColumns() throws Exception { TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo); LazySimpleStructObjectInspector objectInspector = (LazySimpleStructObjectInspector) LazyFactory - .createLazyStructInspector(columns, types, LazySimpleSerDe.DefaultSeparators, new Text( + .createLazyStructInspector(columns, types, SerDeParameters.DefaultSeparators, new Text( "\\N"), false, false, (byte) '\\'); DefaultAccumuloRowIdFactory rowIdFactory = new DefaultAccumuloRowIdFactory(); @@ -119,7 +119,7 @@ public void testDeserializationOfBinaryEncoding() throws Exception { TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo, TypeInfoFactory.intTypeInfo); LazySimpleStructObjectInspector objectInspector = (LazySimpleStructObjectInspector) LazyFactory - .createLazyStructInspector(columns, types, LazySimpleSerDe.DefaultSeparators, new Text( + .createLazyStructInspector(columns, types, SerDeParameters.DefaultSeparators, new Text( "\\N"), false, false, (byte) '\\'); DefaultAccumuloRowIdFactory rowIdFactory = new DefaultAccumuloRowIdFactory(); @@ -202,7 +202,7 @@ public void testNullInit() throws SerDeException { TypeInfoFactory.getPrimitiveTypeInfo(serdeConstants.STRING_TYPE_NAME)); LazySimpleStructObjectInspector objectInspector = (LazySimpleStructObjectInspector) LazyFactory - .createLazyStructInspector(columns, types, LazySimpleSerDe.DefaultSeparators, new Text( + .createLazyStructInspector(columns, types, SerDeParameters.DefaultSeparators, new Text( "\\N"), false, false, (byte) '\\'); DefaultAccumuloRowIdFactory rowIdFactory = new DefaultAccumuloRowIdFactory(); diff --git accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java index 706b26e..47b2a1e 100644 --- accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java +++ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/mr/TestHiveAccumuloTableOutputFormat.java @@ -43,7 +43,7 @@ import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.LazyStruct; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory; diff --git accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java index f613a58..86f40cf 100644 --- accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java +++ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloRowSerializer.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.ByteArrayRef; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.LazyStruct; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory; diff --git accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java index 18b84e4..d8635cc 100644 --- accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java +++ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestAccumuloSerDe.java @@ -44,7 +44,7 @@ import org.apache.hadoop.hive.serde2.lazy.LazyArray; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; import org.apache.hadoop.hive.serde2.lazy.LazyMap; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.LazyString; import org.apache.hadoop.hive.serde2.lazy.LazyStruct; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector; diff --git accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java index d464740..050858f 100644 --- accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java +++ accumulo-handler/src/test/org/apache/hadoop/hive/accumulo/serde/TestDefaultAccumuloRowIdFactory.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.LazyString; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyMapObjectInspector; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; @@ -33,8 +33,6 @@ import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyPrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyStringObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.JavaStringObjectInspector; -import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.junit.Assert; import org.junit.Test; diff --git contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java index 72f4234..9b337ae 100644 --- contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java +++ contrib/src/java/org/apache/hadoop/hive/contrib/serde2/MultiDelimitSerDe.java @@ -43,6 +43,7 @@ import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; @@ -62,7 +63,8 @@ serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST, serdeConstants.ESCAPE_CHAR, serdeConstants.SERIALIZATION_ENCODING, - LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS}) + SerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, + SerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS}) public class MultiDelimitSerDe extends AbstractSerDe { private static final Log LOG = LogFactory.getLog(MultiDelimitSerDe.class.getName()); private static final byte[] DEFAULT_SEPARATORS = {(byte) 1, (byte) 2, (byte) 3}; @@ -85,7 +87,7 @@ // The wrapper for byte array private ByteArrayRef byteArrayRef; - private LazySimpleSerDe.SerDeParameters serdeParams = null; + private SerDeParameters serdeParams = null; // The output stream of serialized objects private final ByteStream.Output serializeStream = new ByteStream.Output(); // The Writable to return in serialize @@ -94,7 +96,7 @@ @Override public void initialize(Configuration conf, Properties tbl) throws SerDeException { // get the SerDe parameters - serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, getClass().getName()); + serdeParams = new SerDeParameters(conf, tbl, getClass().getName()); fieldDelimited = tbl.getProperty(serdeConstants.FIELD_DELIM); if (fieldDelimited == null || fieldDelimited.isEmpty()) { @@ -103,12 +105,12 @@ public void initialize(Configuration conf, Properties tbl) throws SerDeException // get the collection separator and map key separator // TODO: use serdeConstants.COLLECTION_DELIM when the typo is fixed - collSep = LazySimpleSerDe.getByte(tbl.getProperty(COLLECTION_DELIM), + collSep = LazyUtils.getByte(tbl.getProperty(COLLECTION_DELIM), DEFAULT_SEPARATORS[1]); - keySep = LazySimpleSerDe.getByte(tbl.getProperty(serdeConstants.MAPKEY_DELIM), + keySep = LazyUtils.getByte(tbl.getProperty(serdeConstants.MAPKEY_DELIM), DEFAULT_SEPARATORS[2]); - serdeParams.getSeparators()[1] = collSep; - serdeParams.getSeparators()[2] = keySep; + serdeParams.setSeparator(1, collSep); + serdeParams.setSeparator(2, keySep); // Create the ObjectInspectors for the fields cachedObjectInspector = LazyFactory.createLazyStructInspector(serdeParams @@ -200,7 +202,7 @@ public Writable serialize(Object obj, ObjectInspector objInspector) throws SerDe // is the binary data. private static void serializeNoEncode(ByteStream.Output out, Object obj, ObjectInspector objInspector, byte[] separators, int level, - Text nullSequence, boolean escaped, byte escapeChar, boolean[] needsEscape) + Text nullSequence, boolean escaped, byte escapeChar, Map needsEscape) throws IOException, SerDeException { if (obj == null) { out.write(nullSequence.getBytes(), 0, nullSequence.getLength()); diff --git data/files/nestedcomplex_additional.txt data/files/nestedcomplex_additional.txt new file mode 100755 index 0000000..c114272 --- /dev/null +++ data/files/nestedcomplex_additional.txt @@ -0,0 +1,2 @@ +1123k2v2k1v1a10100 +1123k2v2k1v1a10100 diff --git hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java index d3e5c75..4fe8734 100644 --- hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java +++ hbase-handler/src/java/org/apache/hadoop/hive/hbase/DefaultHBaseKeyFactory.java @@ -25,7 +25,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions; diff --git hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java index 5d9cba7..0cb4c48 100644 --- hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java +++ hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseLazyObjectFactory.java @@ -23,7 +23,7 @@ import org.apache.hadoop.hive.hbase.struct.HBaseValueFactory; import org.apache.hadoop.hive.serde2.SerDeException; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazyObjectInspectorFactory; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParameters; import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParametersImpl; diff --git hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java index 3bbab20..4e89aa1 100644 --- hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java +++ hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseRowSerializer.java @@ -27,7 +27,7 @@ import org.apache.hadoop.hive.serde2.ByteStream; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.LazyUtils; import org.apache.hadoop.hive.serde2.objectinspector.ListObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector; @@ -44,7 +44,7 @@ private final HBaseKeyFactory keyFactory; private final HBaseSerDeParameters hbaseParam; - private final LazySimpleSerDe.SerDeParameters serdeParam; + private final SerDeParameters serdeParam; private final int keyIndex; private final int timestampIndex; @@ -54,9 +54,7 @@ private final byte[] separators; // the separators array private final boolean escaped; // whether we need to escape the data when writing out private final byte escapeChar; // which char to use as the escape char, e.g. '\\' - private final boolean[] needsEscape; // which chars need to be escaped. This array should have size - // of 128. Negative byte values (or byte values >= 128) are - // never escaped. + private final Map needsEscape; // which chars need to be escaped. private final long putTimestamp; private final ByteStream.Output output = new ByteStream.Output(); diff --git hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java index 47e20d5..73bfd2e 100644 --- hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java +++ hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDe.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeSpec; import org.apache.hadoop.hive.serde2.SerDeStats; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazy.objectinspector.LazySimpleStructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.io.Writable; @@ -51,7 +51,8 @@ serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST, serdeConstants.ESCAPE_CHAR, serdeConstants.SERIALIZATION_ENCODING, - LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS, + SerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, + SerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS, HBaseSerDe.HBASE_COLUMNS_MAPPING, HBaseSerDe.HBASE_TABLE_NAME, HBaseSerDe.HBASE_TABLE_DEFAULT_STORAGE_TYPE, @@ -240,7 +241,7 @@ public static ColumnMappings parseColumnsMapping( return new ColumnMappings(columnsMapping, rowKeyIndex, timestampIndex); } - public LazySimpleSerDe.SerDeParameters getSerdeParams() { + public SerDeParameters getSerdeParams() { return serdeParams.getSerdeParams(); } diff --git hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java index a43520c..6fb2ffe 100644 --- hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java +++ hbase-handler/src/java/org/apache/hadoop/hive/hbase/HBaseSerDeParameters.java @@ -33,9 +33,8 @@ import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.avro.AvroSerdeUtils; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.util.ReflectionUtils; import javax.annotation.Nullable; @@ -92,7 +91,7 @@ columnMappings.toTypesString(tbl, job, autogenerate)); } - this.serdeParams = LazySimpleSerDe.initSerdeParams(job, tbl, serdeName); + this.serdeParams = new SerDeParameters(job, tbl, serdeName); this.putTimestamp = Long.valueOf(tbl.getProperty(HBaseSerDe.HBASE_PUT_TIMESTAMP, "-1")); columnMappings.setHiveColumnDescription(serdeName, serdeParams.getColumnNames(), diff --git hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java index 51a0e22..081df5f 100644 --- hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java +++ hbase-handler/src/java/org/apache/hadoop/hive/hbase/struct/DefaultHBaseValueFactory.java @@ -27,7 +27,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; import org.apache.hadoop.hive.serde2.lazy.LazyObjectBase; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions; import org.apache.hadoop.hive.serde2.objectinspector.StructField; @@ -38,7 +38,7 @@ * */ public class DefaultHBaseValueFactory implements HBaseValueFactory { - protected LazySimpleSerDe.SerDeParameters serdeParams; + protected SerDeParameters serdeParams; protected ColumnMappings columnMappings; protected HBaseSerDeParameters hbaseParams; protected Properties properties; diff --git hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java index 42b2444..0846286 100644 --- hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java +++ hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java @@ -55,13 +55,13 @@ import org.apache.hadoop.hive.hbase.avro.OfficePhone; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.SerDeException; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.avro.AvroSerdeUtils; import org.apache.hadoop.hive.serde2.io.ByteWritable; import org.apache.hadoop.hive.serde2.io.DoubleWritable; import org.apache.hadoop.hive.serde2.io.ShortWritable; import org.apache.hadoop.hive.serde2.lazy.LazyPrimitive; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; import org.apache.hadoop.hive.serde2.lazy.LazyStruct; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; @@ -1413,7 +1413,7 @@ private Properties createPropertiesForHiveAvroColumnFamilyMap() { "org.apache.hadoop.hive.hbase.avro.Employee"); tbl.setProperty(HBaseSerDe.HBASE_COLUMNS_MAPPING, "cola:prefixB_.*"); tbl.setProperty(HBaseSerDe.HBASE_AUTOGENERATE_STRUCT, "true"); - tbl.setProperty(LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS, "true"); + tbl.setProperty(SerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, "true"); return tbl; } diff --git hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java index 36834b1..d8e9407 100644 --- hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java +++ hcatalog/streaming/src/java/org/apache/hive/hcatalog/streaming/DelimitedInputWriter.java @@ -31,6 +31,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.io.BytesWritable; import java.io.IOException; @@ -89,7 +90,7 @@ public DelimitedInputWriter(String[] colNamesForFields, String delimiter, throws ClassNotFoundException, ConnectionError, SerializationError, InvalidColumn, StreamingException { this(colNamesForFields, delimiter, endPoint, conf, - (char) LazySimpleSerDe.DefaultSeparators[0]); + (char) SerDeParameters.DefaultSeparators[0]); } /** diff --git ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java index 6d87606..9923ace 100644 --- ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java +++ ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexResult.java @@ -34,8 +34,8 @@ import org.apache.hadoop.hive.common.FileUtils; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.metadata.HiveException; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.columnar.BytesRefWritable; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.FileSplit; import org.apache.hadoop.mapred.JobConf; @@ -144,7 +144,7 @@ private void add(Text line) throws HiveException { int firstEnd = 0; int i = 0; for (int index = 0; index < bytes.length; index++) { - if (bytes[index] == LazySimpleSerDe.DefaultSeparators[0]) { + if (bytes[index] == SerDeParameters.DefaultSeparators[0]) { i++; firstEnd = index; } @@ -169,7 +169,7 @@ private void add(Text line) throws HiveException { int currentStart = firstEnd + 1; int currentEnd = firstEnd + 1; for (; currentEnd < bytes.length; currentEnd++) { - if (bytes[currentEnd] == LazySimpleSerDe.DefaultSeparators[1]) { + if (bytes[currentEnd] == SerDeParameters.DefaultSeparators[1]) { String one_offset = new String(bytes, currentStart, currentEnd - currentStart); Long offset = Long.parseLong(one_offset); diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java index b62ffed..528e42a 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/PlanUtils.java @@ -65,6 +65,7 @@ import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.mapred.InputFormat; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.SequenceFileInputFormat; @@ -287,7 +288,7 @@ public static TableDesc getDefaultQueryOutputTableDesc(String cols, String colTy tblDesc.getProperties().setProperty(serdeConstants.ESCAPE_CHAR, "\\"); //enable extended nesting levels tblDesc.getProperties().setProperty( - LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS, "true"); + SerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS, "true"); return tblDesc; } diff --git ql/src/test/queries/clientpositive/nested_complex_additional.q ql/src/test/queries/clientpositive/nested_complex_additional.q new file mode 100644 index 0000000..5677737 --- /dev/null +++ ql/src/test/queries/clientpositive/nested_complex_additional.q @@ -0,0 +1,21 @@ +create table nestedcomplex_additional ( +simple_int int, +max_nested_array array>>>>>>>>>>>>>>>>>>>>>>>>, +max_nested_map array>>>>>>>>>>>>>>>>>>>>>>>>>, +max_nested_struct array>>>>>>>>>>>>>>>>>>>>>>>>>, +simple_string string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' +WITH SERDEPROPERTIES ( + 'hive.serialization.extend.additional.nesting.levels'='true', + 'line.delim'='\n' +) +; + +describe nestedcomplex_additional; +describe extended nestedcomplex_additional; + + +load data local inpath '../../data/files/nestedcomplex_additional.txt' overwrite into table nestedcomplex_additional; + +select * from nestedcomplex_additional sort by simple_int; diff --git ql/src/test/results/clientpositive/alter_partition_coltype.q.out ql/src/test/results/clientpositive/alter_partition_coltype.q.out index 7b2960b..af9d96c 100644 --- ql/src/test/results/clientpositive/alter_partition_coltype.q.out +++ ql/src/test/results/clientpositive/alter_partition_coltype.q.out @@ -255,7 +255,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -433,7 +433,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -590,7 +590,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_join_reordering_values.q.out ql/src/test/results/clientpositive/auto_join_reordering_values.q.out index 3204af8..9e3ebec 100644 --- ql/src/test/results/clientpositive/auto_join_reordering_values.q.out +++ ql/src/test/results/clientpositive/auto_join_reordering_values.q.out @@ -667,7 +667,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out index cea9eb5..34a1820 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out @@ -294,7 +294,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -514,7 +514,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -856,7 +856,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1173,7 +1173,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1329,7 +1329,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out index b696e83..e6e7ef3 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out @@ -412,7 +412,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -762,7 +762,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1071,7 +1071,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1508,7 +1508,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out index c58fa36..e9fb705 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out @@ -719,7 +719,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out index 772ccec..34c8a26 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out @@ -274,7 +274,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -618,7 +618,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -935,7 +935,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1091,7 +1091,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out index ea7b8ff..9af82b9 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out @@ -225,7 +225,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -396,7 +396,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -782,7 +782,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1052,7 +1052,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1159,7 +1159,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out index 24011a3..0bf80f4 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out @@ -241,7 +241,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -412,7 +412,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -798,7 +798,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1068,7 +1068,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1175,7 +1175,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out index 969189f..70665c2 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out @@ -202,7 +202,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -363,7 +363,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -590,7 +590,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -751,7 +751,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -854,7 +854,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out index f458c33..446bb02 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out @@ -307,7 +307,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -529,7 +529,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -966,7 +966,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1331,7 +1331,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1487,7 +1487,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out index 52a69e8..b5b5913 100644 --- ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out +++ ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out @@ -307,7 +307,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -529,7 +529,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -968,7 +968,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1333,7 +1333,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1489,7 +1489,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucket_map_join_1.q.out ql/src/test/results/clientpositive/bucket_map_join_1.q.out index 69a61d4..d778203 100644 --- ql/src/test/results/clientpositive/bucket_map_join_1.q.out +++ ql/src/test/results/clientpositive/bucket_map_join_1.q.out @@ -237,7 +237,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucket_map_join_2.q.out ql/src/test/results/clientpositive/bucket_map_join_2.q.out index fc55855..aef77aa 100644 --- ql/src/test/results/clientpositive/bucket_map_join_2.q.out +++ ql/src/test/results/clientpositive/bucket_map_join_2.q.out @@ -237,7 +237,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out index be87576..bdbcd25 100644 --- ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out +++ ql/src/test/results/clientpositive/bucket_map_join_spark4.q.out @@ -229,7 +229,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -633,7 +633,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_1.q.out ql/src/test/results/clientpositive/bucketcontext_1.q.out index 48e9f10..37e0514 100644 --- ql/src/test/results/clientpositive/bucketcontext_1.q.out +++ ql/src/test/results/clientpositive/bucketcontext_1.q.out @@ -378,7 +378,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -603,7 +603,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_2.q.out ql/src/test/results/clientpositive/bucketcontext_2.q.out index 695feb1..5cb6845 100644 --- ql/src/test/results/clientpositive/bucketcontext_2.q.out +++ ql/src/test/results/clientpositive/bucketcontext_2.q.out @@ -362,7 +362,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -587,7 +587,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_3.q.out ql/src/test/results/clientpositive/bucketcontext_3.q.out index b3929f3..2433a67 100644 --- ql/src/test/results/clientpositive/bucketcontext_3.q.out +++ ql/src/test/results/clientpositive/bucketcontext_3.q.out @@ -359,7 +359,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -535,7 +535,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_4.q.out ql/src/test/results/clientpositive/bucketcontext_4.q.out index cd81f9e..c039126 100644 --- ql/src/test/results/clientpositive/bucketcontext_4.q.out +++ ql/src/test/results/clientpositive/bucketcontext_4.q.out @@ -375,7 +375,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -551,7 +551,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_5.q.out ql/src/test/results/clientpositive/bucketcontext_5.q.out index ef45b4a..4b9ade6 100644 --- ql/src/test/results/clientpositive/bucketcontext_5.q.out +++ ql/src/test/results/clientpositive/bucketcontext_5.q.out @@ -243,7 +243,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -409,7 +409,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_6.q.out ql/src/test/results/clientpositive/bucketcontext_6.q.out index 62edc1d..66c159b 100644 --- ql/src/test/results/clientpositive/bucketcontext_6.q.out +++ ql/src/test/results/clientpositive/bucketcontext_6.q.out @@ -314,7 +314,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -537,7 +537,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_7.q.out ql/src/test/results/clientpositive/bucketcontext_7.q.out index bd79ff2..4228a4d 100644 --- ql/src/test/results/clientpositive/bucketcontext_7.q.out +++ ql/src/test/results/clientpositive/bucketcontext_7.q.out @@ -441,7 +441,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -668,7 +668,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketcontext_8.q.out ql/src/test/results/clientpositive/bucketcontext_8.q.out index b6a9ad2..dfa0cd8 100644 --- ql/src/test/results/clientpositive/bucketcontext_8.q.out +++ ql/src/test/results/clientpositive/bucketcontext_8.q.out @@ -441,7 +441,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -668,7 +668,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin10.q.out ql/src/test/results/clientpositive/bucketmapjoin10.q.out index 493e038..b0e849d 100644 --- ql/src/test/results/clientpositive/bucketmapjoin10.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin10.q.out @@ -463,7 +463,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin11.q.out ql/src/test/results/clientpositive/bucketmapjoin11.q.out index 3a4b2b5..4263cab 100644 --- ql/src/test/results/clientpositive/bucketmapjoin11.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin11.q.out @@ -481,7 +481,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -869,7 +869,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin12.q.out ql/src/test/results/clientpositive/bucketmapjoin12.q.out index 537f19f..bcd7394 100644 --- ql/src/test/results/clientpositive/bucketmapjoin12.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin12.q.out @@ -346,7 +346,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -622,7 +622,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin13.q.out ql/src/test/results/clientpositive/bucketmapjoin13.q.out index a296197..7114721 100644 --- ql/src/test/results/clientpositive/bucketmapjoin13.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin13.q.out @@ -346,7 +346,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -626,7 +626,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -905,7 +905,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1186,7 +1186,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin7.q.out ql/src/test/results/clientpositive/bucketmapjoin7.q.out index 1f0bae0..667a9db 100644 --- ql/src/test/results/clientpositive/bucketmapjoin7.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin7.q.out @@ -330,7 +330,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin8.q.out ql/src/test/results/clientpositive/bucketmapjoin8.q.out index 6d48156..252b377 100644 --- ql/src/test/results/clientpositive/bucketmapjoin8.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin8.q.out @@ -312,7 +312,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -605,7 +605,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin9.q.out ql/src/test/results/clientpositive/bucketmapjoin9.q.out index 01d7cc9..5e28dc3 100644 --- ql/src/test/results/clientpositive/bucketmapjoin9.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin9.q.out @@ -312,7 +312,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -630,7 +630,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out index e4c87fa..9a0bfc4 100644 --- ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out +++ ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out @@ -268,7 +268,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -457,7 +457,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -635,7 +635,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -816,7 +816,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -997,7 +997,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1178,7 +1178,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1359,7 +1359,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1540,7 +1540,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1721,7 +1721,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/columnstats_partlvl.q.out ql/src/test/results/clientpositive/columnstats_partlvl.q.out index e431b0f..a86c5fb 100644 --- ql/src/test/results/clientpositive/columnstats_partlvl.q.out +++ ql/src/test/results/clientpositive/columnstats_partlvl.q.out @@ -204,7 +204,7 @@ STAGE PLANS: columns _col0,_col1 columns.types struct:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -404,7 +404,7 @@ STAGE PLANS: columns _col0,_col1 columns.types struct:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/columnstats_tbllvl.q.out ql/src/test/results/clientpositive/columnstats_tbllvl.q.out index de21af8..0ef04f5 100644 --- ql/src/test/results/clientpositive/columnstats_tbllvl.q.out +++ ql/src/test/results/clientpositive/columnstats_tbllvl.q.out @@ -191,7 +191,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types struct:struct:struct escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/combine2.q.out ql/src/test/results/clientpositive/combine2.q.out index e248b1e..3bfe143 100644 --- ql/src/test/results/clientpositive/combine2.q.out +++ ql/src/test/results/clientpositive/combine2.q.out @@ -593,7 +593,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/combine2_hadoop20.q.out ql/src/test/results/clientpositive/combine2_hadoop20.q.out index e7d3c26..1d6024e 100644 --- ql/src/test/results/clientpositive/combine2_hadoop20.q.out +++ ql/src/test/results/clientpositive/combine2_hadoop20.q.out @@ -606,7 +606,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/combine2_win.q.out ql/src/test/results/clientpositive/combine2_win.q.out index 11f212d..b33f31b 100644 --- ql/src/test/results/clientpositive/combine2_win.q.out +++ ql/src/test/results/clientpositive/combine2_win.q.out @@ -603,7 +603,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 TotalFiles: 1 GatherStats: false diff --git ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out index 271bc0f..4ac2416 100644 --- ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out +++ ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out @@ -233,7 +233,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out index 07ac953..a176d9a 100644 --- ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out +++ ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out @@ -207,7 +207,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types struct:struct:struct escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out index 99f4c17..0caf694 100644 --- ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out +++ ql/src/test/results/clientpositive/encrypted/encryption_join_unencrypted_tbl.q.out @@ -738,7 +738,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out index c66aacb..7d8ffce 100644 --- ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out +++ ql/src/test/results/clientpositive/encrypted/encryption_join_with_different_encryption_keys.q.out @@ -258,7 +258,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/filter_join_breaktask.q.out ql/src/test/results/clientpositive/filter_join_breaktask.q.out index 3631412..83f4720 100644 --- ql/src/test/results/clientpositive/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/filter_join_breaktask.q.out @@ -379,7 +379,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/groupby_sort_1.q.out ql/src/test/results/clientpositive/groupby_sort_1.q.out index b633228..5784b3e 100644 --- ql/src/test/results/clientpositive/groupby_sort_1.q.out +++ ql/src/test/results/clientpositive/groupby_sort_1.q.out @@ -4335,7 +4335,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4 columns.types string:bigint:string:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/groupby_sort_1_23.q.out ql/src/test/results/clientpositive/groupby_sort_1_23.q.out index a2b6425..0d4fb8c 100644 --- ql/src/test/results/clientpositive/groupby_sort_1_23.q.out +++ ql/src/test/results/clientpositive/groupby_sort_1_23.q.out @@ -4150,7 +4150,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4 columns.types string:bigint:string:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out index a4a2edc..e912a29 100644 --- ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out +++ ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out @@ -4725,7 +4725,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4 columns.types string:bigint:string:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out index 2209466..42d52d1 100644 --- ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out +++ ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out @@ -4605,7 +4605,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4 columns.types string:bigint:string:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/input23.q.out ql/src/test/results/clientpositive/input23.q.out index 0bd543b..32b40cf 100644 --- ql/src/test/results/clientpositive/input23.q.out +++ ql/src/test/results/clientpositive/input23.q.out @@ -161,7 +161,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7 columns.types string:string:string:string:string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/input42.q.out ql/src/test/results/clientpositive/input42.q.out index 95e8553..55bdaf7 100644 --- ql/src/test/results/clientpositive/input42.q.out +++ ql/src/test/results/clientpositive/input42.q.out @@ -1220,7 +1220,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1792,7 +1792,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/input_part7.q.out ql/src/test/results/clientpositive/input_part7.q.out index 6094f9c..f76a912 100644 --- ql/src/test/results/clientpositive/input_part7.q.out +++ ql/src/test/results/clientpositive/input_part7.q.out @@ -283,7 +283,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/input_part9.q.out ql/src/test/results/clientpositive/input_part9.q.out index 6e60679..b444bc9 100644 --- ql/src/test/results/clientpositive/input_part9.q.out +++ ql/src/test/results/clientpositive/input_part9.q.out @@ -71,7 +71,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/join_filters_overlap.q.out ql/src/test/results/clientpositive/join_filters_overlap.q.out index 00ca0e5..6ddd4b6 100644 --- ql/src/test/results/clientpositive/join_filters_overlap.q.out +++ ql/src/test/results/clientpositive/join_filters_overlap.q.out @@ -229,7 +229,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -480,7 +480,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -745,7 +745,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1040,7 +1040,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7 columns.types int:int:int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1329,7 +1329,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7 columns.types int:int:int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 c5bff33..0d1e5f6 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_1.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_1.q.out @@ -466,7 +466,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_11.q.java1.7.out ql/src/test/results/clientpositive/list_bucket_dml_11.q.java1.7.out index 6c60367..fdbb728 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_11.q.java1.7.out +++ ql/src/test/results/clientpositive/list_bucket_dml_11.q.java1.7.out @@ -338,7 +338,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_12.q.java1.7.out ql/src/test/results/clientpositive/list_bucket_dml_12.q.java1.7.out index 7ed4f70..72b5cdb 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_12.q.java1.7.out +++ ql/src/test/results/clientpositive/list_bucket_dml_12.q.java1.7.out @@ -351,7 +351,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:string:string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -509,7 +509,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:string:string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_13.q.java1.7.out ql/src/test/results/clientpositive/list_bucket_dml_13.q.java1.7.out index 7dfa3c2..576e2f3 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_13.q.java1.7.out +++ ql/src/test/results/clientpositive/list_bucket_dml_13.q.java1.7.out @@ -351,7 +351,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:string:string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_14.q.out ql/src/test/results/clientpositive/list_bucket_dml_14.q.out index db38473..27dcb9e 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_14.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_14.q.out @@ -309,7 +309,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_2.q.java1.7.out ql/src/test/results/clientpositive/list_bucket_dml_2.q.java1.7.out index 1696954..92d70b9 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_2.q.java1.7.out +++ ql/src/test/results/clientpositive/list_bucket_dml_2.q.java1.7.out @@ -437,7 +437,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 a5d9316..2ae98f7 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_3.q.out +++ ql/src/test/results/clientpositive/list_bucket_dml_3.q.out @@ -406,7 +406,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_4.q.java1.7.out ql/src/test/results/clientpositive/list_bucket_dml_4.q.java1.7.out index d358bde..4ff16de 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_4.q.java1.7.out +++ ql/src/test/results/clientpositive/list_bucket_dml_4.q.java1.7.out @@ -848,7 +848,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_5.q.java1.7.out ql/src/test/results/clientpositive/list_bucket_dml_5.q.java1.7.out index e07303d..ae41191 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_5.q.java1.7.out +++ ql/src/test/results/clientpositive/list_bucket_dml_5.q.java1.7.out @@ -481,7 +481,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/list_bucket_dml_9.q.java1.7.out ql/src/test/results/clientpositive/list_bucket_dml_9.q.java1.7.out index 6367611..a59dd00 100644 --- ql/src/test/results/clientpositive/list_bucket_dml_9.q.java1.7.out +++ ql/src/test/results/clientpositive/list_bucket_dml_9.q.java1.7.out @@ -848,7 +848,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 9e6e1a7..1a7253c 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 @@ -189,7 +189,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -349,7 +349,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -502,7 +502,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -656,7 +656,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 a74e1f5..dcd207b 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 @@ -187,7 +187,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -386,7 +386,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -559,7 +559,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 29a9bd9..0c56f93 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 @@ -305,7 +305,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -511,7 +511,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -614,7 +614,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -768,7 +768,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 01f673a..62abedc 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 @@ -242,7 +242,7 @@ STAGE PLANS: columns _col0 columns.types int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -389,7 +389,7 @@ STAGE PLANS: columns _col0 columns.types int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -532,7 +532,7 @@ STAGE PLANS: columns _col0 columns.types int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 6af6159..1d1c4d6 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 @@ -259,7 +259,7 @@ STAGE PLANS: columns _col0 columns.types int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -426,7 +426,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -653,7 +653,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -845,7 +845,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe 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 8133f55..9f90b55 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 @@ -270,7 +270,7 @@ STAGE PLANS: columns _col0 columns.types int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/louter_join_ppr.q.out ql/src/test/results/clientpositive/louter_join_ppr.q.out index dcc35e1..0f01afe 100644 --- ql/src/test/results/clientpositive/louter_join_ppr.q.out +++ ql/src/test/results/clientpositive/louter_join_ppr.q.out @@ -327,7 +327,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -803,7 +803,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1180,7 +1180,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1557,7 +1557,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out index 6d420da..23b822e 100644 --- ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out +++ ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out @@ -159,7 +159,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/metadataonly1.q.out ql/src/test/results/clientpositive/metadataonly1.q.out index ec708b9..fdf7662 100644 --- ql/src/test/results/clientpositive/metadataonly1.q.out +++ ql/src/test/results/clientpositive/metadataonly1.q.out @@ -57,7 +57,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -202,7 +202,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -343,7 +343,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -484,7 +484,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -934,7 +934,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1199,7 +1199,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1439,7 +1439,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1623,7 +1623,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1994,7 +1994,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/nested_complex_additional.q.out ql/src/test/results/clientpositive/nested_complex_additional.q.out new file mode 100644 index 0000000..9da9d2f --- /dev/null +++ ql/src/test/results/clientpositive/nested_complex_additional.q.out @@ -0,0 +1,72 @@ +PREHOOK: query: create table nestedcomplex_additional ( +simple_int int, +max_nested_array array>>>>>>>>>>>>>>>>>>>>>>>>, +max_nested_map array>>>>>>>>>>>>>>>>>>>>>>>>>, +max_nested_struct array>>>>>>>>>>>>>>>>>>>>>>>>>, +simple_string string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' +WITH SERDEPROPERTIES ( + 'hive.serialization.extend.additional.nesting.levels'='true', + 'line.delim'='\n' +) +PREHOOK: type: CREATETABLE +PREHOOK: Output: database:default +PREHOOK: Output: default@nestedcomplex_additional +POSTHOOK: query: create table nestedcomplex_additional ( +simple_int int, +max_nested_array array>>>>>>>>>>>>>>>>>>>>>>>>, +max_nested_map array>>>>>>>>>>>>>>>>>>>>>>>>>, +max_nested_struct array>>>>>>>>>>>>>>>>>>>>>>>>>, +simple_string string) +ROW FORMAT SERDE + 'org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe' +WITH SERDEPROPERTIES ( + 'hive.serialization.extend.additional.nesting.levels'='true', + 'line.delim'='\n' +) +POSTHOOK: type: CREATETABLE +POSTHOOK: Output: database:default +POSTHOOK: Output: default@nestedcomplex_additional +PREHOOK: query: describe nestedcomplex_additional +PREHOOK: type: DESCTABLE +PREHOOK: Input: default@nestedcomplex_additional +POSTHOOK: query: describe nestedcomplex_additional +POSTHOOK: type: DESCTABLE +POSTHOOK: Input: default@nestedcomplex_additional +simple_int int +max_nested_array array>>>>>>>>>>>>>>>>>>>>>>>> +max_nested_map array>>>>>>>>>>>>>>>>>>>>>>>>> +max_nested_struct array>>>>>>>>>>>>>>>>>>>>>>>>> +simple_string string +PREHOOK: query: describe extended nestedcomplex_additional +PREHOOK: type: DESCTABLE +PREHOOK: Input: default@nestedcomplex_additional +POSTHOOK: query: describe extended nestedcomplex_additional +POSTHOOK: type: DESCTABLE +POSTHOOK: Input: default@nestedcomplex_additional +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/nestedcomplex_additional.txt' overwrite into table nestedcomplex_additional +PREHOOK: type: LOAD +#### A masked pattern was here #### +PREHOOK: Output: default@nestedcomplex_additional +POSTHOOK: query: load data local inpath '../../data/files/nestedcomplex_additional.txt' overwrite into table nestedcomplex_additional +POSTHOOK: type: LOAD +#### A masked pattern was here #### +POSTHOOK: Output: default@nestedcomplex_additional +PREHOOK: query: select * from nestedcomplex_additional sort by simple_int +PREHOOK: type: QUERY +PREHOOK: Input: default@nestedcomplex_additional +#### A masked pattern was here #### +POSTHOOK: query: select * from nestedcomplex_additional sort by simple_int +POSTHOOK: type: QUERY +POSTHOOK: Input: default@nestedcomplex_additional +#### A masked pattern was here #### +1 [[[[[[[[[[[[[[[[[[[[[[[[[1,2,3]]]]]]]]]]]]]]]]]]]]]]]]] [[[[[[[[[[[[[[[[[[[[[[[[[{"k2":"v2","k1":"v1"}]]]]]]]]]]]]]]]]]]]]]]]]] [[[[[[[[[[[[[[[[[[[[[[[[[{"s":"a","i":10}]]]]]]]]]]]]]]]]]]]]]]]]] 100 +1 [[[[[[[[[[[[[[[[[[[[[[[[[1,2,3]]]]]]]]]]]]]]]]]]]]]]]]] [[[[[[[[[[[[[[[[[[[[[[[[[{"k2":"v2","k1":"v1"}]]]]]]]]]]]]]]]]]]]]]]]]] [[[[[[[[[[[[[[[[[[[[[[[[[{"s":"a","i":10}]]]]]]]]]]]]]]]]]]]]]]]]] 100 diff --git ql/src/test/results/clientpositive/optimize_nullscan.q.out ql/src/test/results/clientpositive/optimize_nullscan.q.out index 3bc06af..d785229 100644 --- ql/src/test/results/clientpositive/optimize_nullscan.q.out +++ ql/src/test/results/clientpositive/optimize_nullscan.q.out @@ -67,7 +67,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -202,7 +202,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -656,7 +656,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -865,7 +865,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -890,7 +890,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1630,7 +1630,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1849,7 +1849,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1884,7 +1884,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2134,7 +2134,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out index 25e549a..b6ca16f 100644 --- ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out +++ ql/src/test/results/clientpositive/outer_join_ppr.q.java1.7.out @@ -420,7 +420,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -801,7 +801,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/pcr.q.out ql/src/test/results/clientpositive/pcr.q.out index b136e56..d300a5f 100644 --- ql/src/test/results/clientpositive/pcr.q.out +++ ql/src/test/results/clientpositive/pcr.q.out @@ -235,7 +235,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -498,7 +498,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -763,7 +763,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -998,7 +998,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1281,7 +1281,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1574,7 +1574,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1820,7 +1820,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2025,7 +2025,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2316,7 +2316,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2603,7 +2603,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2865,7 +2865,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:string:string:int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3208,7 +3208,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:string:string:int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3578,7 +3578,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3895,7 +3895,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5349,7 +5349,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5576,7 +5576,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5799,7 +5799,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/ppd_join_filter.q.out ql/src/test/results/clientpositive/ppd_join_filter.q.out index b4329e4..e1a188f 100644 --- ql/src/test/results/clientpositive/ppd_join_filter.q.out +++ ql/src/test/results/clientpositive/ppd_join_filter.q.out @@ -375,7 +375,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -792,7 +792,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1209,7 +1209,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1626,7 +1626,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/ppd_union_view.q.out ql/src/test/results/clientpositive/ppd_union_view.q.out index 5ed89ba..78b03ea 100644 --- ql/src/test/results/clientpositive/ppd_union_view.q.out +++ ql/src/test/results/clientpositive/ppd_union_view.q.out @@ -353,7 +353,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -524,7 +524,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -549,7 +549,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/ppd_vc.q.out ql/src/test/results/clientpositive/ppd_vc.q.out index 4ef9cff..7e3953b 100644 --- ql/src/test/results/clientpositive/ppd_vc.q.out +++ ql/src/test/results/clientpositive/ppd_vc.q.out @@ -63,7 +63,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -773,7 +773,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4 columns.types string:string:string:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out index 9c4a537..0cb48be 100644 --- ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out +++ ql/src/test/results/clientpositive/ppr_allchildsarenull.q.out @@ -94,7 +94,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -326,7 +326,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/push_or.q.out ql/src/test/results/clientpositive/push_or.q.out index 7748cf1..28446c5 100644 --- ql/src/test/results/clientpositive/push_or.q.out +++ ql/src/test/results/clientpositive/push_or.q.out @@ -217,7 +217,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/rand_partitionpruner1.q.out ql/src/test/results/clientpositive/rand_partitionpruner1.q.out index e7ee621..90f17a7 100644 --- ql/src/test/results/clientpositive/rand_partitionpruner1.q.out +++ ql/src/test/results/clientpositive/rand_partitionpruner1.q.out @@ -60,7 +60,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/rand_partitionpruner3.q.out ql/src/test/results/clientpositive/rand_partitionpruner3.q.out index 5c0f95c..f3642d8 100644 --- ql/src/test/results/clientpositive/rand_partitionpruner3.q.out +++ ql/src/test/results/clientpositive/rand_partitionpruner3.q.out @@ -90,7 +90,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -254,7 +254,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/regexp_extract.q.out ql/src/test/results/clientpositive/regexp_extract.q.out index f26da69..84bae16 100644 --- ql/src/test/results/clientpositive/regexp_extract.q.out +++ ql/src/test/results/clientpositive/regexp_extract.q.out @@ -196,7 +196,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -511,7 +511,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/router_join_ppr.q.out ql/src/test/results/clientpositive/router_join_ppr.q.out index 24b9465..70d7542 100644 --- ql/src/test/results/clientpositive/router_join_ppr.q.out +++ ql/src/test/results/clientpositive/router_join_ppr.q.out @@ -426,7 +426,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -807,7 +807,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1184,7 +1184,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1557,7 +1557,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/sample10.q.out ql/src/test/results/clientpositive/sample10.q.out index e62620a..6495fb8 100644 --- ql/src/test/results/clientpositive/sample10.q.out +++ ql/src/test/results/clientpositive/sample10.q.out @@ -399,7 +399,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/sample6.q.out ql/src/test/results/clientpositive/sample6.q.out index 407c19e..dd8d288 100644 --- ql/src/test/results/clientpositive/sample6.q.out +++ ql/src/test/results/clientpositive/sample6.q.out @@ -727,7 +727,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1124,7 +1124,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1775,7 +1775,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2269,7 +2269,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2796,7 +2796,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3076,7 +3076,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3210,7 +3210,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/sample8.q.out ql/src/test/results/clientpositive/sample8.q.out index a032f18..3f3d3bc 100644 --- ql/src/test/results/clientpositive/sample8.q.out +++ ql/src/test/results/clientpositive/sample8.q.out @@ -346,7 +346,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/sample9.q.out ql/src/test/results/clientpositive/sample9.q.out index fb71d47..a8c2e82 100644 --- ql/src/test/results/clientpositive/sample9.q.out +++ ql/src/test/results/clientpositive/sample9.q.out @@ -77,7 +77,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/serde_user_properties.q.out ql/src/test/results/clientpositive/serde_user_properties.q.out index 47af4e8..ac3c135 100644 --- ql/src/test/results/clientpositive/serde_user_properties.q.out +++ ql/src/test/results/clientpositive/serde_user_properties.q.out @@ -140,7 +140,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -310,7 +310,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -488,7 +488,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/smb_mapjoin_11.q.out ql/src/test/results/clientpositive/smb_mapjoin_11.q.out index 6edb911..056c9f1 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_11.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_11.q.out @@ -1882,7 +1882,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2006,7 +2006,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/smb_mapjoin_13.q.out ql/src/test/results/clientpositive/smb_mapjoin_13.q.out index 93ce83b..bd28bbb 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_13.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_13.q.out @@ -226,7 +226,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -451,7 +451,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/smb_mapjoin_15.q.out ql/src/test/results/clientpositive/smb_mapjoin_15.q.out index 90efef8..2b6a62e 100644 --- ql/src/test/results/clientpositive/smb_mapjoin_15.q.out +++ ql/src/test/results/clientpositive/smb_mapjoin_15.q.out @@ -198,7 +198,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -454,7 +454,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:string:int:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -658,7 +658,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:string:int:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -901,7 +901,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:string:int:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out index 2b17830..13cfb1a 100644 --- ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out +++ ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out @@ -215,7 +215,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out index 9221daa..d5ae55e 100644 --- ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out +++ ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out @@ -299,7 +299,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out index cf4590c..c4aa11b 100644 --- ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out +++ ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out @@ -419,7 +419,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out index 63d2799..7b9a98d 100644 --- ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out +++ ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out @@ -601,7 +601,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out index 8be4230..3177b2f 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out @@ -305,7 +305,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -536,7 +536,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -858,7 +858,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_11.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_11.q.out index f4e889a..d34b1f7 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_11.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_11.q.out @@ -382,7 +382,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -713,7 +713,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1043,7 +1043,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1515,7 +1515,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out index db81850..8102ec1 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out @@ -610,7 +610,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out index 2d1b77c..e528a1a 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out @@ -285,7 +285,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -609,7 +609,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out index 7da4d3d..f4d9b06 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out @@ -236,7 +236,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -418,7 +418,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -740,7 +740,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out index 7dddad9f..2423eec 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out @@ -252,7 +252,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -434,7 +434,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -756,7 +756,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out index 220d310..732beb5 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out @@ -213,7 +213,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -385,7 +385,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -644,7 +644,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out index be1db6e..ff9b8e4 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out @@ -318,7 +318,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -551,7 +551,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -924,7 +924,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out index ee5cfd9..05b63c2 100644 --- ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out +++ ql/src/test/results/clientpositive/spark/auto_sortmerge_join_8.q.out @@ -318,7 +318,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -551,7 +551,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -926,7 +926,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out index 07e96fa..4e8ce0d 100644 --- ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out +++ ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out @@ -298,7 +298,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out index e9b552b..c0a3c3d 100644 --- ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out +++ ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out @@ -298,7 +298,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out index 8b5e8d4..174d7b2 100644 --- ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out +++ ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out @@ -348,7 +348,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -774,7 +774,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out index c16ef99..678ad54 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out @@ -480,7 +480,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out index fd32de9..95606f0 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out @@ -501,7 +501,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -909,7 +909,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out index c5ac610..d6c25e4 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out @@ -363,7 +363,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -653,7 +653,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out index 57a1e4e..14cdda2 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out @@ -360,7 +360,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -657,7 +657,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -953,7 +953,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1251,7 +1251,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out index 1cdcbd5..7bfe440 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out @@ -347,7 +347,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out index 13df3aa..4601eb1 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out @@ -329,7 +329,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -639,7 +639,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out index e2a3474..60bd103 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out @@ -326,7 +326,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -658,7 +658,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out index 899dd18..a09904e 100644 --- ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out +++ ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out @@ -320,7 +320,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -566,7 +566,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -803,7 +803,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1038,7 +1038,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1273,7 +1273,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1508,7 +1508,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1743,7 +1743,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1978,7 +1978,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2213,7 +2213,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out index 286c1c4..7c3c581 100644 --- ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out @@ -396,7 +396,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out index f80d02b..184eca9 100644 --- ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out +++ ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out @@ -3259,7 +3259,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4 columns.types string:bigint:string:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out index 96eb764..3923211 100644 --- ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out +++ ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out @@ -3350,7 +3350,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4 columns.types string:bigint:string:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out index d63b4f8..7b527e2 100644 --- ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out +++ ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out @@ -337,7 +337,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -696,7 +696,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1069,7 +1069,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1523,7 +1523,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7 columns.types int:int:int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1971,7 +1971,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7 columns.types int:int:int:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out index fbc992c..78cd4bc 100644 --- ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out +++ ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out @@ -331,7 +331,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -811,7 +811,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1290,7 +1290,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1675,7 +1675,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out index 65a7d06..7089004 100644 --- ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out +++ ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out @@ -264,7 +264,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out index 61ab311..ac07d58 100644 --- ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out +++ ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out @@ -134,7 +134,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -535,7 +535,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -952,7 +952,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -979,7 +979,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1383,7 +1383,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1532,7 +1532,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1674,7 +1674,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1910,7 +1910,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out index 1dd6822..227886b 100644 --- ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out +++ ql/src/test/results/clientpositive/spark/outer_join_ppr.q.java1.7.out @@ -424,7 +424,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -895,7 +895,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out index fbbd17c..217fe76 100644 --- ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out +++ ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out @@ -422,7 +422,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -893,7 +893,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/pcr.q.out ql/src/test/results/clientpositive/spark/pcr.q.out index 0489117..4c22f0b 100644 --- ql/src/test/results/clientpositive/spark/pcr.q.out +++ ql/src/test/results/clientpositive/spark/pcr.q.out @@ -241,7 +241,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -510,7 +510,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -781,7 +781,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1022,7 +1022,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1311,7 +1311,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1610,7 +1610,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1862,7 +1862,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2073,7 +2073,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2370,7 +2370,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2663,7 +2663,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2936,7 +2936,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:string:string:int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3244,7 +3244,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:string:string:int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3620,7 +3620,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3943,7 +3943,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4717,7 +4717,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4950,7 +4950,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5179,7 +5179,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out index cfb0a11..0cbd718 100644 --- ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out +++ ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out @@ -324,7 +324,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -698,7 +698,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1072,7 +1072,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1446,7 +1446,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/router_join_ppr.q.out ql/src/test/results/clientpositive/spark/router_join_ppr.q.out index fcb20ba..36af99a 100644 --- ql/src/test/results/clientpositive/spark/router_join_ppr.q.out +++ ql/src/test/results/clientpositive/spark/router_join_ppr.q.out @@ -430,7 +430,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -815,7 +815,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1196,7 +1196,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1671,7 +1671,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/sample10.q.out ql/src/test/results/clientpositive/spark/sample10.q.out index 9a90ebd..b63718b 100644 --- ql/src/test/results/clientpositive/spark/sample10.q.out +++ ql/src/test/results/clientpositive/spark/sample10.q.out @@ -358,7 +358,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/sample6.q.out ql/src/test/results/clientpositive/spark/sample6.q.out index 362608e..47da933 100644 --- ql/src/test/results/clientpositive/spark/sample6.q.out +++ ql/src/test/results/clientpositive/spark/sample6.q.out @@ -578,7 +578,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -981,7 +981,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1638,7 +1638,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2138,7 +2138,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2671,7 +2671,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2957,7 +2957,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3097,7 +3097,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/sample8.q.out ql/src/test/results/clientpositive/spark/sample8.q.out index 5d8e5bb..65fab26 100644 --- ql/src/test/results/clientpositive/spark/sample8.q.out +++ ql/src/test/results/clientpositive/spark/sample8.q.out @@ -405,7 +405,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out index a95a935..7786da1 100644 --- ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out +++ ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out @@ -238,7 +238,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -524,7 +524,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out index 3f7be95..70e3077 100644 --- ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out +++ ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out @@ -210,7 +210,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types int:string:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -478,7 +478,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:string:int:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -694,7 +694,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:string:int:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1001,7 +1001,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types int:int:string:int:int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/sort_merge_join_desc_5.q.out ql/src/test/results/clientpositive/spark/sort_merge_join_desc_5.q.out index 9f4fbd8..54ff1af 100644 --- ql/src/test/results/clientpositive/spark/sort_merge_join_desc_5.q.out +++ ql/src/test/results/clientpositive/spark/sort_merge_join_desc_5.q.out @@ -230,7 +230,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/sort_merge_join_desc_6.q.out ql/src/test/results/clientpositive/spark/sort_merge_join_desc_6.q.out index d746871..0ebdba2 100644 --- ql/src/test/results/clientpositive/spark/sort_merge_join_desc_6.q.out +++ ql/src/test/results/clientpositive/spark/sort_merge_join_desc_6.q.out @@ -320,7 +320,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/sort_merge_join_desc_7.q.out ql/src/test/results/clientpositive/spark/sort_merge_join_desc_7.q.out index 6461df8..50ab13f 100644 --- ql/src/test/results/clientpositive/spark/sort_merge_join_desc_7.q.out +++ ql/src/test/results/clientpositive/spark/sort_merge_join_desc_7.q.out @@ -440,7 +440,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/transform_ppr1.q.out ql/src/test/results/clientpositive/spark/transform_ppr1.q.out index 0f5f115..415afd1 100644 --- ql/src/test/results/clientpositive/spark/transform_ppr1.q.out +++ ql/src/test/results/clientpositive/spark/transform_ppr1.q.out @@ -354,7 +354,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/transform_ppr2.q.out ql/src/test/results/clientpositive/spark/transform_ppr2.q.out index 704b092..9c21be2 100644 --- ql/src/test/results/clientpositive/spark/transform_ppr2.q.out +++ ql/src/test/results/clientpositive/spark/transform_ppr2.q.out @@ -262,7 +262,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/union_ppr.q.out ql/src/test/results/clientpositive/spark/union_ppr.q.out index 61e557b..489a50c 100644 --- ql/src/test/results/clientpositive/spark/union_ppr.q.out +++ ql/src/test/results/clientpositive/spark/union_ppr.q.out @@ -374,7 +374,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out index 0c510a2..b10b92b 100644 --- ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out +++ ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out @@ -340,7 +340,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -717,7 +717,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -926,7 +926,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1203,7 +1203,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1492,7 +1492,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1816,7 +1816,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2129,7 +2129,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types int:string:string:string:string:int:string:double:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2420,7 +2420,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types int:string:string:string:string:int:string:double:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2688,7 +2688,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2965,7 +2965,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3245,7 +3245,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3554,7 +3554,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3864,7 +3864,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:bigint:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4341,7 +4341,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types string:string:int:int:bigint:double:double:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4581,7 +4581,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4877,7 +4877,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5862,7 +5862,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -6237,7 +6237,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -6578,7 +6578,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -6950,7 +6950,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -7336,7 +7336,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:bigint:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -7688,7 +7688,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:bigint:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out index aed93b5..933d24b 100644 --- ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out +++ ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out @@ -215,7 +215,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types struct:struct:struct escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out index 0854036..f05295e 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out @@ -379,7 +379,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -684,7 +684,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -989,7 +989,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out index b639547..a555700 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out @@ -372,7 +372,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -682,7 +682,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -991,7 +991,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1435,7 +1435,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out index 05b96be..7d66a04 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out @@ -598,7 +598,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out index c3bf80b..7997c4d 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out @@ -359,7 +359,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -666,7 +666,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out index 605c207..d6ed0c5 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out @@ -359,7 +359,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -664,7 +664,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -969,7 +969,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out index 0a0e66e..5fb23bb 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out @@ -375,7 +375,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -680,7 +680,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -985,7 +985,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out index a33f86e..e285b28 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out @@ -269,7 +269,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -497,7 +497,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -739,7 +739,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out index 41ee47a..5f8eacf 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out @@ -441,7 +441,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -797,7 +797,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1153,7 +1153,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out index a28af9c..92eef8f 100644 --- ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out +++ ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out @@ -441,7 +441,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -797,7 +797,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1155,7 +1155,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out index a309a87..06f1ca4 100644 --- ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out +++ ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out @@ -398,7 +398,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out index e11c050..fb34588 100644 --- ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out +++ ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out @@ -192,7 +192,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/metadataonly1.q.out ql/src/test/results/clientpositive/tez/metadataonly1.q.out index e017da3..a595c4c 100644 --- ql/src/test/results/clientpositive/tez/metadataonly1.q.out +++ ql/src/test/results/clientpositive/tez/metadataonly1.q.out @@ -63,7 +63,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -214,7 +214,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -361,7 +361,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -508,7 +508,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -859,7 +859,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1164,7 +1164,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1410,7 +1410,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1600,7 +1600,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1977,7 +1977,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out index 67ccb38..22e8655 100644 --- ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out +++ ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out @@ -131,7 +131,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -533,7 +533,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -950,7 +950,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -977,7 +977,7 @@ STAGE PLANS: columns _col0 columns.types bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1384,7 +1384,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1534,7 +1534,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1680,7 +1680,7 @@ STAGE PLANS: columns _col0 columns.types string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1919,7 +1919,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/transform_ppr1.q.out ql/src/test/results/clientpositive/tez/transform_ppr1.q.out index a76bd0f..f2d3943 100644 --- ql/src/test/results/clientpositive/tez/transform_ppr1.q.out +++ ql/src/test/results/clientpositive/tez/transform_ppr1.q.out @@ -354,7 +354,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/transform_ppr2.q.out ql/src/test/results/clientpositive/tez/transform_ppr2.q.out index 0b59a9c..02187fe 100644 --- ql/src/test/results/clientpositive/tez/transform_ppr2.q.out +++ ql/src/test/results/clientpositive/tez/transform_ppr2.q.out @@ -262,7 +262,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out index 457ad9e..2bc8bc5 100644 --- ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out +++ ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out @@ -340,7 +340,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -718,7 +718,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -927,7 +927,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1204,7 +1204,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1493,7 +1493,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1817,7 +1817,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2131,7 +2131,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types int:string:string:string:string:int:string:double:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2423,7 +2423,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types int:string:string:string:string:int:string:double:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2691,7 +2691,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2968,7 +2968,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3248,7 +3248,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3557,7 +3557,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3867,7 +3867,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:bigint:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4345,7 +4345,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types string:string:int:int:bigint:double:double:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4585,7 +4585,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4881,7 +4881,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5860,7 +5860,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -6235,7 +6235,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -6576,7 +6576,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -6948,7 +6948,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -7334,7 +7334,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:bigint:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -7686,7 +7686,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:bigint:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/transform_ppr1.q.out ql/src/test/results/clientpositive/transform_ppr1.q.out index 4e00546..99f7373 100644 --- ql/src/test/results/clientpositive/transform_ppr1.q.out +++ ql/src/test/results/clientpositive/transform_ppr1.q.out @@ -348,7 +348,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/transform_ppr2.q.out ql/src/test/results/clientpositive/transform_ppr2.q.out index 9811313..2549e7f 100644 --- ql/src/test/results/clientpositive/transform_ppr2.q.out +++ ql/src/test/results/clientpositive/transform_ppr2.q.out @@ -256,7 +256,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out index e8a4fc2..393e02a 100644 --- ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out +++ ql/src/test/results/clientpositive/truncate_column_list_bucket.q.out @@ -127,7 +127,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -266,7 +266,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/udf_explode.q.out ql/src/test/results/clientpositive/udf_explode.q.out index 6ba82f0..21f5aa2 100644 --- ql/src/test/results/clientpositive/udf_explode.q.out +++ ql/src/test/results/clientpositive/udf_explode.q.out @@ -218,7 +218,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -492,7 +492,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/udtf_explode.q.out ql/src/test/results/clientpositive/udtf_explode.q.out index 892b2bd..f89ec97 100644 --- ql/src/test/results/clientpositive/udtf_explode.q.out +++ ql/src/test/results/clientpositive/udtf_explode.q.out @@ -284,7 +284,7 @@ STAGE PLANS: columns _col0,_col1 columns.types int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -594,7 +594,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types int:string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/union24.q.out ql/src/test/results/clientpositive/union24.q.out index 842e4a4..af885bc 100644 --- ql/src/test/results/clientpositive/union24.q.out +++ ql/src/test/results/clientpositive/union24.q.out @@ -320,7 +320,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -355,7 +355,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -390,7 +390,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -415,7 +415,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -969,7 +969,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1004,7 +1004,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1029,7 +1029,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1598,7 +1598,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1633,7 +1633,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1658,7 +1658,7 @@ STAGE PLANS: columns _col0,_col1 columns.types string:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/union_ppr.q.out ql/src/test/results/clientpositive/union_ppr.q.out index 26f353b..f5509ab 100644 --- ql/src/test/results/clientpositive/union_ppr.q.out +++ ql/src/test/results/clientpositive/union_ppr.q.out @@ -282,7 +282,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:string:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git ql/src/test/results/clientpositive/vectorized_ptf.q.out ql/src/test/results/clientpositive/vectorized_ptf.q.out index 0a0c896..b532ce7 100644 --- ql/src/test/results/clientpositive/vectorized_ptf.q.out +++ ql/src/test/results/clientpositive/vectorized_ptf.q.out @@ -381,7 +381,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -794,7 +794,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -997,7 +997,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1315,7 +1315,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1645,7 +1645,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2056,7 +2056,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2403,7 +2403,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types int:string:string:string:string:int:string:double:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -2749,7 +2749,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types int:string:string:string:string:int:string:double:string escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3037,7 +3037,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3355,7 +3355,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -3676,7 +3676,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4073,7 +4073,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4424,7 +4424,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:bigint:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -4982,7 +4982,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6,_col7,_col8 columns.types string:string:int:int:bigint:double:double:int:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5263,7 +5263,7 @@ STAGE PLANS: columns _col0,_col1,_col2 columns.types string:string:int escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -5645,7 +5645,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3 columns.types string:string:double:double escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -6843,7 +6843,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -7353,7 +7353,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -7782,7 +7782,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -8289,7 +8289,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5 columns.types string:string:int:int:int:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -8763,7 +8763,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:bigint:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -9203,7 +9203,7 @@ STAGE PLANS: columns _col0,_col1,_col2,_col3,_col4,_col5,_col6 columns.types string:string:int:int:int:bigint:bigint escape.delim \ - hive.serialization.extend.nesting.levels true + hive.serialization.extend.additional.nesting.levels true serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe diff --git serde/src/java/org/apache/hadoop/hive/serde2/SerDeParameters.java serde/src/java/org/apache/hadoop/hive/serde2/SerDeParameters.java new file mode 100644 index 0000000..4202db9 --- /dev/null +++ serde/src/java/org/apache/hadoop/hive/serde2/SerDeParameters.java @@ -0,0 +1,247 @@ +package org.apache.hadoop.hive.serde2; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hive.conf.HiveConf.ConfVars; +import org.apache.hadoop.hive.serde.serdeConstants; +import org.apache.hadoop.hive.serde2.lazy.LazyUtils; +import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParameters; +import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; +import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; +import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; +import org.apache.hadoop.io.Text; +import org.apache.hive.common.util.HiveStringUtils; + +/** + * SerDeParameters. + * + */ +public class SerDeParameters implements LazyObjectInspectorParameters { + public static final byte[] DefaultSeparators = {(byte) 1, (byte) 2, (byte) 3}; + public static final String SERIALIZATION_EXTEND_NESTING_LEVELS + = "hive.serialization.extend.nesting.levels"; + public static final String SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS + = "hive.serialization.extend.additional.nesting.levels"; + + private Properties tableProperties; + private String serdeName; + + // The list of bytes used for the separators in the column (a nested struct + // such as Array> will use multiple separators). + // The list of separators + escapeChar are the bytes required to be escaped. + private byte[] separators; + + private String nullString; + private Text nullSequence; + private TypeInfo rowTypeInfo; + private boolean lastColumnTakesRest; + private List columnNames; + private List columnTypes; + + private boolean escaped; + private byte escapeChar; + // The map from the byte to the flag indicating if the byte needs escape + private Map needsEscape = new HashMap(); + + private boolean extendedBooleanLiteral; + List timestampFormats; + + public SerDeParameters(Configuration job, Properties tbl, String serdeName) throws SerDeException { + this.tableProperties = tbl; + this.serdeName = serdeName; + + nullString = tbl.getProperty( + serdeConstants.SERIALIZATION_NULL_FORMAT, "\\N"); + nullSequence = new Text(nullString); + + String lastColumnTakesRestString = tbl + .getProperty(serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST); + lastColumnTakesRest = (lastColumnTakesRestString != null && lastColumnTakesRestString + .equalsIgnoreCase("true")); + + extractColumnInfo(); + + // Create the LazyObject for storing the rows + rowTypeInfo = TypeInfoFactory.getStructTypeInfo(columnNames, columnTypes); + + collectSeparators(tbl); + + // Get the escape information + String escapeProperty = tbl.getProperty(serdeConstants.ESCAPE_CHAR); + escaped = (escapeProperty != null); + if (escaped) { + escapeChar = LazyUtils.getByte(escapeProperty, (byte) '\\'); + needsEscape.put(escapeChar, true); + for (byte b : separators) { + needsEscape.put(b, true); + } + } + + extendedBooleanLiteral = (job == null ? false : + job.getBoolean(ConfVars.HIVE_LAZYSIMPLE_EXTENDED_BOOLEAN_LITERAL.varname, false)); + + String[] timestampFormatsArray = + HiveStringUtils.splitAndUnEscape(tbl.getProperty(serdeConstants.TIMESTAMP_FORMATS)); + if (timestampFormatsArray != null) { + timestampFormats = Arrays.asList(timestampFormatsArray); + } + } + + /** + * Extracts and set column names and column types from the table properties + * @throws SerDeException + */ + public void extractColumnInfo() throws SerDeException { + // Read the configuration parameters + String columnNameProperty = tableProperties.getProperty(serdeConstants.LIST_COLUMNS); + // NOTE: if "columns.types" is missing, all columns will be of String type + String columnTypeProperty = tableProperties.getProperty(serdeConstants.LIST_COLUMN_TYPES); + + // Parse the configuration parameters + + if (columnNameProperty != null && columnNameProperty.length() > 0) { + columnNames = Arrays.asList(columnNameProperty.split(",")); + } else { + columnNames = new ArrayList(); + } + if (columnTypeProperty == null) { + // Default type: all string + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < columnNames.size(); i++) { + if (i > 0) { + sb.append(":"); + } + sb.append(serdeConstants.STRING_TYPE_NAME); + } + columnTypeProperty = sb.toString(); + } + + columnTypes = TypeInfoUtils.getTypeInfosFromTypeString(columnTypeProperty); + + if (columnNames.size() != columnTypes.size()) { + throw new SerDeException(serdeName + ": columns has " + columnNames.size() + + " elements while columns.types has " + columnTypes.size() + " elements!"); + } + } + + public List getColumnTypes() { + return columnTypes; + } + + public List getColumnNames() { + return columnNames; + } + + public byte[] getSeparators() { + return separators; + } + + public String getNullString() { + return nullString; + } + + public Text getNullSequence() { + return nullSequence; + } + + public TypeInfo getRowTypeInfo() { + return rowTypeInfo; + } + + public boolean isLastColumnTakesRest() { + return lastColumnTakesRest; + } + + public boolean isEscaped() { + return escaped; + } + + public byte getEscapeChar() { + return escapeChar; + } + + public Map getNeedsEscape() { + return needsEscape; + } + + public boolean isExtendedBooleanLiteral() { + return extendedBooleanLiteral; + } + + public List getTimestampFormats() { + return timestampFormats; + } + + public void setSeparator(int index, byte separator) throws SerDeException { + if (index < 0 || index >= separators.length) { + throw new SerDeException("Invalid separator array index value: " + index); + } + + separators[index] = separator; + } + + /** + * To be backward-compatible, initialize the first 3 separators to + * be the given values from the table properties. The default number of separators is 8; if only + * hive.serialization.extend.nesting.levels is set, the number of + * separators is extended to 24; if hive.serialization.extend.additional.nesting.levels + * is set, the number of separators is extended to 154. + * @param tableProperties table properties to extract the user provided separators + */ + private void collectSeparators(Properties tableProperties) { + List separatorCandidates = new ArrayList(); + + String extendNestingValue = tableProperties.getProperty(SERIALIZATION_EXTEND_NESTING_LEVELS); + String extendAdditionalNestingValue = tableProperties.getProperty(SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS); + boolean extendedNesting = extendNestingValue != null && extendNestingValue.equalsIgnoreCase("true"); + boolean extendedAdditionalNesting = extendAdditionalNestingValue != null + && extendAdditionalNestingValue.equalsIgnoreCase("true"); + + separatorCandidates.add(LazyUtils.getByte(tableProperties.getProperty(serdeConstants.FIELD_DELIM, + tableProperties.getProperty(serdeConstants.SERIALIZATION_FORMAT)), DefaultSeparators[0])); + separatorCandidates.add(LazyUtils.getByte(tableProperties + .getProperty(serdeConstants.COLLECTION_DELIM), DefaultSeparators[1])); + separatorCandidates.add(LazyUtils.getByte( + tableProperties.getProperty(serdeConstants.MAPKEY_DELIM), DefaultSeparators[2])); + + //use only control chars that are very unlikely to be part of the string + // the following might/likely to be used in text files for strings + // 9 (horizontal tab, HT, \t, ^I) + // 10 (line feed, LF, \n, ^J), + // 12 (form feed, FF, \f, ^L), + // 13 (carriage return, CR, \r, ^M), + // 27 (escape, ESC, \e [GCC only], ^[). + for (byte b = 4; b <= 8; b++ ) { + separatorCandidates.add(b); + } + separatorCandidates.add((byte)11); + for (byte b = 14; b <= 26; b++ ) { + separatorCandidates.add(b); + } + for (byte b = 28; b <= 31; b++ ) { + separatorCandidates.add(b); + } + + for (byte b = -128; b <= -1; b++ ) { + separatorCandidates.add(b); + } + + int numSeparators = 8; + if(extendedAdditionalNesting) { + numSeparators = separatorCandidates.size(); + } else if (extendedNesting) { + numSeparators = 24; + } + + separators = new byte[numSeparators]; + for (int i = 0; i < numSeparators; i++) { + separators[i] = separatorCandidates.get(i); + } + } +} diff --git serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java index 819913b..99c1096 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java @@ -29,19 +29,17 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.ColumnProjectionUtils; -import org.apache.hadoop.hive.serde2.SerDe; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeSpec; import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.lazy.LazyFactory; import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; -import org.apache.hadoop.hive.serde2.lazy.objectinspector.primitive.LazyObjectInspectorParametersImpl; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.typeinfo.StructTypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import org.apache.hadoop.io.Writable; @@ -60,7 +58,9 @@ serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST, serdeConstants.ESCAPE_CHAR, serdeConstants.SERIALIZATION_ENCODING, - LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS}) + SerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, + SerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS + }) public class ColumnarSerDe extends ColumnarSerDeBase { @Override @@ -92,7 +92,7 @@ public ColumnarSerDe() throws SerDeException { @Override public void initialize(Configuration conf, Properties tbl) throws SerDeException { - serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, getClass().getName()); + serdeParams = new SerDeParameters(conf, tbl, getClass().getName()); // Create the ObjectInspectors for the fields. Note: Currently // ColumnarObject uses same ObjectInpector as LazyStruct diff --git serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java index 87952a1..893e14f 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyBinaryColumnarSerDe.java @@ -26,8 +26,7 @@ import org.apache.hadoop.hive.serde2.ColumnProjectionUtils; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeSpec; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; -import org.apache.hadoop.hive.serde2.lazy.LazyUtils; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryFactory; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; @@ -63,8 +62,8 @@ public String toString() { @Override public void initialize(Configuration conf, Properties tbl) throws SerDeException { - SerDeParameters serdeParams = new SerDeParameters(); - LazyUtils.extractColumnInfo(tbl, serdeParams, getClass().getName()); + SerDeParameters serdeParams = new SerDeParameters(conf, tbl, getClass().getName()); + columnNames = serdeParams.getColumnNames(); columnTypes = serdeParams.getColumnTypes(); diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java index 7ebe182..864d9aa 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyFactory.java @@ -220,9 +220,9 @@ */ @Deprecated public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, - byte[] separator, int separatorIndex, Text nullSequence, boolean escaped, + byte[] separators, int separatorIndex, Text nullSequence, boolean escaped, byte escapeChar, ObjectInspectorOptions option) throws SerDeException { - return createLazyObjectInspector(typeInfo, separator, separatorIndex, nullSequence, + return createLazyObjectInspector(typeInfo, separators, separatorIndex, nullSequence, escaped, escapeChar, false, option); } @@ -245,9 +245,9 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, */ @Deprecated public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, - byte[] separator, int separatorIndex, Text nullSequence, boolean escaped, + byte[] separators, int separatorIndex, Text nullSequence, boolean escaped, byte escapeChar) throws SerDeException { - return createLazyObjectInspector(typeInfo, separator, separatorIndex, nullSequence, + return createLazyObjectInspector(typeInfo, separators, separatorIndex, nullSequence, escaped, escapeChar, false, ObjectInspectorOptions.JAVA); } @@ -267,9 +267,9 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, */ @Deprecated public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, - byte[] separator, int separatorIndex, Text nullSequence, boolean escaped, + byte[] separators, int separatorIndex, Text nullSequence, boolean escaped, byte escapeChar, boolean extendedBooleanLiteral) throws SerDeException { - return createLazyObjectInspector(typeInfo, separator, separatorIndex, nullSequence, escaped, + return createLazyObjectInspector(typeInfo, separators, separatorIndex, nullSequence, escaped, escapeChar, extendedBooleanLiteral, ObjectInspectorOptions.JAVA); } @@ -289,10 +289,10 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, */ @Deprecated public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, - byte[] separator, int separatorIndex, Text nullSequence, boolean escaped, + byte[] separators, int separatorIndex, Text nullSequence, boolean escaped, byte escapeChar, boolean extendedBooleanLiteral, ObjectInspectorOptions option) throws SerDeException { LazyObjectInspectorParametersImpl lazyParams = new LazyObjectInspectorParametersImpl( - escaped, escapeChar, extendedBooleanLiteral, null, separator, nullSequence); + escaped, escapeChar, extendedBooleanLiteral, null, separators, nullSequence); return createLazyObjectInspector(typeInfo, separatorIndex, lazyParams, option); } @@ -332,7 +332,7 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, .getListElementTypeInfo(), separatorIndex + 1, lazyParams, option), LazyUtils.getSeparator(lazyParams.getSeparators(), separatorIndex), lazyParams); - case STRUCT: + case STRUCT: StructTypeInfo structTypeInfo = (StructTypeInfo) typeInfo; List fieldNames = structTypeInfo.getAllStructFieldNames(); List fieldTypeInfos = structTypeInfo @@ -347,7 +347,7 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, fieldNames, fieldObjectInspectors, null, LazyUtils.getSeparator(lazyParams.getSeparators(), separatorIndex), lazyParams, option); - case UNION: + case UNION: UnionTypeInfo unionTypeInfo = (UnionTypeInfo) typeInfo; List lazyOIs = new ArrayList(); for (TypeInfo uti : unionTypeInfo.getAllUnionObjectTypeInfos()) { @@ -357,7 +357,7 @@ public static ObjectInspector createLazyObjectInspector(TypeInfo typeInfo, return LazyObjectInspectorFactory.getLazyUnionObjectInspector(lazyOIs, LazyUtils.getSeparator(lazyParams.getSeparators(), separatorIndex), lazyParams); - } + } throw new RuntimeException("Hive LazySerDe Internal error."); } @@ -396,7 +396,7 @@ public static ObjectInspector createLazyStructInspector( */ @Deprecated public static ObjectInspector createLazyStructInspector( - List columnNames, List typeInfos, byte[] separators, + List columnNames, List typeInfos, byte[] separators, Text nullSequence, boolean lastColumnTakesRest, boolean escaped, byte escapeChar, boolean extendedBooleanLiteral) throws SerDeException { LazyObjectInspectorParametersImpl lazyParams = new LazyObjectInspectorParametersImpl( diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java index d25c2ff..f726a78 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java @@ -19,13 +19,14 @@ package org.apache.hadoop.hive.serde2.lazy; import java.io.IOException; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; +import org.apache.commons.lang.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -33,8 +34,8 @@ import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.AbstractEncodingAwareSerDe; import org.apache.hadoop.hive.serde2.ByteStream; -import org.apache.hadoop.hive.serde2.SerDe; import org.apache.hadoop.hive.serde2.SerDeException; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.SerDeSpec; import org.apache.hadoop.hive.serde2.SerDeStats; import org.apache.hadoop.hive.serde2.SerDeUtils; @@ -58,6 +59,7 @@ import org.apache.hadoop.io.Writable; import org.apache.hive.common.util.HiveStringUtils; + /** * LazySimpleSerDe can be used to read the same data format as * MetadataTypedColumnsetSerDe and TCTLSeparatedProtocol. @@ -75,16 +77,15 @@ serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST, serdeConstants.ESCAPE_CHAR, serdeConstants.SERIALIZATION_ENCODING, - LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS}) + SerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, + SerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS + }) public class LazySimpleSerDe extends AbstractEncodingAwareSerDe { public static final Log LOG = LogFactory.getLog(LazySimpleSerDe.class .getName()); - public static final String SERIALIZATION_EXTEND_NESTING_LEVELS - = "hive.serialization.extend.nesting.levels"; - - public static final byte[] DefaultSeparators = {(byte) 1, (byte) 2, (byte) 3}; + private SerDeParameters serdeParams = null; private ObjectInspector cachedObjectInspector; @@ -97,11 +98,11 @@ public String toString() { return getClass().toString() + "[" - + Arrays.asList(serdeParams.separators) + + Arrays.asList(serdeParams.getSeparators()) + ":" - + ((StructTypeInfo) serdeParams.rowTypeInfo).getAllStructFieldNames() + + ((StructTypeInfo) serdeParams.getRowTypeInfo()).getAllStructFieldNames() + ":" - + ((StructTypeInfo) serdeParams.rowTypeInfo) + + ((StructTypeInfo) serdeParams.getRowTypeInfo()) .getAllStructFieldTypeInfos() + "]"; } @@ -109,100 +110,6 @@ public LazySimpleSerDe() throws SerDeException { } /** - * Return the byte value of the number string. - * - * @param altValue - * The string containing a number. - * @param defaultVal - * If the altValue does not represent a number, return the - * defaultVal. - */ - public static byte getByte(String altValue, byte defaultVal) { - if (altValue != null && altValue.length() > 0) { - try { - return Byte.valueOf(altValue).byteValue(); - } catch (NumberFormatException e) { - return (byte) altValue.charAt(0); - } - } - return defaultVal; - } - - /** - * SerDeParameters. - * - */ - public static class SerDeParameters implements LazyObjectInspectorParameters { - byte[] separators = DefaultSeparators; - String nullString; - Text nullSequence; - TypeInfo rowTypeInfo; - boolean lastColumnTakesRest; - List columnNames; - List columnTypes; - - boolean escaped; - byte escapeChar; - boolean[] needsEscape; - - boolean extendedBooleanLiteral; - List timestampFormats; - - public SerDeParameters() { - } - - public List getColumnTypes() { - return columnTypes; - } - - public List getColumnNames() { - return columnNames; - } - - public byte[] getSeparators() { - return separators; - } - - public String getNullString() { - return nullString; - } - - public Text getNullSequence() { - return nullSequence; - } - - public TypeInfo getRowTypeInfo() { - return rowTypeInfo; - } - - public boolean isLastColumnTakesRest() { - return lastColumnTakesRest; - } - - public boolean isEscaped() { - return escaped; - } - - public byte getEscapeChar() { - return escapeChar; - } - - public boolean[] getNeedsEscape() { - return needsEscape; - } - - public boolean isExtendedBooleanLiteral() { - return extendedBooleanLiteral; - } - - public List getTimestampFormats() { - return timestampFormats; - } - } - - SerDeParameters serdeParams = null; - - /** * Initialize the SerDe given the parameters. serialization.format: separator * char or byte code (only supports byte-value up to 127) columns: * ","-separated column names columns.types: ",", ":", or ";"-separated column @@ -216,8 +123,7 @@ public void initialize(Configuration job, Properties tbl) super.initialize(job, tbl); - serdeParams = LazySimpleSerDe.initSerdeParams(job, tbl, getClass() - .getName()); + serdeParams = new SerDeParameters(job, tbl, getClass().getName()); // Create the ObjectInspectors for the fields cachedObjectInspector = LazyFactory.createLazyStructInspector(serdeParams @@ -227,10 +133,10 @@ public void initialize(Configuration job, Properties tbl) .createLazyObject(cachedObjectInspector); LOG.debug(getClass().getName() + " initialized with: columnNames=" - + serdeParams.columnNames + " columnTypes=" + serdeParams.columnTypes - + " separator=" + Arrays.asList(serdeParams.separators) - + " nullstring=" + serdeParams.nullString + " lastColumnTakesRest=" - + serdeParams.lastColumnTakesRest + " timestampFormats=" + serdeParams.timestampFormats); + + serdeParams.getColumnNames() + " columnTypes=" + serdeParams.getColumnTypes() + + " separator=" + Arrays.asList(serdeParams.getSeparators()) + + " nullstring=" + serdeParams.getNullString() + " lastColumnTakesRest=" + + serdeParams.isLastColumnTakesRest() + " timestampFormats=" + serdeParams.getTimestampFormats()); serializedSize = 0; stats = new SerDeStats(); @@ -238,115 +144,6 @@ public void initialize(Configuration job, Properties tbl) lastOperationDeserialize = false; } - public static SerDeParameters initSerdeParams(Configuration job, - Properties tbl, String serdeName) throws SerDeException { - SerDeParameters serdeParams = new SerDeParameters(); - // Read the separators: We use 8 levels of separators by default, - // and 24 if SERIALIZATION_EXTEND_NESTING_LEVELS is set to true - // The levels possible are the set of control chars that we can use as - // special delimiters, ie they should absent in the data or escaped. - // To increase this level further, we need to stop relying - // on single control chars delimiters - - serdeParams.separators = new byte[8]; - serdeParams.separators[0] = getByte(tbl.getProperty(serdeConstants.FIELD_DELIM, - tbl.getProperty(serdeConstants.SERIALIZATION_FORMAT)), DefaultSeparators[0]); - serdeParams.separators[1] = getByte(tbl - .getProperty(serdeConstants.COLLECTION_DELIM), DefaultSeparators[1]); - serdeParams.separators[2] = getByte( - tbl.getProperty(serdeConstants.MAPKEY_DELIM), DefaultSeparators[2]); - String extendedNesting = - tbl.getProperty(SERIALIZATION_EXTEND_NESTING_LEVELS); - if(extendedNesting == null || !extendedNesting.equalsIgnoreCase("true")){ - //use the default smaller set of separators for backward compatibility - for (int i = 3; i < serdeParams.separators.length; i++) { - serdeParams.separators[i] = (byte) (i + 1); - } - } - else{ - //If extended nesting is enabled, set the extended set of separator chars - - final int MAX_CTRL_CHARS = 29; - byte[] extendedSeparators = new byte[MAX_CTRL_CHARS]; - int extendedSeparatorsIdx = 0; - - //get the first 3 separators that have already been set (defaults to 1,2,3) - for(int i = 0; i < 3; i++){ - extendedSeparators[extendedSeparatorsIdx++] = serdeParams.separators[i]; - } - - for (byte asciival = 4; asciival <= MAX_CTRL_CHARS; asciival++) { - - //use only control chars that are very unlikely to be part of the string - // the following might/likely to be used in text files for strings - // 9 (horizontal tab, HT, \t, ^I) - // 10 (line feed, LF, \n, ^J), - // 12 (form feed, FF, \f, ^L), - // 13 (carriage return, CR, \r, ^M), - // 27 (escape, ESC, \e [GCC only], ^[). - - //reserving the following values for future dynamic level impl - // 30 - // 31 - - switch(asciival){ - case 9: - case 10: - case 12: - case 13: - case 27: - continue; - } - extendedSeparators[extendedSeparatorsIdx++] = asciival; - } - - serdeParams.separators = - Arrays.copyOfRange(extendedSeparators, 0, extendedSeparatorsIdx); - } - - serdeParams.nullString = tbl.getProperty( - serdeConstants.SERIALIZATION_NULL_FORMAT, "\\N"); - serdeParams.nullSequence = new Text(serdeParams.nullString); - - String lastColumnTakesRestString = tbl - .getProperty(serdeConstants.SERIALIZATION_LAST_COLUMN_TAKES_REST); - serdeParams.lastColumnTakesRest = (lastColumnTakesRestString != null && lastColumnTakesRestString - .equalsIgnoreCase("true")); - - LazyUtils.extractColumnInfo(tbl, serdeParams, serdeName); - - // Create the LazyObject for storing the rows - serdeParams.rowTypeInfo = TypeInfoFactory.getStructTypeInfo( - serdeParams.columnNames, serdeParams.columnTypes); - - // Get the escape information - String escapeProperty = tbl.getProperty(serdeConstants.ESCAPE_CHAR); - serdeParams.escaped = (escapeProperty != null); - if (serdeParams.escaped) { - serdeParams.escapeChar = getByte(escapeProperty, (byte) '\\'); - } - if (serdeParams.escaped) { - serdeParams.needsEscape = new boolean[128]; - for (int i = 0; i < 128; i++) { - serdeParams.needsEscape[i] = false; - } - serdeParams.needsEscape[serdeParams.escapeChar] = true; - for (int i = 0; i < serdeParams.separators.length; i++) { - serdeParams.needsEscape[serdeParams.separators[i]] = true; - } - } - - serdeParams.extendedBooleanLiteral = job == null ? false : - job.getBoolean(ConfVars.HIVE_LAZYSIMPLE_EXTENDED_BOOLEAN_LITERAL.varname, false); - - String[] timestampFormatsArray = - HiveStringUtils.splitAndUnEscape(tbl.getProperty(serdeConstants.TIMESTAMP_FORMATS)); - if (timestampFormatsArray != null) { - serdeParams.timestampFormats = Arrays.asList(timestampFormatsArray); - } - return serdeParams; - } - // The object for storing row data LazyStruct cachedLazyStruct; @@ -420,7 +217,7 @@ public Writable doSerialize(Object obj, ObjectInspector objInspector) StructObjectInspector soi = (StructObjectInspector) objInspector; List fields = soi.getAllStructFieldRefs(); List list = soi.getStructFieldsDataAsList(obj); - List declaredFields = (serdeParams.rowTypeInfo != null && ((StructTypeInfo) serdeParams.rowTypeInfo) + List declaredFields = (serdeParams.getRowTypeInfo() != null && ((StructTypeInfo) serdeParams.getRowTypeInfo()) .getAllStructFieldNames().size() > 0) ? ((StructObjectInspector) getObjectInspector()) .getAllStructFieldRefs() : null; @@ -432,7 +229,7 @@ public Writable doSerialize(Object obj, ObjectInspector objInspector) for (int i = 0; i < fields.size(); i++) { // Append the separator if needed. if (i > 0) { - serializeStream.write(serdeParams.separators[0]); + serializeStream.write(serdeParams.getSeparators()[0]); } // Get the field objectInspector and the field object. ObjectInspector foi = fields.get(i).getFieldObjectInspector(); @@ -441,7 +238,7 @@ public Writable doSerialize(Object obj, ObjectInspector objInspector) if (declaredFields != null && i >= declaredFields.size()) { throw new SerDeException("Error: expecting " + declaredFields.size() + " but asking for field " + i + "\n" + "data=" + obj + "\n" - + "tableType=" + serdeParams.rowTypeInfo.toString() + "\n" + + "tableType=" + serdeParams.getRowTypeInfo().toString() + "\n" + "dataType=" + TypeInfoUtils.getTypeInfoFromObjectInspector(objInspector)); } @@ -462,8 +259,8 @@ public Writable doSerialize(Object obj, ObjectInspector objInspector) protected void serializeField(ByteStream.Output out, Object obj, ObjectInspector objInspector, SerDeParameters serdeParams) throws SerDeException { try { - serialize(out, obj, objInspector, serdeParams.separators, 1, serdeParams.nullSequence, - serdeParams.escaped, serdeParams.escapeChar, serdeParams.needsEscape); + serialize(out, obj, objInspector, serdeParams.getSeparators(), 1, serdeParams.getNullSequence(), + serdeParams.isEscaped(), serdeParams.getEscapeChar(), serdeParams.getNeedsEscape()); } catch (IOException e) { throw new SerDeException(e); } @@ -489,15 +286,13 @@ protected void serializeField(ByteStream.Output out, Object obj, ObjectInspector * @param escapeChar * Which char to use as the escape char, e.g. '\\' * @param needsEscape - * Which chars needs to be escaped. This array should have size of - * 128. Negative byte values (or byte values >= 128) are never - * escaped. + * Which byte needs to be escaped. * @throws IOException * @throws SerDeException */ public static void serialize(ByteStream.Output out, Object obj, ObjectInspector objInspector, byte[] separators, int level, - Text nullSequence, boolean escaped, byte escapeChar, boolean[] needsEscape) + Text nullSequence, boolean escaped, byte escapeChar, Map needsEscape) throws IOException, SerDeException { if (obj == null) { diff --git serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java index 3943508..dd980de 100644 --- serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java +++ serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java @@ -23,16 +23,14 @@ import java.io.OutputStream; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Properties; +import java.util.Map; import org.apache.commons.codec.binary.Base64; -import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.SerDeException; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.io.HiveCharWritable; import org.apache.hadoop.hive.serde2.io.HiveVarcharWritable; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.BinaryObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.BooleanObjectInspector; @@ -48,7 +46,6 @@ import org.apache.hadoop.hive.serde2.objectinspector.primitive.ShortObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.StringObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.TimestampObjectInspector; -import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.Text; @@ -142,16 +139,15 @@ public static String convertToString(byte[] bytes, int start, int length) { * @param escapeChar * if escaped, the char for prefixing special characters. * @param needsEscape - * if escaped, whether a specific character needs escaping. This - * array should have size of 128. + * if escaped, whether a specific character needs escaping. */ public static void writeEscaped(OutputStream out, byte[] bytes, int start, - int len, boolean escaped, byte escapeChar, boolean[] needsEscape) + int len, boolean escaped, byte escapeChar, Map needsEscape) throws IOException { if (escaped) { int end = start + len; for (int i = start; i <= end; i++) { - if (i == end || (bytes[i] >= 0 && needsEscape[bytes[i]])) { + if (i == end || (needsEscape.containsKey(bytes[i]) && needsEscape.get(bytes[i]) )) { if (i > start) { out.write(bytes, start, i - start); } @@ -176,12 +172,11 @@ public static void writeEscaped(OutputStream out, byte[] bytes, int start, * @param o * The primitive Object * @param needsEscape - * Whether a character needs escaping. This array should have size of - * 128. + * Whether a character needs escaping. */ public static void writePrimitiveUTF8(OutputStream out, Object o, PrimitiveObjectInspector oi, boolean escaped, byte escapeChar, - boolean[] needsEscape) throws IOException { + Map needsEscape) throws IOException { switch (oi.getPrimitiveCategory()) { case BOOLEAN: { @@ -341,42 +336,7 @@ public static int hashBytes(byte[] data, int start, int len) { return hash; } - public static void extractColumnInfo(Properties tbl, SerDeParameters serdeParams, - String serdeName) throws SerDeException { - // Read the configuration parameters - String columnNameProperty = tbl.getProperty(serdeConstants.LIST_COLUMNS); - // NOTE: if "columns.types" is missing, all columns will be of String type - String columnTypeProperty = tbl.getProperty(serdeConstants.LIST_COLUMN_TYPES); - // Parse the configuration parameters - - if (columnNameProperty != null && columnNameProperty.length() > 0) { - serdeParams.columnNames = Arrays.asList(columnNameProperty.split(",")); - } else { - serdeParams.columnNames = new ArrayList(); - } - if (columnTypeProperty == null) { - // Default type: all string - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < serdeParams.columnNames.size(); i++) { - if (i > 0) { - sb.append(":"); - } - sb.append(serdeConstants.STRING_TYPE_NAME); - } - columnTypeProperty = sb.toString(); - } - - serdeParams.columnTypes = TypeInfoUtils - .getTypeInfosFromTypeString(columnTypeProperty); - - if (serdeParams.columnNames.size() != serdeParams.columnTypes.size()) { - throw new SerDeException(serdeName + ": columns has " - + serdeParams.columnNames.size() - + " elements while columns.types has " - + serdeParams.columnTypes.size() + " elements!"); - } - } /** * gets a byte[] with copy of data from source BytesWritable @@ -404,10 +364,15 @@ static byte getSeparator(byte[] separators, int level) throws SerDeException { String msg = "Number of levels of nesting supported for " + "LazySimpleSerde is " + (separators.length - 1) + " Unable to work with level " + level; + + String txt = ". Use %s serde property for tables using LazySimpleSerde."; + if(separators.length < 9){ - msg += ". Use " + LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS + - " serde property for tables using LazySimpleSerde."; + msg += String.format(txt, SerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS); + } else if (separators.length < 25) { + msg += String.format(txt, SerDeParameters.SERIALIZATION_EXTEND_ADDITIONAL_NESTING_LEVELS); } + throw new SerDeException(msg, e); } } @@ -450,6 +415,26 @@ public static void copyAndEscapeStringDataToText(byte[] inputBytes, int start, i } } + /** + * Return the byte value of the number string. + * + * @param altValue + * The string containing a number. + * @param defaultVal + * If the altValue does not represent a number, return the + * defaultVal. + */ + public static byte getByte(String altValue, byte defaultVal) { + if (altValue != null && altValue.length() > 0) { + try { + return Byte.valueOf(altValue).byteValue(); + } catch (NumberFormatException e) { + return (byte) altValue.charAt(0); + } + } + return defaultVal; + } + private LazyUtils() { // prevent instantiation } diff --git serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazyArrayMapStruct.java serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazyArrayMapStruct.java index 48f3b02..3be99d0 100644 --- serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazyArrayMapStruct.java +++ serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazyArrayMapStruct.java @@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.io.ByteWritable; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryFactory; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinaryMap; @@ -638,7 +639,7 @@ public void testLazyStructNested() throws Throwable { private void testNestedinArrayAtLevelExtended(int nestingLevel, ObjectInspector.Category dtype) throws SerDeException { Properties tableProp = new Properties(); - tableProp.setProperty(LazySimpleSerDe.SERIALIZATION_EXTEND_NESTING_LEVELS, "true"); + tableProp.setProperty(SerDeParameters.SERIALIZATION_EXTEND_NESTING_LEVELS, "true"); testNestedinArrayAtLevel(nestingLevel, dtype, tableProp); } @@ -693,9 +694,10 @@ private void testNestedinArrayAtLevel(int nestingLevel, tableProp.setProperty("columns", "narray"); tableProp.setProperty("columns.types", schema.toString()); SerDeUtils.initializeSerDe(serDe, conf, tableProp, null); - + SerDeParameters serdeParams = new SerDeParameters(conf, tableProp, LazySimpleSerDe.class.getName()); + //create the serialized string for type - byte[] separators = serDe.serdeParams.getSeparators(); + byte[] separators = serdeParams.getSeparators(); System.err.println("Using separator " + (char)separators[nestingLevel]); byte [] serializedRow = null; switch(dtype){ diff --git serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java index cf86973..1617b87 100644 --- serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java +++ serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java @@ -17,6 +17,8 @@ */ package org.apache.hadoop.hive.serde2.lazy; +import java.io.IOException; +import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -25,13 +27,21 @@ import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.serde.serdeConstants; +import org.apache.hadoop.hive.serde2.ByteStream; import org.apache.hadoop.hive.serde2.SerDeException; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.io.ByteWritable; import org.apache.hadoop.hive.serde2.io.DoubleWritable; import org.apache.hadoop.hive.serde2.io.ShortWritable; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils; +import org.apache.hadoop.hive.serde2.objectinspector.SimpleMapEqualComparer; import org.apache.hadoop.hive.serde2.objectinspector.StructField; import org.apache.hadoop.hive.serde2.objectinspector.StructObjectInspector; +import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions; +import org.apache.hadoop.hive.serde2.objectinspector.TestSimpleMapEqualComparer.TextStringMapHolder; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.LongWritable; @@ -79,41 +89,7 @@ public void testLazySimpleSerDe() throws Throwable { } } - private void deserializeAndSerialize(LazySimpleSerDe serDe, Text t, String s, - Object[] expectedFieldsData) throws SerDeException { - // Get the row structure - StructObjectInspector oi = (StructObjectInspector) serDe - .getObjectInspector(); - List fieldRefs = oi.getAllStructFieldRefs(); - assertEquals(expectedFieldsData.length, fieldRefs.size()); - // Deserialize - Object row = serDe.deserialize(t); - for (int i = 0; i < fieldRefs.size(); i++) { - Object fieldData = oi.getStructFieldData(row, fieldRefs.get(i)); - if (fieldData != null) { - fieldData = ((LazyPrimitive) fieldData).getWritableObject(); - } - assertEquals("Field " + i, expectedFieldsData[i], fieldData); - } - // Serialize - assertEquals(Text.class, serDe.getSerializedClass()); - Text serializedText = (Text) serDe.serialize(row, oi); - assertEquals("Serialized data", s, serializedText.toString()); - } - - private Properties createProperties() { - Properties tbl = new Properties(); - - // Set the configuration parameters - tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9"); - tbl.setProperty("columns", - "abyte,ashort,aint,along,adouble,astring,anullint,anullstring"); - tbl.setProperty("columns.types", - "tinyint:smallint:int:bigint:double:string:int:string"); - tbl.setProperty(serdeConstants.SERIALIZATION_NULL_FORMAT, "NULL"); - return tbl; - } /** * Test the LazySimpleSerDe class with LastColumnTakesRest option. @@ -199,5 +175,53 @@ public void testLazySimpleSerDeMissingColumns() throws Throwable { throw e; } } + + Object serializeAndDeserialize(List o1, StructObjectInspector oi1, + LazySimpleSerDe serde, + SerDeParameters serdeParams) throws IOException, SerDeException { + ByteStream.Output serializeStream = new ByteStream.Output(); + LazySimpleSerDe.serialize(serializeStream, o1, oi1, serdeParams + .getSeparators(), 0, serdeParams.getNullSequence(), serdeParams + .isEscaped(), serdeParams.getEscapeChar(), serdeParams + .getNeedsEscape()); + Text t = new Text(serializeStream.toByteArray()); + return serde.deserialize(t); + } + + + private void deserializeAndSerialize(LazySimpleSerDe serDe, Text t, String s, + Object[] expectedFieldsData) throws SerDeException { + // Get the row structure + StructObjectInspector oi = (StructObjectInspector) serDe + .getObjectInspector(); + List fieldRefs = oi.getAllStructFieldRefs(); + assertEquals(expectedFieldsData.length, fieldRefs.size()); + + // Deserialize + Object row = serDe.deserialize(t); + for (int i = 0; i < fieldRefs.size(); i++) { + Object fieldData = oi.getStructFieldData(row, fieldRefs.get(i)); + if (fieldData != null) { + fieldData = ((LazyPrimitive) fieldData).getWritableObject(); + } + assertEquals("Field " + i, expectedFieldsData[i], fieldData); + } + // Serialize + assertEquals(Text.class, serDe.getSerializedClass()); + Text serializedText = (Text) serDe.serialize(row, oi); + assertEquals("Serialized data", s, serializedText.toString()); + } + private Properties createProperties() { + Properties tbl = new Properties(); + + // Set the configuration parameters + tbl.setProperty(serdeConstants.SERIALIZATION_FORMAT, "9"); + tbl.setProperty("columns", + "abyte,ashort,aint,along,adouble,astring,anullint,anullstring"); + tbl.setProperty("columns.types", + "tinyint:smallint:int:bigint:double:string:int:string"); + tbl.setProperty(serdeConstants.SERIALIZATION_NULL_FORMAT, "NULL"); + return tbl; + } } diff --git serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java index c58c427..48d5ea5 100644 --- serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java +++ serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestCrossMapEqualComparer.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions; import org.apache.hadoop.io.Text; @@ -99,8 +99,7 @@ public void testCompatibleType() throws SerDeException, IOException { Properties tbl = new Properties(); tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1)); tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1)); - SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, - LazySimpleSerDe.class.getName()); + SerDeParameters serdeParams = new SerDeParameters(conf, tbl, LazySimpleSerDe.class.getName()); SerDeUtils.initializeSerDe(serde, conf, tbl, null); ObjectInspector oi2 = serde.getObjectInspector(); @@ -153,8 +152,7 @@ public void testIncompatibleType() throws SerDeException, IOException { Properties tbl = new Properties(); tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1)); tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1)); - SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, - LazySimpleSerDe.class.getName()); + SerDeParameters serdeParams = new SerDeParameters(conf, tbl, LazySimpleSerDe.class.getName()); SerDeUtils.initializeSerDe(serde, conf, tbl, null); ObjectInspector oi2 = serde.getObjectInspector(); diff --git serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java index 6f09b83..9b2b29e 100644 --- serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java +++ serde/src/test/org/apache/hadoop/hive/serde2/objectinspector/TestSimpleMapEqualComparer.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hive.serde2.SerDeException; import org.apache.hadoop.hive.serde2.SerDeUtils; import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; -import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.SerDeParameters; +import org.apache.hadoop.hive.serde2.SerDeParameters; import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorFactory.ObjectInspectorOptions; import org.apache.hadoop.io.Text; @@ -99,8 +99,7 @@ public void testCompatibleType() throws SerDeException, IOException { Properties tbl = new Properties(); tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1)); tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1)); - SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, - LazySimpleSerDe.class.getName()); + SerDeParameters serdeParams = new SerDeParameters(conf, tbl, LazySimpleSerDe.class.getName()); SerDeUtils.initializeSerDe(serde, conf, tbl, null); ObjectInspector oi2 = serde.getObjectInspector(); @@ -153,8 +152,7 @@ public void testIncompatibleType() throws SerDeException, IOException { Properties tbl = new Properties(); tbl.setProperty(serdeConstants.LIST_COLUMNS, ObjectInspectorUtils.getFieldNames(oi1)); tbl.setProperty(serdeConstants.LIST_COLUMN_TYPES, ObjectInspectorUtils.getFieldTypes(oi1)); - SerDeParameters serdeParams = LazySimpleSerDe.initSerdeParams(conf, tbl, - LazySimpleSerDe.class.getName()); + SerDeParameters serdeParams = new SerDeParameters(conf, tbl, LazySimpleSerDe.class.getName()); SerDeUtils.initializeSerDe(serde, conf, tbl, null); ObjectInspector oi2 = serde.getObjectInspector();