You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2013/07/27 23:52:06 UTC

svn commit: r1507724 [1/5] - in /hive/trunk: contrib/src/test/results/clientpositive/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/test/results/beelinepositive/ ql/src/test/results/clientpositive/ ql/src/test/results/compiler/plan/

Author: hashutosh
Date: Sat Jul 27 21:52:02 2013
New Revision: 1507724

URL: http://svn.apache.org/r1507724
Log:
HIVE-4929 : the type of all numeric constants is changed to double in the plan (Sergey Shelukhin via Ashutosh Chauhan)

Modified:
    hive/trunk/contrib/src/test/results/clientpositive/dboutput.q.out
    hive/trunk/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
    hive/trunk/ql/src/test/results/beelinepositive/auto_join0.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join12.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join13.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join16.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join20.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join21.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join23.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join27.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join28.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join29.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join4.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join5.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join6.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join7.q.out
    hive/trunk/ql/src/test/results/beelinepositive/auto_join8.q.out
    hive/trunk/ql/src/test/results/beelinepositive/create_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
    hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join14_hadoop20.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join16.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join28.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join29.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join4.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join5.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join6.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join7.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join8.q.out
    hive/trunk/ql/src/test/results/clientpositive/cast1.q.out
    hive/trunk/ql/src/test/results/clientpositive/cluster.q.out
    hive/trunk/ql/src/test/results/clientpositive/column_access_stats.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
    hive/trunk/ql/src/test/results/clientpositive/create_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/ctas_colname.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer2.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_multi_single_reducer3.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_position.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/having.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_empty.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_file_format.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_multiple.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_partitioned.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_unused.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_update.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_bitmap3.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto_partitioned.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_bitmap_compression.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_compression.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_stale.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_stale_partitioned.q.out
    hive/trunk/ql/src/test/results/clientpositive/infer_const_type.q.out
    hive/trunk/ql/src/test/results/clientpositive/input11.q.out
    hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out
    hive/trunk/ql/src/test/results/clientpositive/input12_hadoop20.q.out
    hive/trunk/ql/src/test/results/clientpositive/input13.q.out
    hive/trunk/ql/src/test/results/clientpositive/input14.q.out
    hive/trunk/ql/src/test/results/clientpositive/input14_limit.q.out
    hive/trunk/ql/src/test/results/clientpositive/input18.q.out
    hive/trunk/ql/src/test/results/clientpositive/input1_limit.q.out
    hive/trunk/ql/src/test/results/clientpositive/input2_limit.q.out
    hive/trunk/ql/src/test/results/clientpositive/input42.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part4.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part5.q.out
    hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
    hive/trunk/ql/src/test/results/clientpositive/join0.q.out
    hive/trunk/ql/src/test/results/clientpositive/join11.q.out
    hive/trunk/ql/src/test/results/clientpositive/join12.q.out
    hive/trunk/ql/src/test/results/clientpositive/join13.q.out
    hive/trunk/ql/src/test/results/clientpositive/join14_hadoop20.q.out
    hive/trunk/ql/src/test/results/clientpositive/join16.q.out
    hive/trunk/ql/src/test/results/clientpositive/join20.q.out
    hive/trunk/ql/src/test/results/clientpositive/join21.q.out
    hive/trunk/ql/src/test/results/clientpositive/join23.q.out
    hive/trunk/ql/src/test/results/clientpositive/join34.q.out
    hive/trunk/ql/src/test/results/clientpositive/join35.q.out
    hive/trunk/ql/src/test/results/clientpositive/join38.q.out
    hive/trunk/ql/src/test/results/clientpositive/join39.q.out
    hive/trunk/ql/src/test/results/clientpositive/join4.q.out
    hive/trunk/ql/src/test/results/clientpositive/join40.q.out
    hive/trunk/ql/src/test/results/clientpositive/join41.q.out
    hive/trunk/ql/src/test/results/clientpositive/join5.q.out
    hive/trunk/ql/src/test/results/clientpositive/join6.q.out
    hive/trunk/ql/src/test/results/clientpositive/join7.q.out
    hive/trunk/ql/src/test/results/clientpositive/join8.q.out
    hive/trunk/ql/src/test/results/clientpositive/load_dyn_part13.q.out
    hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/mergejoins.q.out
    hive/trunk/ql/src/test/results/clientpositive/multi_insert.q.out
    hive/trunk/ql/src/test/results/clientpositive/multi_insert_gby.q.out
    hive/trunk/ql/src/test/results/clientpositive/multi_insert_lateral_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/multi_insert_move_tasks_share_dependencies.q.out
    hive/trunk/ql/src/test/results/clientpositive/no_hooks.q.out
    hive/trunk/ql/src/test/results/clientpositive/noalias_subq1.q.out
    hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out
    hive/trunk/ql/src/test/results/clientpositive/notable_alias1.q.out
    hive/trunk/ql/src/test/results/clientpositive/notable_alias2.q.out
    hive/trunk/ql/src/test/results/clientpositive/nullgroup.q.out
    hive/trunk/ql/src/test/results/clientpositive/nullgroup2.q.out
    hive/trunk/ql/src/test/results/clientpositive/nullgroup4.q.out
    hive/trunk/ql/src/test/results/clientpositive/nullgroup4_multi_distinct.q.out
    hive/trunk/ql/src/test/results/clientpositive/order2.q.out
    hive/trunk/ql/src/test/results/clientpositive/outer_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd2.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_clusterby.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_multi_insert.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join1.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_transform.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_udf_col.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppr_pushdown3.q.out
    hive/trunk/ql/src/test/results/clientpositive/quote1.q.out
    hive/trunk/ql/src/test/results/clientpositive/rand_partitionpruner3.q.out
    hive/trunk/ql/src/test/results/clientpositive/rcfile_null_value.q.out
    hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out
    hive/trunk/ql/src/test/results/clientpositive/regexp_extract.q.out
    hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/set_processor_namespaces.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/subq.q.out
    hive/trunk/ql/src/test/results/clientpositive/subq2.q.out
    hive/trunk/ql/src/test/results/clientpositive/transform_ppr1.q.out
    hive/trunk/ql/src/test/results/clientpositive/transform_ppr2.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf1.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf9.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_10_trims.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_hour.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_like.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_lower.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_minute.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_parse_url.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_second.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_union.q.out
    hive/trunk/ql/src/test/results/clientpositive/union.q.out
    hive/trunk/ql/src/test/results/clientpositive/union20.q.out
    hive/trunk/ql/src/test/results/clientpositive/union22.q.out
    hive/trunk/ql/src/test/results/clientpositive/union24.q.out
    hive/trunk/ql/src/test/results/clientpositive/union33.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_ppr.q.out
    hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
    hive/trunk/ql/src/test/results/compiler/plan/union.q.xml

Modified: hive/trunk/contrib/src/test/results/clientpositive/dboutput.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/results/clientpositive/dboutput.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/contrib/src/test/results/clientpositive/dboutput.q.out (original)
+++ hive/trunk/contrib/src/test/results/clientpositive/dboutput.q.out Sat Jul 27 21:52:02 2013
@@ -141,7 +141,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (key < 10.0)
+                  expr: (key < 10)
                   type: boolean
               Select Operator
                 expressions:

Modified: hive/trunk/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out (original)
+++ hive/trunk/contrib/src/test/results/clientpositive/serde_typedbytes4.q.out Sat Jul 27 21:52:02 2013
@@ -48,7 +48,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (key < 100.0)
+                  expr: (key < 100)
                   type: boolean
               Select Operator
                 expressions:

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/TypeCheckProcFactory.java Sat Jul 27 21:52:02 2013
@@ -813,10 +813,9 @@ public final class TypeCheckProcFactory 
 
           if (inferTypes.contains(constType) && inferTypes.contains(columnType)
               && !columnType.equalsIgnoreCase(constType)) {
-            String constValue =
-                ((ExprNodeConstantDesc) children.get(constIdx)).getValue().toString();
+            Object originalValue =  ((ExprNodeConstantDesc) children.get(constIdx)).getValue();
+            String constValue = originalValue.toString();
             boolean triedDouble = false;
-
             Number value = null;
             try {
               if (columnType.equalsIgnoreCase(serdeConstants.TINYINT_TYPE_NAME)) {
@@ -829,12 +828,17 @@ public final class TypeCheckProcFactory 
                 value = new Long(constValue);
               } else if (columnType.equalsIgnoreCase(serdeConstants.FLOAT_TYPE_NAME)) {
                 value = new Float(constValue);
-              } else if (columnType.equalsIgnoreCase(serdeConstants.DOUBLE_TYPE_NAME)
-                  || (columnType.equalsIgnoreCase(serdeConstants.STRING_TYPE_NAME)
-                     && !constType.equalsIgnoreCase(serdeConstants.BIGINT_TYPE_NAME))) {
-                // no smart inference for queries like "str_col = bigint_const"
+              } else if (columnType.equalsIgnoreCase(serdeConstants.DOUBLE_TYPE_NAME)) {
                 triedDouble = true;
                 value = new Double(constValue);
+              } else if (columnType.equalsIgnoreCase(serdeConstants.STRING_TYPE_NAME)) {
+                // Don't scramble the const type information if comparing to a string column,
+                // It's not useful to do so; as of now, there is also a hack in
+                // SemanticAnalyzer#genTablePlan that causes every column to look like a string
+                // a string down here, so number type information is always lost otherwise.
+                boolean isNumber = (originalValue instanceof Number);
+                triedDouble = !isNumber;
+                value = isNumber ? (Number)originalValue : new Double(constValue);
               }
             } catch (NumberFormatException nfe) {
               // this exception suggests the precise type inference did not succeed

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join0.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join0.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join0.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join0.q.out Sat Jul 27 21:52:02 2013
@@ -45,7 +45,7 @@ SORT BY k1, v1, k2, v2 
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -72,7 +72,7 @@ SORT BY k1, v1, k2, v2 
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -205,7 +205,7 @@ SORT BY k1, v1, k2, v2 
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -232,7 +232,7 @@ SORT BY k1, v1, k2, v2 
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -281,7 +281,7 @@ SORT BY k1, v1, k2, v2 
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -303,7 +303,7 @@ SORT BY k1, v1, k2, v2 
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join12.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join12.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join12.q.out Sat Jul 27 21:52:02 2013
@@ -51,7 +51,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -76,7 +76,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 80.0) and (key < 100.0))'
+'                  expr: ((key < 80) and (key < 100))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -103,7 +103,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -191,7 +191,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -214,7 +214,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 80.0) and (key < 100.0))'
+'                  expr: ((key < 80) and (key < 100))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -241,7 +241,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -302,7 +302,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -325,7 +325,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -354,7 +354,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 80.0) and (key < 100.0))'
+'                  expr: ((key < 80) and (key < 100))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -406,7 +406,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -430,7 +430,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 100.0) and (key < 80.0))'
+'                  expr: ((key < 100) and (key < 80))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -456,7 +456,7 @@ ON src1.c1 = src3.c5 AND src3.c5 < 80;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 80.0) and (key < 100.0))'
+'                  expr: ((key < 80) and (key < 100))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join13.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join13.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join13.q.out Sat Jul 27 21:52:02 2013
@@ -50,7 +50,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 100.0)'
+'                  expr: (key < 100)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -77,7 +77,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 100.0)'
+'                  expr: (key < 100)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -120,7 +120,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -230,7 +230,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -294,7 +294,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -351,7 +351,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 100.0)'
+'                  expr: (key < 100)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -376,7 +376,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 100.0)'
+'                  expr: (key < 100)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -414,7 +414,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 100.0)'
+'                  expr: (key < 100)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -438,7 +438,7 @@ ON src1.c1 + src2.c3 = src3.c5 AND src3.
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 100.0)'
+'                  expr: (key < 100)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join16.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join16.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join16.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join16.q.out Sat Jul 27 21:52:02 2013
@@ -42,7 +42,7 @@ where tab.value < 200;
 '            alias: tab'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 20.0) and (value < 200.0))'
+'                  expr: ((key > 20) and (value < 200))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -62,7 +62,7 @@ where tab.value < 200;
 '            alias: a'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (((key > 10.0) and (key > 20.0)) and (value < 200.0))'
+'                  expr: (((key > 10) and (key > 20)) and (value < 200))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -146,7 +146,7 @@ where tab.value < 200;
 '            alias: a'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (((key > 10.0) and (key > 20.0)) and (value < 200.0))'
+'                  expr: (((key > 10) and (key > 20)) and (value < 200))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -173,7 +173,7 @@ where tab.value < 200;
 '            alias: tab'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 20.0) and (value < 200.0))'
+'                  expr: ((key > 20) and (value < 200))'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -217,7 +217,7 @@ where tab.value < 200;
 '            alias: a'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (((key > 10.0) and (key > 20.0)) and (value < 200.0))'
+'                  expr: (((key > 10) and (key > 20)) and (value < 200))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -247,7 +247,7 @@ where tab.value < 200;
 '            alias: tab'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 20.0) and (value < 200.0))'
+'                  expr: ((key > 20) and (value < 200))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join20.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join20.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join20.q.out Sat Jul 27 21:52:02 2013
@@ -42,7 +42,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -52,7 +52,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '                filter predicates:'
 '                  0 '
 '                  1 '
-'                  2 {(key < 20.0)}'
+'                  2 {(key < 20)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -64,7 +64,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -74,7 +74,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '                filter predicates:'
 '                  0 '
 '                  1 '
-'                  2 {(key < 20.0)}'
+'                  2 {(key < 20)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -99,7 +99,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '              filter predicates:'
 '                0 '
 '                1 '
-'                2 {(key < 20.0)}'
+'                2 {(key < 20)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -231,7 +231,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -252,7 +252,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -297,7 +297,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '          filter predicates:'
 '            0 '
 '            1 '
-'            2 {(VALUE._col0 < 20.0)}'
+'            2 {(VALUE._col0 < 20)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'
@@ -378,7 +378,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key < 15.0))'
+'                  expr: ((key < 10) and (key < 15))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -388,7 +388,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '                filter predicates:'
 '                  0 '
 '                  1 '
-'                  2 {(key < 20.0)}'
+'                  2 {(key < 20)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -400,7 +400,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 15.0) and (key < 10.0))'
+'                  expr: ((key < 15) and (key < 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -410,7 +410,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '                filter predicates:'
 '                  0 '
 '                  1 '
-'                  2 {(key < 20.0)}'
+'                  2 {(key < 20)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -435,7 +435,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '              filter predicates:'
 '                0 '
 '                1 '
-'                2 {(key < 20.0)}'
+'                2 {(key < 20)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -567,7 +567,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key < 15.0))'
+'                  expr: ((key < 10) and (key < 15))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -588,7 +588,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 15.0) and (key < 10.0))'
+'                  expr: ((key < 15) and (key < 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -633,7 +633,7 @@ SORT BY k1,v1,k2,v2,k3,v3 
 '          filter predicates:'
 '            0 '
 '            1 '
-'            2 {(VALUE._col0 < 20.0)}'
+'            2 {(VALUE._col0 < 20)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join21.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join21.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join21.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join21.q.out Sat Jul 27 21:52:02 2013
@@ -39,9 +39,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                1 {key} {value}'
 '                2 {key} {value}'
 '              filter predicates:'
-'                0 {(key < 10.0)}'
+'                0 {(key < 10)}'
 '                1 '
-'                2 {(key < 10.0)}'
+'                2 {(key < 10)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -53,7 +53,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -61,9 +61,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                  1 {key} {value}'
 '                  2 {key} {value}'
 '                filter predicates:'
-'                  0 {(key < 10.0)}'
+'                  0 {(key < 10)}'
 '                  1 '
-'                  2 {(key < 10.0)}'
+'                  2 {(key < 10)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -86,9 +86,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                1 {key} {value}'
 '                2 {key} {value}'
 '              filter predicates:'
-'                0 {(key < 10.0)}'
+'                0 {(key < 10)}'
 '                1 '
-'                2 {(key < 10.0)}'
+'                2 {(key < 10)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -187,7 +187,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -230,9 +230,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            1 {VALUE._col0} {VALUE._col1}'
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
-'            0 {(VALUE._col0 < 10.0)}'
+'            0 {(VALUE._col0 < 10)}'
 '            1 '
-'            2 {(VALUE._col0 < 10.0)}'
+'            2 {(VALUE._col0 < 10)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join23.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join23.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join23.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join23.q.out Sat Jul 27 21:52:02 2013
@@ -35,7 +35,7 @@ SELECT  *  FROM src src1 JOIN src src2 W
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -55,7 +55,7 @@ SELECT  *  FROM src src1 JOIN src src2 W
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -135,7 +135,7 @@ SELECT  *  FROM src src1 JOIN src src2 W
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -155,7 +155,7 @@ SELECT  *  FROM src src1 JOIN src src2 W
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -197,7 +197,7 @@ SELECT  *  FROM src src1 JOIN src src2 W
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                sort order: '
@@ -212,7 +212,7 @@ SELECT  *  FROM src src1 JOIN src src2 W
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                sort order: '

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join27.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join27.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join27.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join27.q.out Sat Jul 27 21:52:02 2013
@@ -38,7 +38,7 @@ ON src_12.key = src3.k AND src3.k < 200;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -108,7 +108,7 @@ ON src_12.key = src3.k AND src3.k < 200;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -160,7 +160,7 @@ ON src_12.key = src3.k AND src3.k < 200;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -253,7 +253,7 @@ ON src_12.key = src3.k AND src3.k < 200;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -281,7 +281,7 @@ ON src_12.key = src3.k AND src3.k < 200;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -335,7 +335,7 @@ ON src_12.key = src3.k AND src3.k < 200;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -359,7 +359,7 @@ ON src_12.key = src3.k AND src3.k < 200;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 200.0)'
+'                  expr: (key < 200)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join28.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join28.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join28.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join28.q.out Sat Jul 27 21:52:02 2013
@@ -46,7 +46,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -89,9 +89,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            1 {VALUE._col0} {VALUE._col1}'
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
-'            0 {(VALUE._col0 < 10.0)}'
+'            0 {(VALUE._col0 < 10)}'
 '            1 '
-'            2 {(VALUE._col0 < 10.0)}'
+'            2 {(VALUE._col0 < 10)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'
@@ -206,7 +206,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -227,7 +227,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -253,7 +253,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            1 {VALUE._col0} {VALUE._col1}'
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
-'            0 {(VALUE._col0 < 10.0)}'
+'            0 {(VALUE._col0 < 10)}'
 '            1 '
 '            2 '
 '          handleSkewJoin: false'
@@ -353,7 +353,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -391,7 +391,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -418,7 +418,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
 '            0 '
-'            1 {(VALUE._col0 > 10.0)}'
+'            1 {(VALUE._col0 > 10)}'
 '            2 '
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
@@ -517,7 +517,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -578,8 +578,8 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
 '            0 '
-'            1 {(VALUE._col0 > 10.0)}'
-'            2 {(VALUE._col0 < 10.0)}'
+'            1 {(VALUE._col0 > 10)}'
+'            2 {(VALUE._col0 < 10)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join29.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join29.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join29.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join29.q.out Sat Jul 27 21:52:02 2013
@@ -39,9 +39,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                1 {key} {value}'
 '                2 {key} {value}'
 '              filter predicates:'
-'                0 {(key < 10.0)}'
+'                0 {(key < 10)}'
 '                1 '
-'                2 {(key < 10.0)}'
+'                2 {(key < 10)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -53,7 +53,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -61,9 +61,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                  1 {key} {value}'
 '                  2 {key} {value}'
 '                filter predicates:'
-'                  0 {(key < 10.0)}'
+'                  0 {(key < 10)}'
 '                  1 '
-'                  2 {(key < 10.0)}'
+'                  2 {(key < 10)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -86,9 +86,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                1 {key} {value}'
 '                2 {key} {value}'
 '              filter predicates:'
-'                0 {(key < 10.0)}'
+'                0 {(key < 10)}'
 '                1 '
-'                2 {(key < 10.0)}'
+'                2 {(key < 10)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -187,7 +187,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -230,9 +230,9 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            1 {VALUE._col0} {VALUE._col1}'
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
-'            0 {(VALUE._col0 < 10.0)}'
+'            0 {(VALUE._col0 < 10)}'
 '            1 '
-'            2 {(VALUE._col0 < 10.0)}'
+'            2 {(VALUE._col0 < 10)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'
@@ -2907,7 +2907,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -2915,7 +2915,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                  1 {key} {value}'
 '                  2 {key} {value}'
 '                filter predicates:'
-'                  0 {(key < 10.0)}'
+'                  0 {(key < 10)}'
 '                  1 '
 '                  2 '
 '                handleSkewJoin: false'
@@ -2929,7 +2929,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -2937,7 +2937,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                  1 {key} {value}'
 '                  2 {key} {value}'
 '                filter predicates:'
-'                  0 {(key < 10.0)}'
+'                  0 {(key < 10)}'
 '                  1 '
 '                  2 '
 '                handleSkewJoin: false'
@@ -2962,7 +2962,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                1 {key} {value}'
 '                2 {key} {value}'
 '              filter predicates:'
-'                0 {(key < 10.0)}'
+'                0 {(key < 10)}'
 '                1 '
 '                2 '
 '              handleSkewJoin: false'
@@ -3063,7 +3063,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key > 10.0)'
+'                  expr: (key > 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -3084,7 +3084,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -3110,7 +3110,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            1 {VALUE._col0} {VALUE._col1}'
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
-'            0 {(VALUE._col0 < 10.0)}'
+'            0 {(VALUE._col0 < 10)}'
 '            1 '
 '            2 '
 '          handleSkewJoin: false'
@@ -4197,7 +4197,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -4206,7 +4206,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -4219,7 +4219,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -4228,7 +4228,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -4253,7 +4253,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                2 {key} {value}'
 '              filter predicates:'
 '                0 '
-'                1 {(key > 10.0)}'
+'                1 {(key > 10)}'
 '                2 '
 '              handleSkewJoin: false'
 '              keys:'
@@ -4336,7 +4336,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -4374,7 +4374,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -4401,7 +4401,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
 '            0 '
-'            1 {(VALUE._col0 > 10.0)}'
+'            1 {(VALUE._col0 > 10)}'
 '            2 '
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
@@ -5019,7 +5019,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -5028,8 +5028,8 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
-'                  2 {(key < 10.0)}'
+'                  1 {(key > 10)}'
+'                  2 {(key < 10)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -5046,8 +5046,8 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                2 {key} {value}'
 '              filter predicates:'
 '                0 '
-'                1 {(key > 10.0)}'
-'                2 {(key < 10.0)}'
+'                1 {(key > 10)}'
+'                2 {(key < 10)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -5071,8 +5071,8 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                2 {key} {value}'
 '              filter predicates:'
 '                0 '
-'                1 {(key > 10.0)}'
-'                2 {(key < 10.0)}'
+'                1 {(key > 10)}'
+'                2 {(key < 10)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -5154,7 +5154,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -5215,8 +5215,8 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
 '            0 '
-'            1 {(VALUE._col0 > 10.0)}'
-'            2 {(VALUE._col0 < 10.0)}'
+'            1 {(VALUE._col0 > 10)}'
+'            2 {(VALUE._col0 < 10)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'
@@ -6351,7 +6351,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -6369,7 +6369,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -6391,7 +6391,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -6489,7 +6489,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -6507,7 +6507,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -6529,7 +6529,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -6578,7 +6578,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -6599,7 +6599,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -6620,7 +6620,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -6713,7 +6713,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -6723,7 +6723,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '                filter predicates:'
 '                  0 '
 '                  1 '
-'                  2 {(key < 10.0)}'
+'                  2 {(key < 10)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -6735,7 +6735,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -6745,7 +6745,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '                filter predicates:'
 '                  0 '
 '                  1 '
-'                  2 {(key < 10.0)}'
+'                  2 {(key < 10)}'
 '                handleSkewJoin: false'
 '                keys:'
 '                  0 [Column[key]]'
@@ -6770,7 +6770,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '              filter predicates:'
 '                0 '
 '                1 '
-'                2 {(key < 10.0)}'
+'                2 {(key < 10)}'
 '              handleSkewJoin: false'
 '              keys:'
 '                0 [Column[key]]'
@@ -6852,7 +6852,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -6873,7 +6873,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -6918,7 +6918,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '          filter predicates:'
 '            0 '
 '            1 '
-'            2 {(VALUE._col0 < 10.0)}'
+'            2 {(VALUE._col0 < 10)}'
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
 '          Select Operator'
@@ -7487,7 +7487,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -7495,7 +7495,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                  1 {key} {value}'
 '                  2 {key} {value}'
 '                filter predicates:'
-'                  0 {(key < 10.0)}'
+'                  0 {(key < 10)}'
 '                  1 '
 '                  2 '
 '                handleSkewJoin: false'
@@ -7509,7 +7509,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -7517,7 +7517,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                  1 {key} {value}'
 '                  2 {key} {value}'
 '                filter predicates:'
-'                  0 {(key < 10.0)}'
+'                  0 {(key < 10)}'
 '                  1 '
 '                  2 '
 '                handleSkewJoin: false'
@@ -7542,7 +7542,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '                1 {key} {value}'
 '                2 {key} {value}'
 '              filter predicates:'
-'                0 {(key < 10.0)}'
+'                0 {(key < 10)}'
 '                1 '
 '                2 '
 '              handleSkewJoin: false'
@@ -7643,7 +7643,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -7664,7 +7664,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -7690,7 +7690,7 @@ SELECT * FROM src src1 LEFT OUTER JOIN s
 '            1 {VALUE._col0} {VALUE._col1}'
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
-'            0 {(VALUE._col0 < 10.0)}'
+'            0 {(VALUE._col0 < 10)}'
 '            1 '
 '            2 '
 '          handleSkewJoin: false'
@@ -7763,7 +7763,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -7772,7 +7772,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -7785,7 +7785,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -7794,7 +7794,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -7811,7 +7811,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -7823,7 +7823,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -7913,7 +7913,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -7922,7 +7922,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -7935,7 +7935,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -7944,7 +7944,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -7961,7 +7961,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -7973,7 +7973,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '                  2 {key} {value}'
 '                filter predicates:'
 '                  0 '
-'                  1 {(key > 10.0)}'
+'                  1 {(key > 10)}'
 '                  2 '
 '                handleSkewJoin: false'
 '                keys:'
@@ -8014,7 +8014,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -8035,7 +8035,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -8056,7 +8056,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key < 10.0)'
+'                  expr: (key < 10)'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -8083,7 +8083,7 @@ SELECT * FROM src src1 RIGHT OUTER JOIN 
 '            2 {VALUE._col0} {VALUE._col1}'
 '          filter predicates:'
 '            0 '
-'            1 {(VALUE._col0 > 10.0)}'
+'            1 {(VALUE._col0 > 10)}'
 '            2 '
 '          handleSkewJoin: false'
 '          outputColumnNames: _col0, _col1, _col4, _col5, _col8, _col9'
@@ -8215,7 +8215,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -8233,7 +8233,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -8255,7 +8255,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -8353,7 +8353,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -8371,7 +8371,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -8393,7 +8393,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -8449,7 +8449,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -8467,7 +8467,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              HashTable Sink Operator'
 '                condition expressions:'
@@ -8489,7 +8489,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Map Join Operator'
 '                condition map:'
@@ -8538,7 +8538,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -8559,7 +8559,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 10.0))'
+'                  expr: ((key > 10) and (key < 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'
@@ -8580,7 +8580,7 @@ SELECT * FROM src src1 JOIN src src2 ON 
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key < 10.0) and (key > 10.0))'
+'                  expr: ((key < 10) and (key > 10))'
 '                  type: boolean'
 '              Reduce Output Operator'
 '                key expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join4.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join4.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join4.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join4.q.out Sat Jul 27 21:52:02 2013
@@ -48,7 +48,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 15.0) and (key < 25.0))'
+'                  expr: ((key > 15) and (key < 25))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -75,7 +75,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 20.0))'
+'                  expr: ((key > 10) and (key < 20))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -161,7 +161,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 20.0))'
+'                  expr: ((key > 10) and (key < 20))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -189,7 +189,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 15.0) and (key < 25.0))'
+'                  expr: ((key > 15) and (key < 25))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join5.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join5.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join5.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join5.q.out Sat Jul 27 21:52:02 2013
@@ -48,7 +48,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 20.0))'
+'                  expr: ((key > 10) and (key < 20))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -75,7 +75,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 15.0) and (key < 25.0))'
+'                  expr: ((key > 15) and (key < 25))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -161,7 +161,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 20.0))'
+'                  expr: ((key > 10) and (key < 20))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -189,7 +189,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 15.0) and (key < 25.0))'
+'                  expr: ((key > 15) and (key < 25))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join6.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join6.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join6.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join6.q.out Sat Jul 27 21:52:02 2013
@@ -38,7 +38,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 20.0))'
+'                  expr: ((key > 10) and (key < 20))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -66,7 +66,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 15.0) and (key < 25.0))'
+'                  expr: ((key > 15) and (key < 25))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join7.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join7.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join7.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join7.q.out Sat Jul 27 21:52:02 2013
@@ -44,7 +44,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 10.0) and (key < 20.0))'
+'                  expr: ((key > 10) and (key < 20))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -72,7 +72,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 15.0) and (key < 25.0))'
+'                  expr: ((key > 15) and (key < 25))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -100,7 +100,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src3'
 '            Filter Operator'
 '              predicate:'
-'                  expr: ((key > 20.0) and (key < 25.0))'
+'                  expr: ((key > 20) and (key < 25))'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/auto_join8.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/auto_join8.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/auto_join8.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/auto_join8.q.out Sat Jul 27 21:52:02 2013
@@ -48,7 +48,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (((key > 15.0) and (key < 25.0)) and key is not null)'
+'                  expr: (((key > 15) and (key < 25)) and key is not null)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -75,7 +75,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (((key > 10.0) and (key < 20.0)) and key is not null)'
+'                  expr: (((key > 10) and (key < 20)) and key is not null)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -165,7 +165,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src1'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (((key > 10.0) and (key < 20.0)) and key is not null)'
+'                  expr: (((key > 10) and (key < 20)) and key is not null)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'
@@ -193,7 +193,7 @@ INSERT OVERWRITE TABLE dest1 SELECT c.c1
 '            alias: src2'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (((key > 15.0) and (key < 25.0)) and key is not null)'
+'                  expr: (((key > 15) and (key < 25)) and key is not null)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/beelinepositive/create_view.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/beelinepositive/create_view.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/beelinepositive/create_view.q.out (original)
+++ hive/trunk/ql/src/test/results/beelinepositive/create_view.q.out Sat Jul 27 21:52:02 2013
@@ -113,7 +113,7 @@ SELECT * from view2 where key=18;
 '            alias: src'
 '            Filter Operator'
 '              predicate:'
-'                  expr: (key = 18.0)'
+'                  expr: (key = 18)'
 '                  type: boolean'
 '              Select Operator'
 '                expressions:'

Modified: hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out Sat Jul 27 21:52:02 2013
@@ -20,7 +20,7 @@ STAGE PLANS:
             alias: src
             Filter Operator
               predicate:
-                  expr: (key < 100.0)
+                  expr: (key < 100)
                   type: boolean
               Select Operator
                 expressions:
@@ -92,7 +92,7 @@ STAGE PLANS:
             alias: a
             Filter Operator
               predicate:
-                  expr: (key < 100.0)
+                  expr: (key < 100)
                   type: boolean
               Reduce Output Operator
                 key expressions:

Modified: hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1507724&r1=1507723&r2=1507724&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Sat Jul 27 21:52:02 2013
@@ -456,7 +456,7 @@ STAGE PLANS:
             Filter Operator
               isSamplingPred: false
               predicate:
-                  expr: ((ts = 3.0) and (dt = 10.0))
+                  expr: ((ts = 3.0) and (dt = 10))
                   type: boolean
               Select Operator
                 Group By Operator