ddl xns turned on by default (plus couple more fixes) -- cqd ddl_transactions is ON by default -- disabled init/drop trafodion and drop schema from running in a single transaction. This will be changed once couple of dtm issues are fixed -- error 8616 is retuned in case of commit conflict -- fixed begin/commit/set stmts to not retry in case of an error
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/dcf6f535 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/dcf6f535 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/dcf6f535 Branch: refs/heads/master Commit: dcf6f53505600c5ec8f46aa13ae4d3595922f85e Parents: f0465c8 Author: Anoop Sharma <[email protected]> Authored: Mon Apr 25 13:53:26 2016 +0000 Committer: Anoop Sharma <[email protected]> Committed: Mon Apr 25 13:53:26 2016 +0000 ---------------------------------------------------------------------- core/sql/bin/SqlciErrors.txt | 1 + core/sql/executor/ex_transaction.cpp | 7 +- core/sql/exp/ExpErrorEnums.h | 1 + core/sql/generator/GenPreCode.cpp | 3 + core/sql/generator/GenRelDCL.cpp | 4 + core/sql/regress/executor/EXPECTED013.SB | 1 - core/sql/regress/executor/EXPECTED140 | 11 - core/sql/regress/fullstack2/EXPECTED062 | 3 - core/sql/regress/fullstack2/EXPECTED062.RELEASE | 3 - core/sql/regress/seabase/EXPECTED010 | 460 ++++++++----------- core/sql/regress/seabase/EXPECTED011 | 1 - core/sql/regress/seabase/EXPECTED016 | 7 - core/sql/regress/tools/sbdefs | 2 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 4 +- core/sql/sqlcomp/nadefaults.cpp | 2 +- 15 files changed, 206 insertions(+), 304 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- diff --git a/core/sql/bin/SqlciErrors.txt b/core/sql/bin/SqlciErrors.txt index bcb4fb3..f66164e 100644 --- a/core/sql/bin/SqlciErrors.txt +++ b/core/sql/bin/SqlciErrors.txt @@ -1608,6 +1608,7 @@ $1~String1 -------------------------------- 8613 25000 99999 BEGINNER MAJOR DBADMIN SQL cannot commit or rollback a transaction that was started by application. 8614 25000 99999 ADVANCED CRTCL DIALOUT SQL cannot begin a transaction when multiple contexts exist. 8615 ZZZZZ 99999 BEGINNER MAJOR DBADMIN A user-defined transaction has been started. Long Running Update operation cannot be performed. +8616 ZZZZZ 99999 BEGINNER MAJOR DBADMIN A conflict was detected during commit processing. Transaction has been aborted. 8640 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- unused ---- 8641 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- unused ---- 8642 ZZZZZ 99999 UUUUUUUU UUUUU UUUUUUU ---- unused ---- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/executor/ex_transaction.cpp ---------------------------------------------------------------------- diff --git a/core/sql/executor/ex_transaction.cpp b/core/sql/executor/ex_transaction.cpp index e508284..84d1c14 100644 --- a/core/sql/executor/ex_transaction.cpp +++ b/core/sql/executor/ex_transaction.cpp @@ -703,8 +703,11 @@ short ExTransaction::commitTransaction(NABoolean waited) rollbackTransactionWaited(); } - createDiagsArea (EXE_COMMIT_ERROR_FROM_TRANS_SUBSYS, rc, - "TMF"); + if (rc == FEHASCONFLICT) + createDiagsArea (EXE_COMMIT_CONFLICT_FROM_TRANS_SUBSYS, rc, "DTM"); + else + createDiagsArea (EXE_COMMIT_ERROR_FROM_TRANS_SUBSYS, rc, + "DTM"); } if (waited) http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/exp/ExpErrorEnums.h ---------------------------------------------------------------------- diff --git a/core/sql/exp/ExpErrorEnums.h b/core/sql/exp/ExpErrorEnums.h index a56aab1..de4d00f 100644 --- a/core/sql/exp/ExpErrorEnums.h +++ b/core/sql/exp/ExpErrorEnums.h @@ -223,6 +223,7 @@ enum ExeErrorCode EXE_CANT_COMMIT_OR_ROLLBACK = 8613, EXE_CANT_BEGIN_WITH_MULTIPLE_CONTEXTS = 8614, EXE_CANT_BEGIN_USER_TRANS_WITH_LRU = 8615, + EXE_COMMIT_CONFLICT_FROM_TRANS_SUBSYS = 8616, EXE_LAST_CONCURRENCY_CONTROL_ERROR = 8629, //------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/generator/GenPreCode.cpp ---------------------------------------------------------------------- diff --git a/core/sql/generator/GenPreCode.cpp b/core/sql/generator/GenPreCode.cpp index 66ae65f..1591e9a 100644 --- a/core/sql/generator/GenPreCode.cpp +++ b/core/sql/generator/GenPreCode.cpp @@ -2838,6 +2838,8 @@ short DDLExpr::ddlXnsInfo(NABoolean &isDDLxn, NABoolean &xnCanBeStarted) // committed in the called methods. if ((ddlXns()) && ( + (initHbase()) || + (dropHbase()) || (purgedataHbase()) || (initAuthorization()) || (dropAuthorization()) || @@ -2855,6 +2857,7 @@ short DDLExpr::ddlXnsInfo(NABoolean &isDDLxn, NABoolean &xnCanBeStarted) if ((ddlNode && ddlNode->castToStmtDDLNode() && ddlNode->castToStmtDDLNode()->ddlXns()) && ((ddlNode->getOperatorType() == DDL_CLEANUP_OBJECTS) || + (ddlNode->getOperatorType() == DDL_DROP_SCHEMA) || (ddlNode->getOperatorType() == DDL_ALTER_TABLE_DROP_COLUMN) || (ddlNode->getOperatorType() == DDL_ALTER_TABLE_ALTER_COLUMN_DATATYPE))) { http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/generator/GenRelDCL.cpp ---------------------------------------------------------------------- diff --git a/core/sql/generator/GenRelDCL.cpp b/core/sql/generator/GenRelDCL.cpp index 4698ad4..b677f94 100644 --- a/core/sql/generator/GenRelDCL.cpp +++ b/core/sql/generator/GenRelDCL.cpp @@ -259,6 +259,10 @@ short RelTransaction::codeGen(Generator * generator) generator->setExplainTuple( addExplainInfo(trans_tdb, 0, 0, generator)); } + + // no aqr for trasaction control stmts (begin/commit/rollback/set) + generator->setAqrEnabled(FALSE); + return 0; } http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/regress/executor/EXPECTED013.SB ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/EXPECTED013.SB b/core/sql/regress/executor/EXPECTED013.SB index b83960c..c58c7a0 100644 --- a/core/sql/regress/executor/EXPECTED013.SB +++ b/core/sql/regress/executor/EXPECTED013.SB @@ -442,7 +442,6 @@ CONTROL QUERY DEFAULT HBASE_SMALL_SCANNER SYSTEM HBASE_FILTER_PREDS 2 TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ON HBASE_ASYNC_DROP_TABLE OFF POS OFF SCHEMA TRAFODION.T013_SCH http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/regress/executor/EXPECTED140 ---------------------------------------------------------------------- diff --git a/core/sql/regress/executor/EXPECTED140 b/core/sql/regress/executor/EXPECTED140 index 00d157c..ae9f0ae 100644 --- a/core/sql/regress/executor/EXPECTED140 +++ b/core/sql/regress/executor/EXPECTED140 @@ -112,7 +112,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618858 @@ -213,7 +212,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618945 @@ -301,7 +299,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618858 @@ -400,7 +397,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618858 @@ -497,7 +493,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618858 @@ -630,7 +625,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618858 @@ -726,7 +720,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618858 @@ -874,7 +867,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618858 @@ -993,7 +985,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH HBASE_SMALL_SCANNER .... OFF PARALLEL_NUM_ESPS ...... 1 @@ -1108,7 +1099,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH HBASE_SMALL_SCANNER .... OFF PARALLEL_NUM_ESPS ...... 1 @@ -1231,7 +1221,6 @@ DESCRIPTION HBASE_FILTER_PREDS ..... 2 TRAF_ALIGNED_ROW_FORMAT OFF TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ....... ON SCHEMA ................. TRAFODION.SCH GENERATE_EXPLAIN ....... ON ObjectUIDs ............. 2948826545036618945 http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/regress/fullstack2/EXPECTED062 ---------------------------------------------------------------------- diff --git a/core/sql/regress/fullstack2/EXPECTED062 b/core/sql/regress/fullstack2/EXPECTED062 index 4f2aa1f..ca88f6d 100644 --- a/core/sql/regress/fullstack2/EXPECTED062 +++ b/core/sql/regress/fullstack2/EXPECTED062 @@ -501,7 +501,6 @@ CONTROL QUERY DEFAULT HBASE_SMALL_SCANNER SYSTEM HBASE_FILTER_PREDS 2 TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ON SHOWCONTROL_SHOW_ALL ON SCHEMA AAA.BBB CATALOG CCC @@ -546,7 +545,6 @@ CONTROL QUERY DEFAULT HBASE_SMALL_SCANNER SYSTEM HBASE_FILTER_PREDS 2 TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ON SHOWCONTROL_SHOW_ALL ON DEF_CHUNK_SIZE 1000 CPUCOST_DM_GET .001 @@ -582,7 +580,6 @@ CONTROL QUERY DEFAULT HBASE_SMALL_SCANNER SYSTEM HBASE_FILTER_PREDS 2 TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ON SHOWCONTROL_SHOW_ALL ON DEF_CHUNK_SIZE 1000 CPUCOST_DM_GET .001 http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/dcf6f535/core/sql/regress/fullstack2/EXPECTED062.RELEASE ---------------------------------------------------------------------- diff --git a/core/sql/regress/fullstack2/EXPECTED062.RELEASE b/core/sql/regress/fullstack2/EXPECTED062.RELEASE index d933dc7..4b48a87 100644 --- a/core/sql/regress/fullstack2/EXPECTED062.RELEASE +++ b/core/sql/regress/fullstack2/EXPECTED062.RELEASE @@ -501,7 +501,6 @@ CONTROL QUERY DEFAULT HBASE_SMALL_SCANNER SYSTEM HBASE_FILTER_PREDS 2 TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ON SHOWCONTROL_SHOW_ALL ON SCHEMA AAA.BBB CATALOG CCC @@ -546,7 +545,6 @@ CONTROL QUERY DEFAULT HBASE_SMALL_SCANNER SYSTEM HBASE_FILTER_PREDS 2 TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ON SHOWCONTROL_SHOW_ALL ON DEF_CHUNK_SIZE 1000 CPUCOST_DM_GET .001 @@ -582,7 +580,6 @@ CONTROL QUERY DEFAULT HBASE_SMALL_SCANNER SYSTEM HBASE_FILTER_PREDS 2 TRAF_INDEX_CREATE_OPT ON - DDL_TRANSACTIONS ON SHOWCONTROL_SHOW_ALL ON DEF_CHUNK_SIZE 1000 CPUCOST_DM_GET .001
