Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner2.q.out Mon Mar 31 21:04:07 2014 differ
Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/reduce_deduplicate.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/reduce_deduplicate.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/reduce_deduplicate.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/reduce_deduplicate.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/router_join_ppr.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/router_join_ppr.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/router_join_ppr.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/router_join_ppr.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample1.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample1.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample1.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample1.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample10.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample10.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample10.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample10.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample8.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample8.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample8.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/sample8.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats11.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats11.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== --- hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats11.q.out (original) +++ hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats11.q.out Mon Mar 31 21:04:07 2014 @@ -447,6 +447,7 @@ STAGE PLANS: numFiles 4 numRows 0 partition_columns ds + partition_columns.types string rawDataSize 0 serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value} serialization.format 1 @@ -466,6 +467,7 @@ STAGE PLANS: #### A masked pattern was here #### name default.srcbucket_mapjoin_part partition_columns ds + partition_columns.types string serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe @@ -1048,6 +1050,7 @@ STAGE PLANS: numFiles 4 numRows 0 partition_columns ds + partition_columns.types string rawDataSize 0 serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value} serialization.format 1 @@ -1067,6 +1070,7 @@ STAGE PLANS: #### A masked pattern was here #### name default.srcbucket_mapjoin_part partition_columns ds + partition_columns.types string serialization.ddl struct srcbucket_mapjoin_part { i32 key, string value} serialization.format 1 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats12.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats12.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats12.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats12.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats13.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats13.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats13.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/stats13.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr1.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr1.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr1.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr1.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr2.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr2.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr2.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/transform_ppr2.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/union22.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/union22.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/union22.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/union22.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/clientpositive/union_ppr.q.out URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/clientpositive/union_ppr.q.out?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== Files hive/branches/branch-0.13/ql/src/test/results/clientpositive/union_ppr.q.out (original) and hive/branches/branch-0.13/ql/src/test/results/clientpositive/union_ppr.q.out Mon Mar 31 21:04:07 2014 differ Modified: hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input2.q.xml URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input2.q.xml?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== --- hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input2.q.xml (original) +++ hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input2.q.xml Mon Mar 31 21:04:07 2014 @@ -1166,6 +1166,10 @@ <string>default<char code="#0"/>default</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>partition_columns</string> <string>ds/hr</string> </void> @@ -1337,6 +1341,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>columns.comments</string> <string>default<char code="#0"/>default</string> </void> Modified: hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input3.q.xml URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input3.q.xml?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== --- hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input3.q.xml (original) +++ hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input3.q.xml Mon Mar 31 21:04:07 2014 @@ -1225,6 +1225,10 @@ <string>default<char code="#0"/>default</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>partition_columns</string> <string>ds/hr</string> </void> @@ -1396,6 +1400,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>columns.comments</string> <string>default<char code="#0"/>default</string> </void> @@ -1563,6 +1571,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>columns.comments</string> <string>default<char code="#0"/>default</string> </void> Modified: hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input_part1.q.xml URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input_part1.q.xml?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== --- hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input_part1.q.xml (original) +++ hive/branches/branch-0.13/ql/src/test/results/compiler/plan/input_part1.q.xml Mon Mar 31 21:04:07 2014 @@ -47,6 +47,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>COLUMN_STATS_ACCURATE</string> <string>true</string> </void> @@ -139,6 +143,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>columns.comments</string> <string>default<char code="#0"/>default</string> </void> @@ -818,6 +826,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>COLUMN_STATS_ACCURATE</string> <string>true</string> </void> Modified: hive/branches/branch-0.13/ql/src/test/results/compiler/plan/sample1.q.xml URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/ql/src/test/results/compiler/plan/sample1.q.xml?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== --- hive/branches/branch-0.13/ql/src/test/results/compiler/plan/sample1.q.xml (original) +++ hive/branches/branch-0.13/ql/src/test/results/compiler/plan/sample1.q.xml Mon Mar 31 21:04:07 2014 @@ -47,6 +47,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>COLUMN_STATS_ACCURATE</string> <string>true</string> </void> @@ -139,6 +143,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>columns.comments</string> <string>default<char code="#0"/>default</string> </void> @@ -907,6 +915,10 @@ <string>key,value</string> </void> <void method="put"> + <string>partition_columns.types</string> + <string>string:string</string> + </void> + <void method="put"> <string>COLUMN_STATS_ACCURATE</string> <string>true</string> </void> Modified: hive/branches/branch-0.13/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.13/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java?rev=1583463&r1=1583462&r2=1583463&view=diff ============================================================================== --- hive/branches/branch-0.13/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java (original) +++ hive/branches/branch-0.13/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/JavaHiveVarcharObjectInspector.java Mon Mar 31 21:04:07 2014 @@ -68,23 +68,18 @@ implements SettableHiveVarcharObjectInsp @Override public Object set(Object o, HiveVarchar value) { - HiveVarchar setValue = (HiveVarchar)o; if (BaseCharUtils.doesPrimitiveMatchTypeParams( value, (VarcharTypeInfo)typeInfo)) { - setValue.setValue(value); + return o = value; } else { // Otherwise value may be too long, convert to appropriate value based on params - setValue.setValue(value, getMaxLength()); + return o = new HiveVarchar(value, getMaxLength()); } - - return setValue; } @Override public Object set(Object o, String value) { - HiveVarchar convertedValue = (HiveVarchar)o; - convertedValue.setValue(value, getMaxLength()); - return convertedValue; + return o = new HiveVarchar(value, getMaxLength()); } @Override
