Addressing review comments for TRAFODION-2317, PR 794
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e17de2bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e17de2bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e17de2bb Branch: refs/heads/master Commit: e17de2bbdc6c99e3192fc1421949365e094141a1 Parents: b90dc33 Author: Hans Zeller <[email protected]> Authored: Fri Oct 28 04:06:10 2016 +0000 Committer: Hans Zeller <[email protected]> Committed: Fri Oct 28 04:06:10 2016 +0000 ---------------------------------------------------------------------- core/sql/common/NAType.cpp | 9 ++++++--- core/sql/regress/compGeneral/EXPECTED045 | 14 +++++++++----- core/sql/regress/compGeneral/TEST045 | 3 --- 3 files changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17de2bb/core/sql/common/NAType.cpp ---------------------------------------------------------------------- diff --git a/core/sql/common/NAType.cpp b/core/sql/common/NAType.cpp index 55e91d7..12cc085 100644 --- a/core/sql/common/NAType.cpp +++ b/core/sql/common/NAType.cpp @@ -726,9 +726,12 @@ short NAType::getMyTypeAsHiveText(NAString * outputStr/*out*/) const break; case REC_MIN_DECIMAL ... REC_MAX_DECIMAL: - outputStr->format("decimal(%d,%d)", - getPrecision(), - getScale()); + if (getPrecision() <= 38) + outputStr->format("decimal(%d,%d)", + getPrecision(), + getScale()); + else + *outputStr = "double"; break; case REC_FLOAT32: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17de2bb/core/sql/regress/compGeneral/EXPECTED045 ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/EXPECTED045 b/core/sql/regress/compGeneral/EXPECTED045 index 5aa6304..6489b5d 100644 --- a/core/sql/regress/compGeneral/EXPECTED045 +++ b/core/sql/regress/compGeneral/EXPECTED045 @@ -968,9 +968,6 @@ SCAN TEMP 4 +>-- VARIANT/ALTERNATIVE Version from TPC-DS (Rollout) is used +>-- ************** +> -+>-- NOTE: THIS QUERY HAS A COMPILER ISSUE. See Mantis 1048 -+>-- BOTH MULTI-QUERIES have the same issue. ****************** -+> +>with cross_items as +> (select i_item_sk ss_item_sk +> from item, @@ -1149,12 +1146,19 @@ SCAN TEMP 4 *** WARNING[2997] (Subquery was not unnested. Reason: No Correlation found) -*** WARNING[1214] Error Error in creating temp table or temp table insert encountered when executing HiveQL statement ../optimizer/NormRelExpr.cpp. +*** WARNING[2997] RESULTS (Operator map_value_ids not supported) --- SQL command prepared. >>execute show_cses; ---- 0 row(s) selected. +OPERATOR HOW_MANY +------------------------------ -------------------- + +BLOCKED_UNION 2 +HIVE_INSERT 1 +SCAN TEMP 15 + +--- 3 row(s) selected. >>execute s; CHANNEL I_BRAND_ID I_CLASS_ID I_CATEGORY_ID SUM_SALES NUMBER_SALES http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e17de2bb/core/sql/regress/compGeneral/TEST045 ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/TEST045 b/core/sql/regress/compGeneral/TEST045 index 4e084a5..36c8bf4 100644 --- a/core/sql/regress/compGeneral/TEST045 +++ b/core/sql/regress/compGeneral/TEST045 @@ -844,9 +844,6 @@ prepare s from -- VARIANT/ALTERNATIVE Version from TPC-DS (Rollout) is used -- ************** --- NOTE: THIS QUERY HAS A COMPILER ISSUE. See Mantis 1048 --- BOTH MULTI-QUERIES have the same issue. ****************** - with cross_items as (select i_item_sk ss_item_sk from item,
