http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/optimizer/ItemExpr.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/ItemExpr.cpp b/core/sql/optimizer/ItemExpr.cpp index ae04fc0..4b65904 100644 --- a/core/sql/optimizer/ItemExpr.cpp +++ b/core/sql/optimizer/ItemExpr.cpp @@ -10416,12 +10416,20 @@ NABoolean ConstValue::isExactNumeric() const ((NumericType *)type_)->isExact()); } +// exact numeric value can only be returned for certain types +// and if the value is within max largeint range. NABoolean ConstValue::canGetExactNumericValue() const { if (isExactNumeric()) { NumericType &t = (NumericType &) *type_; + // if unsigned largeint and value greater than largeint max, + // cannot return exact numeric value. + if ((t.getFSDatatype() == REC_BIN64_UNSIGNED) && + ((*(UInt64*)value_) > LLONG_MAX)) + return FALSE; + // for now we can't do it for arbitrary exact numeric types, sorry if (NOT t.isDecimal() AND NOT t.isComplexType() AND @@ -10460,8 +10468,17 @@ Int64 ConstValue::getExactNumericValue(Lng32 &scale) const break; case 8: - CMPASSERT(t.isSigned()); - result = *((Int64 *) value_); + if (t.isUnsigned()) + { + if ((*(UInt64*)value_) > LLONG_MAX) + { + CMPASSERT(0); + } + else + result = *(UInt64*)value_; + } + else + result = *((Int64 *) value_); break; default:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/optimizer/ValueDesc.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/ValueDesc.cpp b/core/sql/optimizer/ValueDesc.cpp index 173ce7a..eba2e2a 100644 --- a/core/sql/optimizer/ValueDesc.cpp +++ b/core/sql/optimizer/ValueDesc.cpp @@ -380,6 +380,31 @@ void ValueId::coerceType(const NAType& desiredType, newType = new (STMTHEAP) SQLSmall(isSigned, desiredType.supportsSQLnull()); } // TinyInt + else if ((desiredType.getFSDatatype() == REC_BIN64_UNSIGNED) && + (CmpCommon::getDefault(TRAF_LARGEINT_UNSIGNED_IO) == DF_OFF)) + { + NumericType &nTyp = (NumericType &)desiredType; + if (CmpCommon::getDefault(BIGNUM_IO) == DF_OFF) + { + Int16 DisAmbiguate = 0; + newType = new (STMTHEAP) + SQLLargeInt(nTyp.getScale(), + DisAmbiguate, + TRUE, + nTyp.supportsSQLnull(), + NULL); + } + else + { + newType = new (STMTHEAP) + SQLBigNum(MAX_HARDWARE_SUPPORTED_UNSIGNED_NUMERIC_PRECISION, + nTyp.getScale(), + FALSE, + FALSE, + nTyp.supportsSQLnull(), + NULL); + } + } else if (DFS2REC::isBigNum(desiredType.getFSDatatype())) { // If bignum IO is not enabled or http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/parser/SqlParserAux.cpp ---------------------------------------------------------------------- diff --git a/core/sql/parser/SqlParserAux.cpp b/core/sql/parser/SqlParserAux.cpp index 3f8976c..61ca86e 100644 --- a/core/sql/parser/SqlParserAux.cpp +++ b/core/sql/parser/SqlParserAux.cpp @@ -847,7 +847,10 @@ ItemExpr *literalOfNumericPassingScale(NAString *strptr, char sign, // and the descaled one to be converted by atoxxx (cvtstr). // size_t strSize = cvtstr->length(); + NABoolean createSignedDatatype = + ((CmpCommon::getDefault(TRAF_CREATE_SIGNED_NUMERIC_LITERAL)) == DF_ON); if (sign == '-') { + createSignedDatatype = TRUE; strptr->prepend(sign); if (strptr != cvtstr) cvtstr->prepend(sign); @@ -867,15 +870,20 @@ ItemExpr *literalOfNumericPassingScale(NAString *strptr, char sign, short datatype = -1; Lng32 length = -1; if (strSize < 5) { - datatype = REC_BIN16_SIGNED; + datatype = (createSignedDatatype ? REC_BIN16_SIGNED : REC_BIN16_UNSIGNED); length = sizeof(short); } else if (strSize < 10) { - datatype = REC_BIN32_SIGNED; + datatype = (createSignedDatatype ? REC_BIN32_SIGNED : REC_BIN32_UNSIGNED); length = sizeof(Lng32); } else if (strSize <= 19) { - datatype = REC_BIN64_SIGNED; + datatype = (createSignedDatatype ? REC_BIN64_SIGNED : REC_BIN64_UNSIGNED); length = sizeof(Int64); - } + } else if (strSize == 20) { + createSignedDatatype = FALSE; + datatype = REC_BIN64_UNSIGNED; + length = sizeof(Int64); + } + if (datatype != -1) { rc = convDoIt((char*)cvtstr->data(), (Lng32)cvtstr->length(), @@ -909,7 +917,7 @@ ItemExpr *literalOfNumericPassingScale(NAString *strptr, char sign, (length, (Lng32)strSize, // precision (Lng32)scale, - TRUE, + createSignedDatatype, FALSE), (void *)numericVal, (UInt32) length, @@ -1028,7 +1036,7 @@ NABoolean literalToNumeric(NAString *strptr, double &val, char sign) val = convertInt64ToDouble(i64Val) * pow(10, -scale); else { ComASSERT(BigNumHelper::ConvBigNumWithSignToInt64Helper - (bigNumSize, bigNum, &i64Val) == 0); + (bigNumSize, bigNum, (void*)&i64Val,FALSE) == 0); val = convertInt64ToDouble(i64Val) * pow(10, -scale); NADELETEBASIC(bigNum, (PARSERHEAP())); } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/parser/sqlparser.y ---------------------------------------------------------------------- diff --git a/core/sql/parser/sqlparser.y b/core/sql/parser/sqlparser.y index 2b0661a..3cd3663 100755 --- a/core/sql/parser/sqlparser.y +++ b/core/sql/parser/sqlparser.y @@ -10691,22 +10691,6 @@ non_int_type : numeric_type_token left_uint_uint_right signed_option YYABORT; } - // old behavior, if max allowed is 18. - if ($2->left() > MAX_HARDWARE_SUPPORTED_UNSIGNED_NUMERIC_PRECISION - AND $2->left() <= MAX_HARDWARE_SUPPORTED_SIGNED_NUMERIC_PRECISION - AND NOT $3 /*is unsigned int*/ AND - (CmpCommon::getDefaultNumeric(MAX_NUMERIC_PRECISION_ALLOWED) - == MAX_HARDWARE_SUPPORTED_SIGNED_NUMERIC_PRECISION)) { - // Precision of $0~string0 UNSIGNED data type, - // $1~int0, cannot exceed 9. - *SqlParser_Diags << DgSqlCode(-3008) - << DgString0("NUMERIC") - << DgInt0($2->left()) - << DgInt1(9); - delete $2; - YYABORT; - } - if (($2->left() > MAX_HARDWARE_SUPPORTED_SIGNED_NUMERIC_PRECISION) || (($2->left() > MAX_HARDWARE_SUPPORTED_UNSIGNED_NUMERIC_PRECISION) AND NOT $3)) $$ = new (PARSERHEAP()) @@ -10717,7 +10701,6 @@ non_int_type : numeric_type_token left_uint_uint_right signed_option SQLNumeric( $3,$2->left(), $2->right(), DisAmbiguate ); } delete $2; -#pragma warn(1506) // warning elimination } | TOK_NUMERIC signed_option { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/regress/compGeneral/EXPECTED042 ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/EXPECTED042 b/core/sql/regress/compGeneral/EXPECTED042 index 55fb89e..dc6d864 100644 --- a/core/sql/regress/compGeneral/EXPECTED042 +++ b/core/sql/regress/compGeneral/EXPECTED042 @@ -1,9 +1,9 @@ >>showstats for table t042_orderline on ol_o_id detail; Detailed Histogram data for Table TRAFODION.ORDERENTRY.T042_ORDERLINE -Table ID: 2761910211648663657 +Table ID: 1956915417785292522 -Hist ID: 1309682661 +Hist ID: 1327343796 Column(s): OL_O_ID Total Rows: 10 Total UEC: 4 @@ -1788,15 +1788,19 @@ HQC key=SELECT T . VARCHAR0_UNIQ AS T_VARCHAR0_UNIQ , T . CHAR2_2 AS T_CHAR2_2 , >> >>-- test compile time >> +>>sh more /proc/loadavg | cut -d' ' -f 1-3 | sed -e 's/^/System load: /' >> LOG042; +System load: 0.75 0.87 0.98 +>>sh grep "model name" /proc/cpuinfo | head -1 | cut -d '@' -f 2 | sed -e 's/^/CPU frequency: /' >> LOG042; +CPU frequency: model name : Intel Core Processor (Haswell) >>set statistics on; >>prepare xx from select * from t042_orderline where ol_o_id = 1 ; --- SQL command prepared. -Start Time 2015/09/24 16:38:19.189001 -End Time 2015/09/24 16:38:19.191810 -Elapsed Time 00:00:00.002809 -Compile Time 00:00:00.002809 +Start Time 2016/06/24 07:10:14.550650 +End Time 2016/06/24 07:10:14.552758 +Elapsed Time 00:00:00.002108 +Compile Time 00:00:00.002108 Execution Time 00:00:00.000000 @@ -1827,10 +1831,10 @@ HQC key=SELECT * FROM T042_ORDERLINE WHERE OL_O_ID = #NP# ; --- SQL command prepared. -Start Time 2015/09/24 16:38:19.332484 -End Time 2015/09/24 16:38:19.335346 -Elapsed Time 00:00:00.002862 -Compile Time 00:00:00.002862 +Start Time 2016/06/24 07:10:14.695034 +End Time 2016/06/24 07:10:14.697872 +Elapsed Time 00:00:00.002838 +Compile Time 00:00:00.002838 Execution Time 00:00:00.000000 @@ -2218,9 +2222,9 @@ NUM_HKEYS NUM_SKEYS NUM_MAX_VALUES_PER_KEY NUM_HASH_TABLE_BUCKETS ---------- ---------- ------------- -------------- 134 0 1 0 - 134 0 1 0 - 134 1 1 0 134 1 1 0 + 142 0 1 0 + 142 1 1 0 150 2 3 0 150 3 3 0 187 0 4 0 @@ -2312,9 +2316,9 @@ NUM_HKEYS NUM_SKEYS NUM_MAX_VALUES_PER_KEY NUM_HASH_TABLE_BUCKETS 90 0 0 3 98 1 1 0 134 0 1 0 - 134 0 1 0 - 134 1 1 0 134 1 1 0 + 142 0 1 0 + 142 1 1 0 150 2 3 0 150 3 3 0 187 0 4 0 http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/regress/executor/EXPECTED063 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/EXPECTED063 b/core/sql/regress/executor/EXPECTED063 index 28c73e7..53a8b4a 100755 --- a/core/sql/regress/executor/EXPECTED063 +++ b/core/sql/regress/executor/EXPECTED063 @@ -574,27 +574,27 @@ A (EXPR) (EXPR) 1 10 10 2 18 18 - 3 27 27 4 35 35 - 5 45 45 - 6 45 45 - 7 45 45 - 8 45 45 9 45 45 10 45 45 - 11 45 45 12 45 45 13 45 45 14 45 45 + 17 45 45 + 19 45 45 + 23 45 45 + 3 27 27 + 5 45 45 + 6 45 45 + 7 45 45 + 8 45 45 + 11 45 45 15 45 45 16 45 45 - 17 45 45 18 45 45 - 19 45 45 20 45 45 21 45 45 22 45 45 - 23 45 45 24 45 45 25 45 45 @@ -607,31 +607,31 @@ A (EXPR) (EXPR) A (EXPR) Y ------ -------------------- -------------------- - 1 10 10 - 2 28 28 3 55 55 - 4 90 90 5 135 135 6 165 165 7 200 200 8 240 240 - 9 285 285 - 10 307 307 11 333 333 - 12 363 363 - 13 398 398 - 14 436 436 15 481 481 16 504 504 - 17 529 529 18 556 556 - 19 585 585 20 607 607 21 631 631 22 657 657 - 23 685 685 24 715 715 25 747 747 + 1 10 10 + 2 28 28 + 4 90 90 + 9 285 285 + 10 307 307 + 12 363 363 + 13 398 398 + 14 436 436 + 17 529 529 + 19 585 585 + 23 685 685 --- 25 row(s) selected. >> @@ -878,7 +878,7 @@ A (EXPR) (EXPR) >>-- should return error 4109 >>SELECT a, b, RUNNINGAVG(c) from t063t1 WHERE a > 5 and RUNNINGAVG(c) > 130 >>sequence by a; -*** ERROR[4109] Sequence functions are placed incorrectly: RUNNINGAVG(CAT.SCH.T063T1.C). +*** ERROR[4109] Sequence functions are placed incorrectly: RUNNINGAVG(TRAFODION.SCH.T063T1.C). *** ERROR[8822] The statement was not prepared. @@ -886,7 +886,7 @@ A (EXPR) (EXPR) >>-- should return 4110 >>SELECT a, b, RUNNINGAVG(c) from t063t1 WHERE a > 5; -*** ERROR[4110] The query contains sequence functions but no SEQUENCE BY clause: RUNNINGAVG(CAT.SCH.T063T1.C). +*** ERROR[4110] The query contains sequence functions but no SEQUENCE BY clause: RUNNINGAVG(TRAFODION.SCH.T063T1.C). *** ERROR[8822] The statement was not prepared. @@ -1058,11 +1058,11 @@ AA BB CC G (EXPR) -- -------------------- +G3 143 G1 126 G2 133 -G3 143 -G4 154 G5 128 +G4 154 --- 5 row(s) selected. >> @@ -3315,7 +3315,7 @@ NUM WORKGROUPNUM ANNUALSALARY (EXPR) >>SELECT RUNNINGCOUNT(AnnualSalary ) +>FROM olap_emp ; -*** ERROR[4110] The query contains sequence functions but no SEQUENCE BY clause: RUNNINGCOUNT(CAT.SCH.OLAP_EMP.ANNUALSALARY). +*** ERROR[4110] The query contains sequence functions but no SEQUENCE BY clause: RUNNINGCOUNT(TRAFODION.SCH.OLAP_EMP.ANNUALSALARY). *** ERROR[8822] The statement was not prepared. @@ -3416,7 +3416,7 @@ NUM WORKGROUPNUM ANNUALSALARY (EXPR) +>where runningSUM(paygrade ) > 100 +>sequence by num; -*** ERROR[4109] Sequence functions are placed incorrectly: RUNNINGSUM(CAT.SCH.OLAP_EMP.PAYGRADE). +*** ERROR[4109] Sequence functions are placed incorrectly: RUNNINGSUM(TRAFODION.SCH.OLAP_EMP.PAYGRADE). *** ERROR[8822] The statement was not prepared. @@ -8206,36 +8206,36 @@ PAYGRADE TD_RANK2 >> >>SELECT annualsalary/paygrade as A, RANK(annualsalary/paygrade) TD_RANK2 >>FROM TDemployee qualify rank(annualsalary/paygrade)> 1; -A TD_RANK2 ---------------------- -------------------- - - 11000.00000000 4 - 11000.00000000 4 - 11000.00000000 4 - 7666.66666666 7 - 7666.66666666 7 - 7666.66666666 7 - 6000.00000000 10 - 6000.00000000 10 - 6000.00000000 10 - 5000.00000000 13 - 5000.00000000 13 - 5000.00000000 13 - 4333.33333333 16 - 4333.33333333 16 - 4333.33333333 16 - 3857.14285714 19 - 3857.14285714 19 - 3857.14285714 19 - 3500.00000000 22 - 3500.00000000 22 - 3500.00000000 22 - 3222.22222222 25 - 3222.22222222 25 - 3222.22222222 25 - 3000.00000000 28 - 3000.00000000 28 - 3000.00000000 28 +A TD_RANK2 +---------------------- -------------------- + + 11000.0000000000 4 + 11000.0000000000 4 + 11000.0000000000 4 + 7666.6666666666 7 + 7666.6666666666 7 + 7666.6666666666 7 + 6000.0000000000 10 + 6000.0000000000 10 + 6000.0000000000 10 + 5000.0000000000 13 + 5000.0000000000 13 + 5000.0000000000 13 + 4333.3333333333 16 + 4333.3333333333 16 + 4333.3333333333 16 + 3857.1428571428 19 + 3857.1428571428 19 + 3857.1428571428 19 + 3500.0000000000 22 + 3500.0000000000 22 + 3500.0000000000 22 + 3222.2222222222 25 + 3222.2222222222 25 + 3222.2222222222 25 + 3000.0000000000 28 + 3000.0000000000 28 + 3000.0000000000 28 --- 27 row(s) selected. >> @@ -9786,33 +9786,33 @@ M 1 13 >> >>SELECT sex,annualsalary/paygrade as A, RANK(annualsalary/paygrade) TD_RANK2 >>FROM TDemployee GROUP BY sex qualify rank(annualsalary/paygrade)> 1; -SEX A TD_RANK2 ---- --------------------- -------------------- - -F 6000.00000000 4 -F 6000.00000000 4 -F 6000.00000000 4 -F 4333.33333333 7 -F 4333.33333333 7 -F 4333.33333333 7 -F 3500.00000000 10 -F 3500.00000000 10 -F 3500.00000000 10 -F 3000.00000000 13 -F 3000.00000000 13 -F 3000.00000000 13 -M 7666.66666666 4 -M 7666.66666666 4 -M 7666.66666666 4 -M 5000.00000000 7 -M 5000.00000000 7 -M 5000.00000000 7 -M 3857.14285714 10 -M 3857.14285714 10 -M 3857.14285714 10 -M 3222.22222222 13 -M 3222.22222222 13 -M 3222.22222222 13 +SEX A TD_RANK2 +--- ---------------------- -------------------- + +F 6000.0000000000 4 +F 6000.0000000000 4 +F 6000.0000000000 4 +F 4333.3333333333 7 +F 4333.3333333333 7 +F 4333.3333333333 7 +F 3500.0000000000 10 +F 3500.0000000000 10 +F 3500.0000000000 10 +F 3000.0000000000 13 +F 3000.0000000000 13 +F 3000.0000000000 13 +M 7666.6666666666 4 +M 7666.6666666666 4 +M 7666.6666666666 4 +M 5000.0000000000 7 +M 5000.0000000000 7 +M 5000.0000000000 7 +M 3857.1428571428 10 +M 3857.1428571428 10 +M 3857.1428571428 10 +M 3222.2222222222 13 +M 3222.2222222222 13 +M 3222.2222222222 13 --- 24 row(s) selected. >> http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/regress/executor/EXPECTED140 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/EXPECTED140 b/core/sql/regress/executor/EXPECTED140 index 18c5979..2e96726 100644 --- a/core/sql/regress/executor/EXPECTED140 +++ b/core/sql/regress/executor/EXPECTED140 @@ -124,9 +124,9 @@ Task: CLEANUP Status: Started Object: TRAFODION.SCH.T140C Task: CLEANUP Status: Ended Object: TRAFODION.SCH.T140C Task: PREPARATION Status: Started Object: TRAFODION.SCH.T140C Rows Processed: 2750311 -Task: PREPARATION Status: Ended ET: 00:00:52.833 +Task: PREPARATION Status: Ended ET: 00:00:35.794 Task: COMPLETION Status: Started Object: TRAFODION.SCH.T140C -Task: COMPLETION Status: Ended ET: 00:00:02.019 +Task: COMPLETION Status: Ended ET: 00:00:01.515 --- 2750311 row(s) loaded. >>update statistics for table t140c on every column sample; @@ -147,7 +147,7 @@ Task: COMPLETION Status: Ended ET: 00:00:02.019 ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964541846170 +PLAN_ID .................. 212333332780085319 ROWS_OUT ................ 33 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select a from t140 where b>500; @@ -199,7 +199,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398458 + ObjectUIDs ............. 1816740699929440032 select_list ............ TRAFODION.SCH.T140.A @@ -247,7 +247,7 @@ A ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964542272346 +PLAN_ID .................. 212333332780433763 ROWS_OUT ................ 33 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select an from t140b where b<=200; @@ -299,7 +299,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398582 + ObjectUIDs ............. 1816740699929440212 select_list ............ TRAFODION.SCH.T140B.AN @@ -334,7 +334,7 @@ DESCRIPTION ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964542447721 +PLAN_ID .................. 212333332780550886 ROWS_OUT ................ 33 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select an from t140 where b<=200; @@ -386,7 +386,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398458 + ObjectUIDs ............. 1816740699929440032 select_list ............ TRAFODION.SCH.T140.AN @@ -432,7 +432,7 @@ AN ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964542609372 +PLAN_ID .................. 212333332780687252 ROWS_OUT ................ 10 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select an from t140 where b=200 and an is not null; @@ -484,7 +484,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398458 + ObjectUIDs ............. 1816740699929440032 select_list ............ TRAFODION.SCH.T140.AN input_variables ........ %(200) @@ -528,7 +528,7 @@ AN ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964542828523 +PLAN_ID .................. 212333332780824331 ROWS_OUT ................ 67 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select an, a from t140 where b!=500; @@ -580,7 +580,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398458 + ObjectUIDs ............. 1816740699929440032 select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A @@ -660,7 +660,7 @@ AN ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964543094518 +PLAN_ID .................. 212333332781036815 ROWS_OUT ................ 10 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select an from t140 where bn=201 and an is not null; @@ -712,7 +712,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398458 + ObjectUIDs ............. 1816740699929440032 select_list ............ TRAFODION.SCH.T140.AN input_variables ........ %(201) @@ -755,7 +755,7 @@ AN ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964543236615 +PLAN_ID .................. 212333332781170537 ROWS_OUT ................ 67 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select an, a from t140 where bn!=501; @@ -807,7 +807,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398458 + ObjectUIDs ............. 1816740699929440032 select_list ............ TRAFODION.SCH.T140.AN, TRAFODION.SCH.T140.A @@ -902,7 +902,7 @@ A ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964543497683 +PLAN_ID .................. 212333332781389304 ROWS_OUT ................ 11 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select an from t140 where an between 20 and 40; @@ -954,7 +954,7 @@ DESCRIPTION TRAF_INDEX_CREATE_OPT ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398458 + ObjectUIDs ............. 1816740699929440032 select_list ............ TRAFODION.SCH.T140.AN @@ -1021,7 +1021,7 @@ AN ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964543767378 +PLAN_ID .................. 212333332781583143 ROWS_OUT ................. 1 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select avg(a) from t140b; @@ -1075,10 +1075,10 @@ DESCRIPTION PARALLEL_NUM_ESPS ...... 1 HBASE_DOP_PARALLEL_SCAN 2 GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398582 + ObjectUIDs ............. 1816740699929440212 select_list ............ cast(cast((cast((cast((cast(sum(TRAFODION.SCH.T140B. - A)) * 10000 ...0)) / cast(count(1 )))) / 10000 - ...0))) + A)) * cast(10000 ...0))) / cast(count(1 )))) / + cast(10000 ...0)))) SORT_SCALAR_AGGR ========================== SEQ_NO 2 ONLY CHILD 1 @@ -1135,7 +1135,7 @@ DESCRIPTION ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964544125219 +PLAN_ID .................. 212333332781877617 ROWS_OUT ................. 1 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select avg(a) from t140b; @@ -1189,10 +1189,10 @@ DESCRIPTION PARALLEL_NUM_ESPS ...... 1 HBASE_DOP_PARALLEL_SCAN 1 GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398582 + ObjectUIDs ............. 1816740699929440212 select_list ............ cast(cast((cast((cast((cast(sum(TRAFODION.SCH.T140B. - A)) * 10000 ...0)) / cast(count(1 )))) / 10000 - ...0))) + A)) * cast(10000 ...0))) / cast(count(1 )))) / + cast(10000 ...0)))) SORT_SCALAR_AGGR ========================== SEQ_NO 2 ONLY CHILD 1 @@ -1245,7 +1245,7 @@ DESCRIPTION ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212330964544125219 +PLAN_ID .................. 212333332781877617 ROWS_OUT ................. 1 EST_TOTAL_COST ........... 0.05 STATEMENT ................ select avg(a) from t140b; @@ -1299,10 +1299,10 @@ DESCRIPTION PARALLEL_NUM_ESPS ...... 1 HBASE_DOP_PARALLEL_SCAN 1 GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 8683038913537398582 + ObjectUIDs ............. 1816740699929440212 select_list ............ cast(cast((cast((cast((cast(sum(TRAFODION.SCH.T140B. - A)) * 10000 ...0)) / cast(count(1 )))) / 10000 - ...0))) + A)) * cast(10000 ...0))) / cast(count(1 )))) / + cast(10000 ...0)))) SORT_SCALAR_AGGR ========================== SEQ_NO 2 ONLY CHILD 1 http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/regress/hive/EXPECTED009 ---------------------------------------------------------------------- diff --git a/core/sql/regress/hive/EXPECTED009 b/core/sql/regress/hive/EXPECTED009 index 0cb36f7..7d27a24 100644 --- a/core/sql/regress/hive/EXPECTED009 +++ b/core/sql/regress/hive/EXPECTED009 @@ -347,16 +347,16 @@ Tables in Schema TRAFODION._HV_SCH_T009_ T009T2 --- SQL operation complete. ->>select row_id, catalog_name, schema_name, object_name from table(natablecacheentries('user','local')) order by 2,3,4; +>>select catalog_name, schema_name, object_name from table(natablecacheentries('user','local')) order by 1,2,3; -ROW_ID CATALOG_NAME SCHEMA_NAME OBJECT_NAME ----------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +CATALOG_NAME SCHEMA_NAME OBJECT_NAME +-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - 4 HIVE HIVE PROMOTION - 5 HIVE SCH_T009 T009T2 - 2 TRAFODION _HV_HIVE_ PROMOTION - 3 TRAFODION _HV_SCH_T009_ T009T2 - 1 TRAFODION _MD_ OBJECTS +HIVE HIVE PROMOTION +HIVE SCH_T009 T009T2 +TRAFODION _HV_HIVE_ PROMOTION +TRAFODION _HV_SCH_T009_ T009T2 +TRAFODION _MD_ OBJECTS --- 5 row(s) selected. >>create external table t009t1 for hive.sch_t009.t009t1; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/911f1d64/core/sql/regress/hive/TEST009 ---------------------------------------------------------------------- diff --git a/core/sql/regress/hive/TEST009 b/core/sql/regress/hive/TEST009 index 11a4210..a36acb4 100755 --- a/core/sql/regress/hive/TEST009 +++ b/core/sql/regress/hive/TEST009 @@ -182,7 +182,7 @@ sh sqlci -i "TEST009(select_stmts)"; select catalog_name, schema_name, object_name from table(natablecacheentries('user','local')) order by 1,2,3; drop external table t009t1 for hive.sch_t009.t009t1; get tables in schema "_HV_SCH_T009_"; -select row_id, catalog_name, schema_name, object_name from table(natablecacheentries('user','local')) order by 2,3,4; +select catalog_name, schema_name, object_name from table(natablecacheentries('user','local')) order by 1,2,3; create external table t009t1 for hive.sch_t009.t009t1; invoke hive.sch_t009.t009t1; showddl trafodion."_HV_SCH_T009_".t009t1;
