You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/02/07 03:47:45 UTC
[4/4] trafodion git commit: Merge branch 'master' of
https://github.com/apache/trafodion into mrg_1441
Merge branch 'master' of https://github.com/apache/trafodion into mrg_1441
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/9d88d081
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/9d88d081
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/9d88d081
Branch: refs/heads/master
Commit: 9d88d08101bd0e41d8cb6645653a01251a94cd46
Parents: 659f4ac b1e176f
Author: Liu Ming <ov...@sina.com>
Authored: Tue Feb 6 22:34:04 2018 +0000
Committer: Liu Ming <ov...@sina.com>
Committed: Tue Feb 6 22:34:04 2018 +0000
----------------------------------------------------------------------
core/.gitignore | 2 +-
.../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 4 +-
core/sqf/Makefile | 10 +-
core/sqf/export/include/trafconf/trafconfig.h | 349 ++
core/sqf/monitor/linux/clusterconf.cxx | 863 -----
core/sqf/monitor/linux/clusterconf.h | 118 -
core/sqf/monitor/linux/config.cxx | 8 +-
core/sqf/monitor/linux/getseq.cxx | 2 -
core/sqf/monitor/linux/lnode.h | 1 +
core/sqf/monitor/linux/lnodeconfig.cxx | 399 ---
core/sqf/monitor/linux/lnodeconfig.h | 119 -
core/sqf/monitor/linux/macros.gmk | 10 +
core/sqf/monitor/linux/makefile | 117 +-
core/sqf/monitor/linux/monlogging.cxx | 3 +-
core/sqf/monitor/linux/msgdef.h | 27 +-
core/sqf/monitor/linux/persistconfig.cxx | 636 ----
core/sqf/monitor/linux/persistconfig.h | 165 -
core/sqf/monitor/linux/pnode.cxx | 3 +-
core/sqf/monitor/linux/pnode.h | 2 -
core/sqf/monitor/linux/pnodeconfig.cxx | 631 ----
core/sqf/monitor/linux/pnodeconfig.h | 130 -
core/sqf/monitor/linux/pstartd.h | 2 +-
core/sqf/monitor/linux/reqnodeadd.cxx | 2 +-
core/sqf/monitor/linux/shell.cxx | 5 +-
core/sqf/monitor/linux/tcdb.cxx | 478 ---
core/sqf/monitor/linux/tcdb.h | 117 -
core/sqf/monitor/linux/tcdbsqlite.cxx | 3390 ------------------
core/sqf/monitor/linux/tcdbsqlite.h | 130 -
core/sqf/monitor/linux/tcdbstore.cxx | 55 -
core/sqf/monitor/linux/tcdbstore.h | 113 -
core/sqf/monitor/linux/tcdbzstore.cxx | 2192 -----------
core/sqf/monitor/linux/tcdbzstore.h | 130 -
core/sqf/monitor/linux/tclog.cxx | 121 -
core/sqf/monitor/linux/tclog.h | 46 -
core/sqf/monitor/linux/tctrace.cxx | 366 --
core/sqf/monitor/linux/tctrace.h | 103 -
core/sqf/monitor/linux/trafconf.cxx | 631 ----
core/sqf/monitor/linux/trafconfig.cxx | 560 ---
core/sqf/monitor/linux/trafconfig.h | 305 --
core/sqf/sqenvcom.sh | 9 +
core/sqf/sql/scripts/monitor.env | 59 +
core/sqf/sql/scripts/sqconfig.sample | 7 +
core/sqf/sql/scripts/sqgen | 62 +-
core/sqf/src/Makefile | 4 +
core/sqf/src/trafconf/Makefile | 119 +
core/sqf/src/trafconf/clusterconf.cpp | 855 +++++
core/sqf/src/trafconf/clusterconf.h | 118 +
core/sqf/src/trafconf/lnodeconfig.cpp | 397 ++
core/sqf/src/trafconf/lnodeconfig.h | 121 +
core/sqf/src/trafconf/macros.gmk | 112 +
core/sqf/src/trafconf/persistconfig.cpp | 637 ++++
core/sqf/src/trafconf/persistconfig.h | 164 +
core/sqf/src/trafconf/pnodeconfig.cpp | 629 ++++
core/sqf/src/trafconf/pnodeconfig.h | 131 +
core/sqf/src/trafconf/tcdb.cpp | 474 +++
core/sqf/src/trafconf/tcdb.h | 118 +
core/sqf/src/trafconf/tcdbsqlite.cpp | 3390 ++++++++++++++++++
core/sqf/src/trafconf/tcdbsqlite.h | 130 +
core/sqf/src/trafconf/tcdbstore.cpp | 56 +
core/sqf/src/trafconf/tcdbstore.h | 112 +
core/sqf/src/trafconf/tclog.cpp | 121 +
core/sqf/src/trafconf/tclog.h | 46 +
core/sqf/src/trafconf/tctrace.cpp | 367 ++
core/sqf/src/trafconf/tctrace.h | 105 +
core/sqf/src/trafconf/trafconf.cpp | 630 ++++
core/sqf/src/trafconf/trafconfig.cpp | 599 ++++
core/sql/optimizer/SynthType.cpp | 11 +-
core/sql/regress/executor/EXPECTED002.SB | 21 +-
core/sql/regress/executor/TEST002 | 3 +
69 files changed, 9987 insertions(+), 11965 deletions(-)
----------------------------------------------------------------------