Merge [TRAFODION-2438] PR-922 Unnecessary and sometimes wrong delete during upsert/merge with IM
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/940ad6f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/940ad6f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/940ad6f4 Branch: refs/heads/master Commit: 940ad6f4cc251e6a56e322bd0f859a6162689cef Parents: 67288b3 478478c Author: Suresh Subbiah <[email protected]> Authored: Mon Jan 23 23:12:01 2017 +0000 Committer: Suresh Subbiah <[email protected]> Committed: Mon Jan 23 23:12:01 2017 +0000 ---------------------------------------------------------------------- core/sql/comexe/ComTdbHbaseAccess.cpp | 5 +- core/sql/comexe/ComTdbHbaseAccess.h | 2 + core/sql/executor/ExHbaseAccess.cpp | 3 + core/sql/executor/ExHbaseIUD.cpp | 24 ++++-- core/sql/generator/GenExpGenerator.cpp | 2 +- core/sql/generator/GenRelScan.cpp | 2 + core/sql/generator/GenRelUpdate.cpp | 49 ++++++++++- core/sql/optimizer/BindRelExpr.cpp | 119 ++++++++++++++++++-------- core/sql/optimizer/ImplRule.cpp | 4 +- core/sql/optimizer/Inlining.cpp | 54 +++++++++--- core/sql/optimizer/NormRelExpr.cpp | 11 +++ core/sql/optimizer/RETDesc.cpp | 44 +++++++--- core/sql/optimizer/RelExpr.cpp | 6 +- core/sql/optimizer/RelJoin.h | 2 + core/sql/optimizer/RelUpdate.h | 74 ++++++++++++++-- core/sql/regress/executor/EXPECTED015.SB | 39 +++++++++ core/sql/regress/executor/TEST015 | 7 ++ 17 files changed, 366 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/940ad6f4/core/sql/executor/ExHbaseAccess.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/940ad6f4/core/sql/executor/ExHbaseIUD.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/940ad6f4/core/sql/optimizer/BindRelExpr.cpp ----------------------------------------------------------------------
