Merge branch 'master' of git://git.apache.org/trafodion into TRAFODION-2335
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/007dcc68 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/007dcc68 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/007dcc68 Branch: refs/heads/master Commit: 007dcc68a41827d95ddf577af4810ff9e1206152 Parents: 2795240 5339170 Author: Liu Ming <ovis_p...@sina.com> Authored: Wed Mar 21 21:46:37 2018 +0000 Committer: Liu Ming <ovis_p...@sina.com> Committed: Wed Mar 21 21:46:37 2018 +0000 ---------------------------------------------------------------------- .rat-excludes | 3 +- RAT_README | 3 +- .../jdbc/t4/TrafT4PreparedStatement.java | 21 +- .../export/include/common/evl_sqlog_eventnum.h | 14 + core/sqf/monitor/linux/cluster.cxx | 388 ++++++++-- core/sqf/monitor/linux/cluster.h | 26 +- core/sqf/monitor/linux/commaccept.cxx | 108 +-- core/sqf/monitor/linux/mlio.cxx | 7 +- core/sqf/monitor/linux/monitor.cxx | 540 +++++++++++--- core/sqf/monitor/linux/monitor.h | 2 - core/sqf/monitor/linux/msgdef.h | 48 +- core/sqf/monitor/linux/pnode.cxx | 67 +- core/sqf/monitor/linux/process.cxx | 75 +- core/sqf/monitor/linux/reqprocinfo.cxx | 83 ++- core/sqf/monitor/linux/reqqueue.cxx | 10 +- core/sqf/monitor/linux/shell.cxx | 273 ++++--- core/sqf/monitor/linux/tmsync.cxx | 10 +- core/sqf/monitor/linux/zclient.cxx | 348 ++++++++- core/sqf/monitor/linux/zclient.h | 5 + core/sqf/monitor/test/runtest | 3 +- core/sqf/sqenvcom.sh | 19 + core/sqf/sql/scripts/dcscheck | 24 +- core/sqf/sql/scripts/dcsstart | 8 +- core/sqf/sql/scripts/dcsstop | 9 +- core/sqf/sql/scripts/install_local_hadoop | 5 + core/sqf/sql/scripts/install_traf_components | 5 +- core/sqf/sql/scripts/sqcheck | 6 +- core/sqf/src/tm/tm_internal.h | 1 - core/sqf/src/tm/tmlibmsg.h | 4 +- core/sqf/src/tm/tools/dtmci.cpp | 2 - core/sqf/src/tm/tools/pwd.cpp | 2 - core/sqf/src/tm/tools/tmshutdown.cpp | 1 - core/sqf/src/trafconf/clusterconf.cpp | 10 + core/sqf/src/trafconf/clusterconf.h | 4 + core/sql/arkcmp/CmpConnection.cpp | 4 +- core/sql/arkcmp/CmpContext.cpp | 17 +- core/sql/arkcmp/CmpContext.h | 2 +- core/sql/bin/SqlciErrors.txt | 3 +- core/sql/cli/Cli.cpp | 294 ++------ core/sql/cli/Context.cpp | 53 +- core/sql/cli/Context.h | 10 + core/sql/cli/ExSqlComp.cpp | 21 +- core/sql/cli/Globals.cpp | 1 + core/sql/cli/Globals.h | 1 + core/sql/cli/Statement.cpp | 11 +- core/sql/comexe/ComTdbBlockingHdfsScan.h | 1 - core/sql/comexe/ComTdbHdfsScan.h | 11 +- core/sql/common/ComRtUtils.cpp | 1 + core/sql/common/ComSmallDefs.h | 1 + core/sql/common/ComUser.cpp | 2 +- core/sql/common/NAString.cpp | 3 +- core/sql/common/Platform.h | 2 + core/sql/executor/ExCancel.cpp | 9 +- core/sql/executor/ExExeUtil.h | 1 - core/sql/executor/ExExeUtilCli.cpp | 6 +- core/sql/executor/ExExeUtilCli.h | 2 +- core/sql/executor/ExExeUtilGet.cpp | 7 +- core/sql/executor/ExExeUtilGetStats.cpp | 1 - core/sql/executor/ExExeUtilLoad.cpp | 25 +- core/sql/executor/ExExplain.cpp | 6 +- core/sql/executor/ExFastTransport.cpp | 48 +- core/sql/executor/ExHbaseAccess.cpp | 11 +- core/sql/executor/ExHbaseIUD.cpp | 2 +- core/sql/executor/ExHdfsScan.cpp | 102 ++- core/sql/executor/ExHdfsScan.h | 24 + core/sql/executor/ExSMCommon.cpp | 1 + core/sql/executor/ExSMCommon.h | 3 +- core/sql/executor/ExSMGlobals.cpp | 1 + core/sql/executor/ExSMQueue.cpp | 2 +- core/sql/executor/ExSMReader.cpp | 1 + core/sql/executor/ExSMShortMessage.cpp | 2 +- core/sql/executor/ExSMTaskList.cpp | 2 +- core/sql/executor/ExStats.cpp | 2 +- core/sql/executor/HBaseClient_JNI.cpp | 1 - core/sql/executor/HdfsClient_JNI.cpp | 426 +++++++++-- core/sql/executor/HdfsClient_JNI.h | 74 +- core/sql/executor/JavaObjectInterface.cpp | 3 +- core/sql/executor/JavaObjectInterface.h | 12 +- core/sql/executor/OrcFileReader.h | 2 +- core/sql/executor/SequenceFileReader.h | 4 +- core/sql/executor/ex_control.cpp | 5 +- core/sql/executor/ex_ddl.cpp | 14 +- core/sql/executor/ex_root.cpp | 28 +- core/sql/exp/ExpLOBaccess.cpp | 144 +--- core/sql/exp/ExpLOBaccess.h | 8 - core/sql/exp/exp_function.cpp | 2 +- core/sql/export/ComDiags.h | 8 +- core/sql/generator/GenFastTransport.cpp | 4 +- core/sql/generator/GenPreCode.cpp | 6 +- core/sql/generator/GenRelScan.cpp | 19 +- core/sql/generator/GenRelUpdate.cpp | 2 + .../java/org/trafodion/libmgmt/JDBCUDR.java | 721 +++++++++++++++++++ core/sql/nskgmake/tdm_sqlexp/Makefile | 2 +- core/sql/optimizer/BindRelExpr.cpp | 152 ++-- core/sql/optimizer/HDFSHook.cpp | 35 +- core/sql/optimizer/HDFSHook.h | 16 +- core/sql/optimizer/Inlining.cpp | 19 +- core/sql/optimizer/NATable.cpp | 1 + core/sql/optimizer/OptimizerSimulator.cpp | 3 +- core/sql/optimizer/RelExpr.cpp | 16 +- core/sql/optimizer/RelMisc.h | 3 +- core/sql/optimizer/RelScan.h | 18 +- core/sql/optimizer/ScanOptimizer.cpp | 7 +- core/sql/optimizer/mdam.cpp | 30 +- core/sql/parser/SqlParserAux.cpp | 4 +- core/sql/parser/sqlparser.y | 18 +- core/sql/regress/core/EXPECTED002.LINUX | 147 +++- core/sql/regress/core/EXPECTED116 | 6 +- core/sql/regress/core/TEST002 | 56 ++ core/sql/regress/executor/EXPECTED001 | 3 +- core/sql/regress/executor/EXPECTED013.SB | 3 +- core/sql/regress/hive/EXPECTED007 | 2 +- core/sql/regress/hive/EXPECTED018 | 2 +- core/sql/regress/hive/EXPECTED040 | 8 +- core/sql/regress/privs1/EXPECTED123 | 32 + core/sql/regress/privs1/EXPECTED125 | 8 + core/sql/regress/privs1/EXPECTED141 | 3 +- core/sql/regress/privs2/EXPECTED135 | 15 +- core/sql/regress/privs2/EXPECTED138 | 6 +- core/sql/regress/seabase/EXPECTED022 | 3 +- core/sql/regress/seabase/EXPECTED026 | 9 +- core/sql/regress/udr/EXPECTED002 | 97 ++- core/sql/regress/udr/EXPECTED102 | 2 + core/sql/regress/udr/TEST002 | 58 +- core/sql/runtimestats/ssmpipc.cpp | 4 +- core/sql/runtimestats/ssmpipc.h | 2 +- core/sql/sqlci/Param.cpp | 8 +- core/sql/sqlci/Param.h | 2 +- core/sql/sqlci/SqlCmd.cpp | 106 ++- core/sql/sqlci/SqlciCmd.cpp | 6 +- core/sql/sqlci/sqlcmd.h | 8 +- core/sql/sqlcomp/CmpDescribe.cpp | 7 +- core/sql/sqlcomp/CmpSeabaseDDL.h | 6 + core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 21 +- core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 8 + core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 116 ++- core/sql/sqlcomp/CmpSeabaseDDLroutine.h | 96 ++- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1 - core/sql/sqlcomp/DefaultConstants.h | 1 + .../main/java/org/trafodion/sql/HDFSClient.java | 307 ++++++-- .../main/java/org/trafodion/sql/HdfsScan.java | 95 ++- .../java/org/trafodion/sql/udr/LmT2Driver.java | 12 + .../org/trafodion/sql/udr/predef/JDBCUDR.java | 33 +- core/sql/ustat/hs_globals.cpp | 13 +- dcs/bin/dcs-config.sh | 14 +- dcs/bin/dcs-daemon.sh | 48 +- dcs/bin/getActiveMaster.sh | 80 ++ dcs/bin/master-backup.sh | 36 +- dcs/bin/scripts/dcsbind.sh | 64 +- dcs/bin/scripts/dcsunbind.sh | 43 +- dcs/bin/scripts/parse_dcs_site.py | 18 +- dcs/bin/start-dcs.sh | 9 +- dcs/bin/stop-dcs.sh | 16 +- dcs/conf/backup-masters | 0 dcs/conf/master | 0 dcs/conf/masters | 0 .../main/asciidoc/_chapters/configuration.adoc | 220 +++--- .../src/asciidoc/_chapters/odbc_windows.adoc | 18 +- .../src/asciidoc/_chapters/preparation.adoc | 2 + .../src/asciidoc/_chapters/binder_msgs.adoc | 13 + .../sql_functions_and_expressions.adoc | 205 ++++++ .../src/asciidoc/_chapters/sql_statements.adoc | 183 ++++- docs/src/site/markdown/documentation.md | 21 + docs/src/site/markdown/download.md | 88 ++- docs/src/site/markdown/release-notes-2-2-0.md | 539 ++++++++++++++ docs/src/site/markdown/release-notes.md | 1 + .../TRAFODION/2.1/configuration/dcs-env.xml | 7 +- .../2.1/package/scripts/trafodionnode.py | 13 +- install/python-installer/scripts/dcs_setup.py | 9 +- 169 files changed, 5830 insertions(+), 1766 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/007dcc68/core/sql/common/ComSmallDefs.h ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/007dcc68/core/sql/optimizer/BindRelExpr.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/007dcc68/core/sql/parser/sqlparser.y ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/007dcc68/core/sql/sqlcomp/CmpDescribe.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/007dcc68/core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/007dcc68/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp ----------------------------------------------------------------------
