You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2017/01/05 15:33:11 UTC
[5/5] incubator-trafodion git commit: Merge [TRAFODION-2414] PR 885
enhance 8616 commit conflict error message to include tx conflict details
Merge [TRAFODION-2414] PR 885 enhance 8616 commit conflict error message to include tx conflict details
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/548a1939
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/548a1939
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/548a1939
Branch: refs/heads/master
Commit: 548a1939c988763a317e97e034407cd40c7368bc
Parents: 09342a0 989e2c8
Author: selvaganesang <se...@apache.org>
Authored: Thu Jan 5 15:31:36 2017 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Thu Jan 5 15:31:36 2017 +0000
----------------------------------------------------------------------
core/sqf/export/include/dtm/tm.h | 8 +++
core/sqf/export/include/dtm/tmtransaction.h | 2 +-
core/sqf/inc/cextdecs/cextdecs.h | 14 ++++
.../transactional/TransactionManager.java | 14 +++-
.../client/transactional/TransactionState.java | 24 +++++++
.../transactional/CommitConflictException.java | 61 +++++++++++++++++
.../transactional/TrxRegionEndpoint.java.tmpl | 41 ++++++++---
.../transactional/TrxTransactionState.java.tmpl | 72 +++++++++-----------
.../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 24 +++++--
core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h | 2 +-
.../tm/hbasetmlib2/javaobjectinterfacetm.cpp | 53 +++++++++++++-
.../tm/hbasetmlib2/javaobjectinterfacetm.h | 5 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 42 +++++++++---
.../dtm/TransactionManagerException.java | 70 +++++++++++++++++++
.../sqf/src/seatrans/tm/hbasetmlib2/testrun.cpp | 6 +-
core/sqf/src/tm/tmlib.cpp | 33 ++++++++-
core/sqf/src/tm/tmlibmsg.h | 2 +
core/sqf/src/tm/tmrm.h | 2 +-
core/sqf/src/tm/tmrmhbase.cpp | 9 ++-
core/sqf/src/tm/tmrmhbase.h | 2 +-
core/sqf/src/tm/tmrmtse.cpp | 2 +-
core/sqf/src/tm/tmrmtse.h | 2 +-
core/sqf/src/tm/tmtransaction.cpp | 9 ++-
core/sqf/src/tm/tmtx.cpp | 2 +-
core/sqf/src/tm/tmtxbranches.cpp | 7 +-
core/sqf/src/tm/tmtxbranches.h | 2 +-
core/sqf/src/tm/tmxatxn.cpp | 2 +-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/executor/ex_transaction.cpp | 15 ++--
core/sql/regress/core/EXPECTED116 | 47 +++++++------
core/sql/regress/tools/regress-filter-linux | 4 ++
31 files changed, 466 insertions(+), 114 deletions(-)
----------------------------------------------------------------------