You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2016/10/27 15:13:30 UTC
[6/9] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into wrkbrnch
Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f5179a18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f5179a18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f5179a18
Branch: refs/heads/master
Commit: f5179a182b2029879a3110c2b71b7b5093c5d2d9
Parents: 449f48a c1be763
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Mon Oct 24 18:33:44 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Mon Oct 24 18:33:44 2016 +0000
----------------------------------------------------------------------
core/sqf/conf/log4cxx.trafodion.tm.config | 2 +-
core/sqf/sql/scripts/install_local_hadoop | 2 +
.../transactional/TransactionManager.java | 607 ++++++++++---------
.../client/transactional/TransactionState.java | 79 ++-
.../java/org/trafodion/dtm/TmAuditTlog.java | 11 +-
core/sqf/src/tm/tmmsg.h | 21 +-
core/sqf/src/tm/tmtx.cpp | 4 +-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/cli/CliExtern.cpp | 1 +
core/sql/common/ComDistribution.cpp | 3 +-
core/sql/common/ComSecurityKey.cpp | 4 +-
core/sql/common/ComSecurityKey.h | 2 +-
core/sql/common/ComSmallDefs.h | 2 +
core/sql/optimizer/NATable.cpp | 230 +++----
core/sql/optimizer/NATable.h | 175 +++---
core/sql/optimizer/opt.cpp | 21 +-
core/sql/optimizer/opt.h | 16 +-
core/sql/qmscommon/QRLogger.cpp | 3 +
core/sql/regress/compGeneral/EXPECTED011.SB | 8 +-
core/sql/regress/compGeneral/EXPECTED015.SB | 292 ++++-----
core/sql/regress/compGeneral/EXPECTED042 | 83 ++-
core/sql/regress/core/EXPECTED005.SB | 4 +-
core/sql/regress/hive/EXPECTED018 | 218 ++++---
core/sql/regress/seabase/EXPECTED011 | 20 +-
core/sql/regress/seabase/EXPECTED013 | 144 ++---
core/sql/regress/udr/TEST103 | 2 +-
core/sql/runtimestats/SqlStats.cpp | 5 +-
core/sql/runtimestats/sscpipc.cpp | 7 +-
core/sql/runtimestats/ssmpipc.cpp | 3 +
core/sql/sqlcomp/CmpMain.cpp | 9 +
core/sql/sqlcomp/CmpMain.h | 2 +
core/sql/sqlcomp/CmpSeabaseDDL.h | 2 +
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 9 +
core/sql/sqlcomp/DefaultConstants.h | 7 -
core/sql/sqlcomp/QCache.cpp | 24 +-
core/sql/sqlcomp/nadefaults.cpp | 18 -
core/sql/sqludr/SqlUdrPredefLogReader.cpp | 482 +++++++++++++--
core/sql/ustat/hs_const.h | 1 +
core/sql/ustat/hs_globals.cpp | 6 +
core/sql/ustat/hs_read.cpp | 44 --
core/sql/ustat/hs_read.h | 32 -
core/sql/ustat/hs_update.cpp | 19 +-
.../asciidoc/_chapters/update_stats_msgs.adoc | 15 +
install/installer/addNode_step1 | 89 ++-
install/installer/addNode_step2 | 119 ++--
install/installer/deleteNode | 244 --------
win-odbc64/odbcclient/drvr35/cconnect.cpp | 17 +-
47 files changed, 1695 insertions(+), 1415 deletions(-)
----------------------------------------------------------------------