Repository: hive Updated Branches: refs/heads/master 916ef9235 -> f18842e73
Revert "HIVE-20520: length(CHAR) doesn't consider trailing space (Jesus Camacho Rodriguez, reviewed by Ashutosh Chauhan)" This reverts commit c8b3f9aa08be15546844ef6d5be6871b6d5a76db. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/f18842e7 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/f18842e7 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/f18842e7 Branch: refs/heads/master Commit: f18842e7379060bb2504b0dbae4f4280abba883b Parents: 916ef92 Author: Jesus Camacho Rodriguez <jcama...@apache.org> Authored: Tue Sep 11 14:25:54 2018 -0700 Committer: Jesus Camacho Rodriguez <jcama...@apache.org> Committed: Tue Sep 11 14:26:05 2018 -0700 ---------------------------------------------------------------------- .../test/resources/testconfiguration.properties | 1 - .../ql/exec/vector/expressions/OctetLength.java | 20 +++----- .../exec/vector/expressions/StringLength.java | 21 +++----- .../udf/generic/GenericUDFCharacterLength.java | 9 ---- .../hive/ql/udf/generic/GenericUDFLength.java | 9 ---- .../ql/udf/generic/GenericUDFOctetLength.java | 9 ---- .../TestVectorStringExpressions.java | 8 +-- .../clientpositive/char_trailing_space.q | 8 --- .../results/clientpositive/alter_char2.q.out | 8 +-- .../test/results/clientpositive/char_udf1.q.out | 2 +- .../llap/char_trailing_space.q.out | 53 -------------------- .../clientpositive/llap/parquet_types.q.out | 8 +-- .../llap/vector_char_varchar_1.q.out | 2 +- .../llap/vectorized_parquet_types.q.out | 16 +++--- .../vectorized_parquet_types.q.out | 16 +++--- 15 files changed, 39 insertions(+), 151 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/itests/src/test/resources/testconfiguration.properties ---------------------------------------------------------------------- diff --git a/itests/src/test/resources/testconfiguration.properties b/itests/src/test/resources/testconfiguration.properties index 146f630..3a5aec7 100644 --- a/itests/src/test/resources/testconfiguration.properties +++ b/itests/src/test/resources/testconfiguration.properties @@ -469,7 +469,6 @@ minillaplocal.query.files=\ runtime_stats_hs2.q,\ bucketsortoptimize_insert_2.q,\ change_allowincompatible_vectorization_false_date.q,\ - char_trailing_space.q,\ check_constraint.q,\ cbo_gby.q,\ cbo_join.q,\ http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java index 59583c5..ebea38d 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/OctetLength.java @@ -25,10 +25,6 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.metadata.HiveException; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; -import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory; -import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; -import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; public class OctetLength extends VectorExpression { private static final long serialVersionUID = 1L; @@ -69,10 +65,6 @@ public class OctetLength extends VectorExpression { return; } - boolean isFixedLength = inputTypeInfos[0].getCategory() == Category.PRIMITIVE && - ((PrimitiveTypeInfo) inputTypeInfos[0]).getPrimitiveCategory() == PrimitiveCategory.CHAR; - int fixedLength = isFixedLength ? ((CharTypeInfo) inputTypeInfos[0]).getLength() : -1; - // We do not need to do a column reset since we are carefully changing the output. outputColVector.isRepeating = false; @@ -80,7 +72,7 @@ public class OctetLength extends VectorExpression { if (inputColVector.noNulls || !inputIsNull[0]) { // Set isNull before call in case it changes it mind. outputIsNull[0] = false; - resultLen[0] = isFixedLength ? fixedLength : length[0]; + resultLen[0] = length[0]; } else { outputIsNull[0] = true; outputColVector.noNulls = false; @@ -103,12 +95,12 @@ public class OctetLength extends VectorExpression { final int i = sel[j]; // Set isNull before call in case it changes it mind. outputIsNull[i] = false; - resultLen[i] = isFixedLength ? fixedLength : length[i]; + resultLen[i] = length[i]; } } else { for(int j = 0; j != n; j++) { final int i = sel[j]; - resultLen[i] = isFixedLength ? fixedLength : length[i]; + resultLen[i] = length[i]; } } } else { @@ -120,7 +112,7 @@ public class OctetLength extends VectorExpression { outputColVector.noNulls = true; } for(int i = 0; i != n; i++) { - resultLen[i] = isFixedLength ? fixedLength : length[i]; + resultLen[i] = length[i]; } } } else { @@ -136,14 +128,14 @@ public class OctetLength extends VectorExpression { int i = sel[j]; outputIsNull[i] = inputIsNull[i]; if (!inputIsNull[i]) { - resultLen[i] = isFixedLength ? fixedLength : length[i]; + resultLen[i] = length[i]; } } } else { System.arraycopy(inputIsNull, 0, outputIsNull, 0, n); for(int i = 0; i != n; i++) { if (!inputIsNull[i]) { - resultLen[i] = isFixedLength ? fixedLength : length[i]; + resultLen[i] = length[i]; } } } http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java index ea33843..956fd7b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/StringLength.java @@ -25,11 +25,6 @@ import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorExpressionDescriptor; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.metadata.HiveException; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category; -import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory; -import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; -import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo; -import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; /** * Calculate the length of the strings in the input column vector, and store @@ -76,10 +71,6 @@ public class StringLength extends VectorExpression { return; } - boolean isFixedLength = inputTypeInfos[0].getCategory() == Category.PRIMITIVE && - ((PrimitiveTypeInfo) inputTypeInfos[0]).getPrimitiveCategory() == PrimitiveCategory.CHAR; - int fixedLength = isFixedLength ? ((CharTypeInfo) inputTypeInfos[0]).getLength() : -1; - // We do not need to do a column reset since we are carefully changing the output. outputColVector.isRepeating = false; @@ -87,7 +78,7 @@ public class StringLength extends VectorExpression { if (inputColVector.noNulls || !inputIsNull[0]) { // Set isNull before call in case it changes it mind. outputIsNull[0] = false; - resultLen[0] = isFixedLength ? fixedLength : utf8StringLength(vector[0], start[0], length[0]); + resultLen[0] = utf8StringLength(vector[0], start[0], length[0]); } else { outputIsNull[0] = true; outputColVector.noNulls = false; @@ -106,12 +97,12 @@ public class StringLength extends VectorExpression { final int i = sel[j]; // Set isNull before call in case it changes it mind. outputIsNull[i] = false; - resultLen[i] = isFixedLength ? fixedLength : utf8StringLength(vector[i], start[i], length[i]); + resultLen[i] = utf8StringLength(vector[i], start[i], length[i]); } } else { for(int j = 0; j != n; j++) { final int i = sel[j]; - resultLen[i] = isFixedLength ? fixedLength : utf8StringLength(vector[i], start[i], length[i]); + resultLen[i] = utf8StringLength(vector[i], start[i], length[i]); } } } else { @@ -123,7 +114,7 @@ public class StringLength extends VectorExpression { outputColVector.noNulls = true; } for(int i = 0; i != n; i++) { - resultLen[i] = isFixedLength ? fixedLength : utf8StringLength(vector[i], start[i], length[i]); + resultLen[i] = utf8StringLength(vector[i], start[i], length[i]); } } } else /* there are nulls in the inputColVector */ { @@ -136,7 +127,7 @@ public class StringLength extends VectorExpression { int i = sel[j]; outputColVector.isNull[i] = inputColVector.isNull[i]; if (!inputColVector.isNull[i]) { - resultLen[i] = isFixedLength ? fixedLength : utf8StringLength(vector[i], start[i], length[i]); + resultLen[i] = utf8StringLength(vector[i], start[i], length[i]); } } outputColVector.isRepeating = false; @@ -144,7 +135,7 @@ public class StringLength extends VectorExpression { for(int i = 0; i != n; i++) { outputColVector.isNull[i] = inputColVector.isNull[i]; if (!inputColVector.isNull[i]) { - resultLen[i] = isFixedLength ? fixedLength : utf8StringLength(vector[i], start[i], length[i]); + resultLen[i] = utf8StringLength(vector[i], start[i], length[i]); } } } http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCharacterLength.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCharacterLength.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCharacterLength.java index 30c40d3..ce6cd30 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCharacterLength.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFCharacterLength.java @@ -27,7 +27,6 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorConverter; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; -import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.IntWritable; @@ -41,7 +40,6 @@ public class GenericUDFCharacterLength extends GenericUDF { private transient PrimitiveObjectInspector argumentOI; private transient PrimitiveObjectInspectorConverter.StringConverter stringConverter; private transient boolean isInputString; - private transient boolean isInputFixedLength; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { @@ -61,8 +59,6 @@ public class GenericUDFCharacterLength extends GenericUDF { ObjectInspector outputOI = null; switch (inputType) { case CHAR: - isInputFixedLength = true; - result.set(((CharTypeInfo) argumentOI.getTypeInfo()).getLength()); case VARCHAR: case STRING: isInputString = true; @@ -94,11 +90,6 @@ public class GenericUDFCharacterLength extends GenericUDF { return null; } - // For char, we do not need to explore the data - if (isInputFixedLength) { - return result; - } - data = val.getBytes(); } else { BytesWritable val = null; http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLength.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLength.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLength.java index f9ca15d..f4ac350 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLength.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFLength.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorConverter; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; -import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.IntWritable; @@ -47,7 +46,6 @@ public class GenericUDFLength extends GenericUDF { private transient PrimitiveObjectInspectorConverter.StringConverter stringConverter; private transient PrimitiveObjectInspectorConverter.BinaryConverter binaryConverter; private transient boolean isInputString; - private transient boolean isInputFixedLength; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { @@ -66,8 +64,6 @@ public class GenericUDFLength extends GenericUDF { ObjectInspector outputOI = null; switch (inputType) { case CHAR: - isInputFixedLength = true; - result.set(((CharTypeInfo) argumentOI.getTypeInfo()).getLength()); case VARCHAR: case STRING: isInputString = true; @@ -102,11 +98,6 @@ public class GenericUDFLength extends GenericUDF { return null; } - // For char, we do not need to explore the data - if (isInputFixedLength) { - return result; - } - data = val.getBytes(); int len = 0; http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOctetLength.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOctetLength.java b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOctetLength.java index 2a39ebb..825066f 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOctetLength.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFOctetLength.java @@ -27,7 +27,6 @@ import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorConverter; import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory; -import org.apache.hadoop.hive.serde2.typeinfo.CharTypeInfo; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.IntWritable; @@ -41,7 +40,6 @@ public class GenericUDFOctetLength extends GenericUDF { private transient PrimitiveObjectInspector argumentOI; private transient PrimitiveObjectInspectorConverter.StringConverter stringConverter; private transient boolean isInputString; - private transient boolean isInputFixedLength; @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { @@ -61,8 +59,6 @@ public class GenericUDFOctetLength extends GenericUDF { ObjectInspector outputOI = null; switch (inputType) { case CHAR: - isInputFixedLength = true; - result.set(((CharTypeInfo) argumentOI.getTypeInfo()).getLength()); case VARCHAR: case STRING: isInputString = true; @@ -94,11 +90,6 @@ public class GenericUDFOctetLength extends GenericUDF { return null; } - // For char, we do not need to explore the data - if (isInputFixedLength) { - return result; - } - data = val.getBytes(); } else { BytesWritable val = null; http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java index 8a521f9..902f29e 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java @@ -63,9 +63,6 @@ import org.apache.hadoop.hive.ql.exec.vector.expressions.gen.VarCharScalarEqualS import org.apache.hadoop.hive.ql.exec.vector.util.VectorizedRowGroupGenUtil; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.ql.udf.UDFLike; -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.BooleanWritable; import org.apache.hadoop.io.Text; import org.junit.Test; @@ -4141,12 +4138,9 @@ public class TestVectorStringExpressions { @Test public void testStringLength() throws HiveException { - StringLength expr = new StringLength(0, 1); - expr.inputTypeInfos = new TypeInfo[1]; - expr.inputTypeInfos[0] = TypeInfoFactory.stringTypeInfo; - // has nulls, not repeating VectorizedRowBatch batch = makeStringBatchMixedCharSize(); + StringLength expr = new StringLength(0, 1); expr.evaluate(batch); LongColumnVector outCol = (LongColumnVector) batch.cols[1]; Assert.assertEquals(5, outCol.vector[1]); // length of green is 5 http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/queries/clientpositive/char_trailing_space.q ---------------------------------------------------------------------- diff --git a/ql/src/test/queries/clientpositive/char_trailing_space.q b/ql/src/test/queries/clientpositive/char_trailing_space.q deleted file mode 100644 index a8fb6d0..0000000 --- a/ql/src/test/queries/clientpositive/char_trailing_space.q +++ /dev/null @@ -1,8 +0,0 @@ -create table char_trailing_space(a char(2), b varchar(2)); -insert into char_trailing_space values('L ', 'L '); - -select length(a),length(b) from char_trailing_space; -select character_length(a),character_length(b) from char_trailing_space; -select octet_length(a),octet_length(b) from char_trailing_space; - -drop table char_trailing_space; http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/results/clientpositive/alter_char2.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/alter_char2.q.out b/ql/src/test/results/clientpositive/alter_char2.q.out index 76d7234..2084477 100644 --- a/ql/src/test/results/clientpositive/alter_char2.q.out +++ b/ql/src/test/results/clientpositive/alter_char2.q.out @@ -35,7 +35,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alter_char2 POSTHOOK: Input: default@alter_char2@hr=1 #### A masked pattern was here #### -val_238 255 +val_238 7 PREHOOK: query: alter table alter_char2 change column c1 c1 char(10) PREHOOK: type: ALTERTABLE_RENAMECOL PREHOOK: Input: default@alter_char2 @@ -54,7 +54,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alter_char2 POSTHOOK: Input: default@alter_char2@hr=1 #### A masked pattern was here #### -1 val_238 10 +1 val_238 7 PREHOOK: query: insert overwrite table alter_char2 partition (hr=2) select key from src limit 1 PREHOOK: type: QUERY @@ -76,7 +76,7 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alter_char2 POSTHOOK: Input: default@alter_char2@hr=1 #### A masked pattern was here #### -1 val_238 10 +1 val_238 7 PREHOOK: query: select hr, c1, length(c1) from alter_char2 where hr = 2 PREHOOK: type: QUERY PREHOOK: Input: default@alter_char2 @@ -87,4 +87,4 @@ POSTHOOK: type: QUERY POSTHOOK: Input: default@alter_char2 POSTHOOK: Input: default@alter_char2@hr=2 #### A masked pattern was here #### -2 238 10 +2 238 3 http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/results/clientpositive/char_udf1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/char_udf1.q.out b/ql/src/test/results/clientpositive/char_udf1.q.out index f5d1acf..09fb697 100644 --- a/ql/src/test/results/clientpositive/char_udf1.q.out +++ b/ql/src/test/results/clientpositive/char_udf1.q.out @@ -159,7 +159,7 @@ from char_udf_1 limit 1 POSTHOOK: type: QUERY POSTHOOK: Input: default@char_udf_1 #### A masked pattern was here #### -7 20 false +7 7 true PREHOOK: query: select locate('a', 'abcdabcd', 3), locate(cast('a' as char(1)), cast('abcdabcd' as char(10)), 3), http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/results/clientpositive/llap/char_trailing_space.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/char_trailing_space.q.out b/ql/src/test/results/clientpositive/llap/char_trailing_space.q.out deleted file mode 100644 index cea90f7..0000000 --- a/ql/src/test/results/clientpositive/llap/char_trailing_space.q.out +++ /dev/null @@ -1,53 +0,0 @@ -PREHOOK: query: create table char_trailing_space(a char(2), b varchar(2)) -PREHOOK: type: CREATETABLE -PREHOOK: Output: database:default -PREHOOK: Output: default@char_trailing_space -POSTHOOK: query: create table char_trailing_space(a char(2), b varchar(2)) -POSTHOOK: type: CREATETABLE -POSTHOOK: Output: database:default -POSTHOOK: Output: default@char_trailing_space -PREHOOK: query: insert into char_trailing_space values('L ', 'L ') -PREHOOK: type: QUERY -PREHOOK: Input: _dummy_database@_dummy_table -PREHOOK: Output: default@char_trailing_space -POSTHOOK: query: insert into char_trailing_space values('L ', 'L ') -POSTHOOK: type: QUERY -POSTHOOK: Input: _dummy_database@_dummy_table -POSTHOOK: Output: default@char_trailing_space -POSTHOOK: Lineage: char_trailing_space.a SCRIPT [] -POSTHOOK: Lineage: char_trailing_space.b SCRIPT [] -PREHOOK: query: select length(a),length(b) from char_trailing_space -PREHOOK: type: QUERY -PREHOOK: Input: default@char_trailing_space -#### A masked pattern was here #### -POSTHOOK: query: select length(a),length(b) from char_trailing_space -POSTHOOK: type: QUERY -POSTHOOK: Input: default@char_trailing_space -#### A masked pattern was here #### -2 2 -PREHOOK: query: select character_length(a),character_length(b) from char_trailing_space -PREHOOK: type: QUERY -PREHOOK: Input: default@char_trailing_space -#### A masked pattern was here #### -POSTHOOK: query: select character_length(a),character_length(b) from char_trailing_space -POSTHOOK: type: QUERY -POSTHOOK: Input: default@char_trailing_space -#### A masked pattern was here #### -2 2 -PREHOOK: query: select octet_length(a),octet_length(b) from char_trailing_space -PREHOOK: type: QUERY -PREHOOK: Input: default@char_trailing_space -#### A masked pattern was here #### -POSTHOOK: query: select octet_length(a),octet_length(b) from char_trailing_space -POSTHOOK: type: QUERY -POSTHOOK: Input: default@char_trailing_space -#### A masked pattern was here #### -2 2 -PREHOOK: query: drop table char_trailing_space -PREHOOK: type: DROPTABLE -PREHOOK: Input: default@char_trailing_space -PREHOOK: Output: default@char_trailing_space -POSTHOOK: query: drop table char_trailing_space -POSTHOOK: type: DROPTABLE -POSTHOOK: Input: default@char_trailing_space -POSTHOOK: Output: default@char_trailing_space http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/results/clientpositive/llap/parquet_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/parquet_types.q.out b/ql/src/test/results/clientpositive/llap/parquet_types.q.out index 9678bb4..508ac16 100644 --- a/ql/src/test/results/clientpositive/llap/parquet_types.q.out +++ b/ql/src/test/results/clientpositive/llap/parquet_types.q.out @@ -192,10 +192,10 @@ POSTHOOK: query: SELECT cchar, LENGTH(cchar), cvarchar, LENGTH(cvarchar) FROM pa POSTHOOK: type: QUERY POSTHOOK: Input: default@parquet_types #### A masked pattern was here #### -a 5 a 3 -ab 5 ab 3 -abc 5 abc 3 -abcd 5 abcd 4 +a 1 a 3 +ab 2 ab 3 +abc 3 abc 3 +abcd 4 abcd 4 abcde 5 abcde 5 abcde 5 abcdef 6 abcde 5 abcdefg 7 http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out b/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out index 0ba2755..5a23539 100644 --- a/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out +++ b/ql/src/test/results/clientpositive/llap/vector_char_varchar_1.q.out @@ -291,4 +291,4 @@ char_ctas_1._c0 char_ctas_1._c1 10 m thgilnus 10 sdrow emos 10 t eht sgeb -10 wolley +8 wolley http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out index cf45c90..d0d13ba 100644 --- a/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out +++ b/ql/src/test/results/clientpositive/llap/vectorized_parquet_types.q.out @@ -211,10 +211,10 @@ POSTHOOK: query: SELECT cchar, LENGTH(cchar), cvarchar, LENGTH(cvarchar), cdecim POSTHOOK: type: QUERY POSTHOOK: Input: default@parquet_types_n2 #### A masked pattern was here #### -a 5 a 3 48.88 1 -ab 5 ab 3 8.72 1 -abc 5 abc 3 90.21 1 -abcd 5 abcd 4 3.89 1 +a 1 a 3 48.88 1 +ab 2 ab 3 8.72 1 +abc 3 abc 3 90.21 1 +abcd 4 abcd 4 3.89 1 abcde 5 abcde 5 56.23 1 abcde 5 abcdef 6 90.21 1 abcde 5 abcdefg 7 6.09 1 @@ -552,10 +552,10 @@ POSTHOOK: query: SELECT cchar, LENGTH(cchar), cvarchar, LENGTH(cvarchar), cdecim POSTHOOK: type: QUERY POSTHOOK: Input: default@parquet_type_nodict #### A masked pattern was here #### -a 5 a 3 48.88 1 -ab 5 ab 3 8.72 1 -abc 5 abc 3 90.21 1 -abcd 5 abcd 4 3.89 1 +a 1 a 3 48.88 1 +ab 2 ab 3 8.72 1 +abc 3 abc 3 90.21 1 +abcd 4 abcd 4 3.89 1 abcde 5 abcde 5 56.23 1 abcde 5 abcdef 6 90.21 1 abcde 5 abcdefg 7 6.09 1 http://git-wip-us.apache.org/repos/asf/hive/blob/f18842e7/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out ---------------------------------------------------------------------- diff --git a/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out b/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out index 772e5b0..c1f2d54 100644 --- a/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out +++ b/ql/src/test/results/clientpositive/vectorized_parquet_types.q.out @@ -279,10 +279,10 @@ POSTHOOK: query: SELECT cchar, LENGTH(cchar), cvarchar, LENGTH(cvarchar), cdecim POSTHOOK: type: QUERY POSTHOOK: Input: default@parquet_types_n2 #### A masked pattern was here #### -a 5 a 3 48.88 1 -ab 5 ab 3 8.72 1 -abc 5 abc 3 90.21 1 -abcd 5 abcd 4 3.89 1 +a 1 a 3 48.88 1 +ab 2 ab 3 8.72 1 +abc 3 abc 3 90.21 1 +abcd 4 abcd 4 3.89 1 abcde 5 abcde 5 56.23 1 abcde 5 abcdef 6 90.21 1 abcde 5 abcdefg 7 6.09 1 @@ -678,10 +678,10 @@ POSTHOOK: query: SELECT cchar, LENGTH(cchar), cvarchar, LENGTH(cvarchar), cdecim POSTHOOK: type: QUERY POSTHOOK: Input: default@parquet_type_nodict #### A masked pattern was here #### -a 5 a 3 48.88 1 -ab 5 ab 3 8.72 1 -abc 5 abc 3 90.21 1 -abcd 5 abcd 4 3.89 1 +a 1 a 3 48.88 1 +ab 2 ab 3 8.72 1 +abc 3 abc 3 90.21 1 +abcd 4 abcd 4 3.89 1 abcde 5 abcde 5 56.23 1 abcde 5 abcdef 6 90.21 1 abcde 5 abcdefg 7 6.09 1
