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 2017/02/24 04:02:56 UTC
[3/4] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into compress1
Merge branch 'master' of github.com:apache/incubator-trafodion into compress1
Conflicts:
core/sql/regress/seabase/EXPECTED002
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ca4f9da3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ca4f9da3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ca4f9da3
Branch: refs/heads/master
Commit: ca4f9da397258b115a117af9ff8b27bde6aea46e
Parents: ded3fa2 549850a
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Feb 24 00:48:26 2017 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Feb 24 00:48:26 2017 +0000
----------------------------------------------------------------------
.../java/org/trafodion/ci/DatabaseQuery.java | 23 +-
.../java/org/trafodion/ci/InterfaceQuery.java | 14 +-
.../src/main/java/org/trafodion/ci/Session.java | 11 +
.../export/include/common/evl_sqlog_eventnum.h | 2 +
core/sqf/monitor/linux/makefile | 5 +-
core/sqf/monitor/linux/monitor.cxx | 4 +-
core/sqf/monitor/linux/pnode.cxx | 2 +-
core/sqf/monitor/linux/pnodeconfig.cxx | 54 +-
core/sqf/monitor/linux/pnodeconfig.h | 1 +
core/sqf/monitor/linux/process.cxx | 20 +-
core/sqf/monitor/linux/shell.cxx | 8 +-
core/sqf/monitor/linux/zclient.cxx | 110 +-
core/sqf/monitor/linux/zclient.h | 83 +-
core/sqf/monitor/linux/zootest.cxx | 5 +-
core/sqf/sqenvcom.sh | 6 +-
core/sqf/sql/scripts/sqnodestatus | 2 +-
core/sql/bin/SqlciErrors.txt | 5 +-
core/sql/bin/ex_esp_main.cpp | 18 +-
core/sql/cli/Globals.cpp | 24 +-
core/sql/cli/Statement.cpp | 7 +
core/sql/cli/memorymonitor.cpp | 76 +-
core/sql/cli/memorymonitor.h | 18 +-
core/sql/comexe/ComTdbExeUtil.h | 28 +-
core/sql/common/ComUser.cpp | 27 +
core/sql/common/ComUser.h | 2 +
core/sql/common/NAMemory.cpp | 2 +-
core/sql/executor/ExExeUtil.h | 10 +-
core/sql/executor/ExExeUtilGet.cpp | 394 +-
core/sql/executor/ExHbaseIUD.cpp | 208 +-
core/sql/executor/ExHdfsScan.cpp | 11 +-
core/sql/executor/ex_hash_grby.h | 3 -
core/sql/executor/hiveHook.cpp | 66 +-
core/sql/exp/ExpLOBinterface.cpp | 6 +-
core/sql/generator/GenPreCode.cpp | 22 +-
core/sql/generator/GenRelExeUtil.cpp | 63 +-
core/sql/generator/GenRelScan.cpp | 2 +-
core/sql/generator/GenRelUpdate.cpp | 14 +-
core/sql/optimizer/BindRelExpr.cpp | 140 +-
core/sql/optimizer/BindWA.h | 8 +-
core/sql/optimizer/Inlining.cpp | 36 +-
core/sql/optimizer/NATable.cpp | 4874 +++++++++---------
core/sql/optimizer/NATable.h | 14 +-
core/sql/optimizer/RelExeUtil.cpp | 33 +-
core/sql/optimizer/RelExeUtil.h | 4 +
core/sql/optimizer/RelExpr.cpp | 3 +-
core/sql/optimizer/RelSequence.cpp | 9 +-
core/sql/optimizer/RelUpdate.h | 12 +-
core/sql/optimizer/hiveHook.h | 24 +-
core/sql/parser/SqlParserAux.cpp | 5 +
core/sql/parser/SqlParserAux.h | 1 +
core/sql/parser/StmtDDLNode.cpp | 1 +
core/sql/parser/StmtDDLNode.h | 10 +
core/sql/parser/sqlparser.y | 47 +-
core/sql/regress/core/EXPECTEDRTS | 1828 ++++---
core/sql/regress/core/TESTRTS | 11 +
core/sql/regress/executor/EXPECTED015.SB | 158 +-
core/sql/regress/executor/TEST015 | 68 +-
core/sql/regress/hive/EXPECTED007 | 334 +-
core/sql/regress/hive/TEST007 | 153 +-
core/sql/regress/privs1/EXPECTED141 | Bin 100853 -> 102260 bytes
core/sql/regress/privs1/TEST123 | 2 +-
core/sql/regress/privs1/TEST141 | 10 +-
core/sql/regress/privs2/EXPECTED144 | Bin 59409 -> 59453 bytes
core/sql/regress/privs2/FILTER144 | 31 +
core/sql/regress/seabase/DIFF025.KNOWN | 2 +-
core/sql/regress/tools/runallsb | 20 +
core/sql/runtimestats/SqlStats.cpp | 12 +
core/sql/runtimestats/SqlStats.h | 7 +-
core/sql/sqlci/SqlciStats.cpp | 44 +-
core/sql/sqlci/sqlci_yacc.y | 49 +-
core/sql/sqlcomp/CmpDescribe.cpp | 101 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 103 +-
core/sql/sqlcomp/CmpSeabaseDDLauth.h | 1 +
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 55 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 8 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 18 +
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 33 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 106 +-
core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp | 7 +
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 6 +-
core/sql/sqlcomp/PrivMgr.cpp | 10 +-
core/sql/sqlcomp/PrivMgr.h | 5 +-
core/sql/sqlcomp/PrivMgrCommands.cpp | 65 +-
core/sql/sqlcomp/PrivMgrCommands.h | 6 +
core/sql/sqlcomp/PrivMgrPrivileges.cpp | 26 +-
core/sql/sqlcomp/PrivMgrPrivileges.h | 4 +-
core/sql/sqlcomp/PrivMgrRoles.cpp | 106 +-
core/sql/sqlcomp/nadefaults.cpp | 2 +-
core/sql/ustat/hs_globals.cpp | 2 +-
core/sql/ustat/hs_la.cpp | 19 +-
dcs/bin/dcs-config.sh | 2 +-
.../src/asciidoc/_chapters/about.adoc | 2 +-
.../src/asciidoc/_chapters/ambari_install.adoc | 92 +
.../src/asciidoc/_chapters/introduction.adoc | 24 +-
.../src/asciidoc/_chapters/prepare.adoc | 133 +-
.../src/asciidoc/_chapters/quickstart.adoc | 3 +-
.../src/asciidoc/_chapters/recipe_install.adoc | 29 -
.../src/asciidoc/_chapters/recipe_upgrade.adoc | 30 -
.../src/asciidoc/_chapters/requirements.adoc | 159 +-
docs/provisioning_guide/src/asciidoc/index.adoc | 4 +-
.../_chapters/sql_language_elements.adoc | 78 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 458 +-
install/python-installer/configs/version.json | 2 +-
install/python-installer/db_install.py | 8 +-
install/python-installer/scripts/dcs_setup.py | 8 +-
install/python-installer/scripts/hdfs_cmds.py | 4 +-
install/python-installer/scripts/traf_setup.py | 2 +-
.../python-installer/scripts/traf_sqconfig.py | 9 +-
install/python-installer/scripts/traf_start.py | 4 +-
install/python-installer/scripts/traf_user.py | 4 +-
110 files changed, 6869 insertions(+), 4175 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ca4f9da3/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp
----------------------------------------------------------------------