Repository: incubator-trafodion Updated Branches: refs/heads/master b2b01f4d5 -> 14851367b
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1498748/core/sql/regress/seabase/EXPECTED011 ---------------------------------------------------------------------- diff --git a/core/sql/regress/seabase/EXPECTED011 b/core/sql/regress/seabase/EXPECTED011 index 2a36907..7b54686 100644 --- a/core/sql/regress/seabase/EXPECTED011 +++ b/core/sql/regress/seabase/EXPECTED011 @@ -7,7 +7,7 @@ >>invoke T011T1; -- Definition of Trafodion table TRAFODION.SCH.T011T1 --- Definition current Mon Sep 18 16:13:32 2017 +-- Definition current Wed Dec 6 19:43:45 2017 ( A INT NO DEFAULT NOT NULL NOT DROPPABLE @@ -143,7 +143,7 @@ A B ------------------------------------------------------------------ PLAN SUMMARY MODULE_NAME .............. DYNAMICALLY COMPILED STATEMENT_NAME ........... NOT NAMED -PLAN_ID .................. 212372511214096121 +PLAN_ID .................. 212379349426943450 ROWS_OUT ................. 7 EST_TOTAL_COST ........... 0.01 STATEMENT ................ select * from t011t1 where a >= 3 and a < 5; @@ -182,7 +182,7 @@ DESCRIPTION QUERY_CACHE ............ 0 TRAF_ALIGNED_ROW_FORMAT OFF GENERATE_EXPLAIN ....... ON - ObjectUIDs ............. 2068981457564705177 + ObjectUIDs ............. 3014744217526141194 select_list ............ TRAFODION.SCH.T011T1.A, TRAFODION.SCH.T011T1.B @@ -348,8 +348,10 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -1 . 2 root o x 2.00E+000 -. . 1 trafodion_update T011T1 2.00E+000 +3 . 4 root x 2.00E+000 +1 2 3 tuple_flow 2.00E+000 +. . 2 trafodion_vsbb_updat T011T1 1.00E+000 +. . 1 trafodion_scan T011T1 2.00E+000 --- SQL operation complete. >>explain options 'f' update t011t1 set b = b || 'z' where a = 10; @@ -366,8 +368,10 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -1 . 2 root o x 2.00E+000 -. . 1 trafodion_update T011T1 2.00E+000 +3 . 4 root x 2.00E+000 +1 2 3 tuple_flow 2.00E+000 +. . 2 trafodion_vsbb_updat T011T1 1.00E+000 +. . 1 trafodion_scan T011T1 2.00E+000 --- SQL operation complete. >>explain options 'f' update t011t1 set b = 'z' where a = ?; @@ -483,8 +487,10 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -1 . 2 root o x 2.00E+000 -. . 1 trafodion_update T011T1 2.00E+000 +3 . 4 root x 2.00E+000 +1 2 3 tuple_flow 2.00E+000 +. . 2 trafodion_vsbb_updat T011T1 1.00E+000 +. . 1 trafodion_scan T011T1 2.00E+000 --- SQL operation complete. >>explain options 'f' update t011t1 set b = b || 'z' where a = 10; @@ -501,8 +507,10 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -1 . 2 root o x 2.00E+000 -. . 1 trafodion_update T011T1 2.00E+000 +3 . 4 root x 2.00E+000 +1 2 3 tuple_flow 2.00E+000 +. . 2 trafodion_vsbb_updat T011T1 1.00E+000 +. . 1 trafodion_scan T011T1 2.00E+000 --- SQL operation complete. >>explain options 'f' update t011t1 set b = 'z' where a = ?; @@ -519,9 +527,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -4 . 5 root x 1.00E+001 -2 3 4 nested_join 1.00E+001 -. . 3 trafodion_vsbb_updat T011T1 1.00E+000 +6 . 7 root x 1.00E+001 +2 5 6 nested_join 1.00E+001 +3 4 5 tuple_flow 1.00E+000 +. . 4 trafodion_vsbb_updat T011T1 1.00E+000 +. . 3 trafodion_vsbb_scan T011T1 1.00E+000 1 . 2 unpack 1.00E+001 . . 1 values 1.00E+000 @@ -540,9 +550,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -4 . 5 root x 1.00E+001 -2 3 4 nested_join 1.00E+001 -. . 3 trafodion_update T011T1 1.00E+000 +6 . 7 root x 1.00E+001 +2 5 6 nested_join 1.00E+001 +3 4 5 tuple_flow 1.00E+000 +. . 4 trafodion_vsbb_updat T011T1 1.00E+000 +. . 3 trafodion_vsbb_scan T011T1 1.00E+000 1 . 2 unpack 1.00E+001 . . 1 values 1.00E+000 @@ -614,8 +626,10 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -1 . 2 root o x 2.00E+000 -. . 1 trafodion_update T011T1 2.00E+000 +3 . 4 root x 2.00E+000 +1 2 3 tuple_flow 2.00E+000 +. . 2 trafodion_update T011T1 1.00E+000 +. . 1 trafodion_scan T011T1 2.00E+000 --- SQL operation complete. >>explain options 'f' update t011t1 set b = b || 'z' where a = 10; @@ -632,8 +646,10 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -1 . 2 root o x 2.00E+000 -. . 1 trafodion_update T011T1 2.00E+000 +3 . 4 root x 2.00E+000 +1 2 3 tuple_flow 2.00E+000 +. . 2 trafodion_update T011T1 1.00E+000 +. . 1 trafodion_scan T011T1 2.00E+000 --- SQL operation complete. >>explain options 'f' update t011t1 set b = 'z' where a = ?; @@ -650,9 +666,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -4 . 5 root x 1.00E+001 -2 3 4 nested_join 1.00E+001 -. . 3 trafodion_update T011T1 1.00E+000 +6 . 7 root x 1.00E+001 +2 5 6 nested_join 1.00E+001 +3 4 5 tuple_flow 1.00E+000 +. . 4 trafodion_update T011T1 1.00E+000 +. . 3 trafodion_scan T011T1 1.00E+000 1 . 2 unpack 1.00E+001 . . 1 values 1.00E+000 @@ -671,9 +689,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -4 . 5 root x 1.00E+001 -2 3 4 nested_join 1.00E+001 -. . 3 trafodion_update T011T1 1.00E+000 +6 . 7 root x 1.00E+001 +2 5 6 nested_join 1.00E+001 +3 4 5 tuple_flow 1.00E+000 +. . 4 trafodion_update T011T1 1.00E+000 +. . 3 trafodion_scan T011T1 1.00E+000 1 . 2 unpack 1.00E+001 . . 1 values 1.00E+000 @@ -981,9 +1001,11 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -4 . 5 root x 1.00E+001 -2 3 4 nested_join 1.00E+001 -. . 3 trafodion_update T011T1 1.00E+000 +6 . 7 root x 1.00E+001 +2 5 6 nested_join 1.00E+001 +3 4 5 tuple_flow 1.00E+000 +. . 4 trafodion_update T011T1 1.00E+000 +. . 3 trafodion_scan T011T1 1.00E+000 1 . 2 unpack 1.00E+001 . . 1 values 1.00E+000 @@ -1060,8 +1082,10 @@ LC RC OP OPERATOR OPT DESCRIPTION CARD LC RC OP OPERATOR OPT DESCRIPTION CARD ---- ---- ---- -------------------- -------- -------------------- --------- -1 . 2 root o x 2.00E+000 -. . 1 trafodion_update T011T1 2.00E+000 +3 . 4 root x 2.00E+000 +1 2 3 tuple_flow 2.00E+000 +. . 2 trafodion_update T011T1 1.00E+000 +. . 1 trafodion_scan T011T1 2.00E+000 --- SQL operation complete. >>explain options 'f' insert into t011t1 select a,c from t011t3; @@ -1276,7 +1300,7 @@ METRIC_TEXT_TABLE >>invoke trafodion."_REPOS_".metric_query_table; -- Definition of Trafodion table TRAFODION."_REPOS_".METRIC_QUERY_TABLE --- Definition current Mon Sep 18 16:15:51 2017 +-- Definition current Wed Dec 6 19:46:03 2017 ( INSTANCE_ID INT UNSIGNED NO DEFAULT NOT NULL NOT @@ -1464,7 +1488,7 @@ METRIC_TEXT_TABLE >>-- get qid for the prepared stmt >>get qid for statement explstmt; -MXID11000003675212372511181547316000000000206U3333300_2377_EXPLSTMT +MXID11000005355212379349395122217000000000206U3333300_2289_EXPLSTMT --- SQL operation complete. >> @@ -1516,7 +1540,7 @@ SEQ_NUM OPERATOR --- SQL command prepared. >>get qid for statement explstmt2; -MXID11000003675212372511181547316000000000206U3333300_2388_EXPLSTMT2 +MXID11000005355212379349395122217000000000206U3333300_2300_EXPLSTMT2 --- SQL operation complete. >>set qid MXID123456 for explstmt2; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b1498748/core/sql/sqlcomp/nadefaults.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/nadefaults.cpp b/core/sql/sqlcomp/nadefaults.cpp index 70c7036..f672de1 100644 --- a/core/sql/sqlcomp/nadefaults.cpp +++ b/core/sql/sqlcomp/nadefaults.cpp @@ -1483,11 +1483,8 @@ SDDkwd__(EXE_DIAGNOSTIC_EVENTS, "OFF"), DDkwd__(HBASE_SQL_IUD_SEMANTICS, "ON"), DDkwd__(HBASE_STATS_PARTITIONING, "ON"), - // If set to 'OFF' we get a stub cost of 1 for update operations. - // We can remove this once the delete costing code has broader - // exposure. This is 'OFF' at the moment because the update code - // is only partially written. - DDkwd__(HBASE_UPDATE_COSTING, "OFF"), + // If set to 'OFF' we get a stub cost of 0 for update operations. + DDkwd__(HBASE_UPDATE_COSTING, "ON"), DDkwd__(HBASE_UPDEL_CURSOR_OPT, "ON"), DDui___(HBASE_USE_FAKED_REGIONS, "0"),
