[TRAFODION-2827] Turn update costing code on by default
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b1498748
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b1498748
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b1498748
Branch: refs/heads/master
Commit: b1498748391b1cb3edec057c2ee25058450026bb
Parents: a07222f
Author: Dave Birdsall <db...@apache.org>
Authored: Wed Dec 6 22:03:24 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed Dec 6 22:03:24 2017 +0000
----------------------------------------------------------------------
core/sql/regress/compGeneral/EXPECTED013.SB | 12 +-
core/sql/regress/compGeneral/EXPECTED071 | 5 +-
core/sql/regress/core/EXPECTED020.SB | 19 +-
core/sql/regress/seabase/EXPECTED010 | 1107 +++++++++++++++-------
core/sql/regress/seabase/EXPECTED011 | 94 +-
core/sql/sqlcomp/nadefaults.cpp | 7 +-
6 files changed, 859 insertions(+), 385 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1498748/core/sql/regress/compGeneral/EXPECTED013.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED013.SB b/core/sql/regress/compGeneral/EXPECTED013.SB
index 685f1c7..7592226 100644
--- a/core/sql/regress/compGeneral/EXPECTED013.SB
+++ b/core/sql/regress/compGeneral/EXPECTED013.SB
@@ -109,14 +109,14 @@ CREATE TABLE TRAFODION.SCH.ORDERS1
;
-- The following index is a system created index --
-CREATE INDEX ORDERS1_277948757_4279 ON TRAFODION.SCH.ORDERS1
+CREATE INDEX ORDERS1_733933879_4153 ON TRAFODION.SCH.ORDERS1
(
O_CUSTKEY ASC
)
;
ALTER TABLE TRAFODION.SCH.ORDERS1 ADD CONSTRAINT
- TRAFODION.SCH.ORDERS1_277948757_4279 FOREIGN KEY
+ TRAFODION.SCH.ORDERS1_733933879_4153 FOREIGN KEY
(
O_CUSTKEY
)
@@ -139,14 +139,14 @@ CREATE TABLE TRAFODION.SCH.ORDERS2
;
-- The following index is a system created index --
-CREATE INDEX ORDERS2_417358757_4279 ON TRAFODION.SCH.ORDERS2
+CREATE INDEX ORDERS2_693443879_4153 ON TRAFODION.SCH.ORDERS2
(
O_CUSTKEY ASC
)
;
ALTER TABLE TRAFODION.SCH.ORDERS2 ADD CONSTRAINT
- TRAFODION.SCH.ORDERS2_417358757_4279 FOREIGN KEY
+ TRAFODION.SCH.ORDERS2_693443879_4153 FOREIGN KEY
(
O_CUSTKEY
)
@@ -205,9 +205,11 @@ SCAN
BLOCKED_UNION
TRAFODION_VSBB_U
TRAFODION_DELETE
+NESTED_JOIN
TRAFODION_UPDATE
+SCAN
---- 9 row(s) selected.
+--- 11 row(s) selected.
>>
>>prepare XX from delete from customer ;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1498748/core/sql/regress/compGeneral/EXPECTED071
----------------------------------------------------------------------
diff --git a/core/sql/regress/compGeneral/EXPECTED071 b/core/sql/regress/compGeneral/EXPECTED071
index 9fa3ec3..f87f526 100644
--- a/core/sql/regress/compGeneral/EXPECTED071
+++ b/core/sql/regress/compGeneral/EXPECTED071
@@ -427,9 +427,10 @@ TRAFODION_VSBB_DELETE TRAFODION.MTD.MTD1
OPERATOR TNAME BKEY EKEY
------------------------------ ------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-TRAFODION_UPDATE TRAFODION.MTD.MTD1 max_card_est:
+TRAFODION_SCAN MTD1 max_card_est:
+TRAFODION_VSBB_UPDATE TRAFODION.MTD.MTD1 begin_key: (_DIVISION_1_ = _DIVISION_1_) and (STORE_ID = STORE_ID) and (ITEM_ID = ITEM_ID) and (SALE_DATE = SALE_DATE) end_key: (_DIVISION_1_ = _DIVISION_1_) and (STORE_ID = STORE_ID) and (ITEM_ID = ITEM_ID) and (SALE_DATE = SALE_DATE)
---- 1 row(s) selected.
+--- 2 row(s) selected.
>>
>>begin work;
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1498748/core/sql/regress/core/EXPECTED020.SB
----------------------------------------------------------------------
diff --git a/core/sql/regress/core/EXPECTED020.SB b/core/sql/regress/core/EXPECTED020.SB
index 097a530..41440e0 100644
--- a/core/sql/regress/core/EXPECTED020.SB
+++ b/core/sql/regress/core/EXPECTED020.SB
@@ -369,6 +369,8 @@ MODULE_NAME STATEMENT_NAME
? S6
? S7
? S7
+? S7
+? S7
? S8
? S8
? S8
@@ -378,7 +380,7 @@ MODULE_NAME STATEMENT_NAME
? S9
? S9
---- 34 row(s) selected.
+--- 36 row(s) selected.
>>
>>--QUERY 7 - Wildcarding is used in the explain parameters.
>>select
@@ -399,8 +401,9 @@ HYBRID_HASH_SEMI_JOIN
HYBRID_HASH_SEMI_JOIN
NESTED_JOIN
TUPLE_FLOW
+TUPLE_FLOW
---- 7 row(s) selected.
+--- 8 row(s) selected.
>>
>>-- QUERY 8
>>
@@ -426,10 +429,9 @@ SEQ_NUM LEFT_CHILD_SEQ_NUM OPERATOR RIGHT_CHILD_SEQ
1 ? TRAFODION_SCAN ?
1 ? TRAFODION_SCAN ?
1 ? TRAFODION_SCAN ?
- 1 ? TRAFODION_UPDATE ?
+ 1 ? TRAFODION_SCAN ?
1 ? TUPLELIST ?
2 1 ROOT ?
- 2 1 ROOT ?
2 1 SORT ?
2 ? TRAFODION_INSERT ?
2 ? TRAFODION_SCAN ?
@@ -437,6 +439,8 @@ SEQ_NUM LEFT_CHILD_SEQ_NUM OPERATOR RIGHT_CHILD_SEQ
2 ? TRAFODION_SCAN ?
2 ? TRAFODION_SCAN ?
2 ? TRAFODION_SCAN ?
+ 2 ? TRAFODION_UPDATE ?
+ 3 1 TUPLE_FLOW 2
3 1 TUPLE_FLOW 2
3 2 HYBRID_HASH_JOIN 1
3 2 HYBRID_HASH_JOIN 1
@@ -451,10 +455,11 @@ SEQ_NUM LEFT_CHILD_SEQ_NUM OPERATOR RIGHT_CHILD_SEQ
4 3 ROOT ?
4 3 ROOT ?
4 3 ROOT ?
+ 4 3 ROOT ?
5 4 SORT_GROUPBY ?
6 5 ROOT ?
---- 34 row(s) selected.
+--- 36 row(s) selected.
>>
>>--QUERY 9
>>select
@@ -576,9 +581,11 @@ OPERATOR
------------------------------
ROOT
+TRAFODION_SCAN
TRAFODION_UPDATE
+TUPLE_FLOW
---- 2 row(s) selected.
+--- 4 row(s) selected.
>>
>>--QUERY 16
>>select