You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/09/06 16:04:24 UTC
[2/8] incubator-trafodion git commit: Merge remote branch
'origin/master' into traf_misc
Merge remote branch 'origin/master' into traf_misc
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ebdfb963
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ebdfb963
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ebdfb963
Branch: refs/heads/master
Commit: ebdfb96317f20de6227e434bc1f373b9d97d48b1
Parents: f40dfb9 93bb3df
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Aug 14 04:54:04 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Aug 14 04:54:04 2017 +0000
----------------------------------------------------------------------
.../jdbcT4/src/main/java/T4Messages.properties | 7 +-
.../trafodion/jdbc/t4/InterfaceStatement.java | 88 ++-
.../org/trafodion/jdbc/t4/LogicalByteArray.java | 5 +
.../java/org/trafodion/jdbc/t4/TRANSPORT.java | 1 +
.../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 85 +--
.../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 115 ++--
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 6 +-
.../java/org/trafodion/jdbc/t4/TrafT4Desc.java | 1 -
.../trafodion/jdbc/t4/TrafT4InputStream.java | 38 ++
.../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 198 ++++++
.../trafodion/jdbc/t4/TrafT4OutputStream.java | 55 ++
.../jdbc/t4/TrafT4PreparedStatement.java | 169 +++--
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 56 +-
.../org/trafodion/jdbc/t4/TrafT4Writer.java | 53 ++
.../org/trafodion/jdbc/t4/UpdateLobMessage.java | 67 ++
.../org/trafodion/jdbc/t4/UpdateLobReply.java | 47 ++
.../jdbc/t4/odbc_SQLSvc_UpdateLob_exc_.java | 70 ++
core/conn/odbc/src/odbc/Common/TransportBase.h | 1 +
.../src/odbc/Krypton/generated_incs/odbc_sv.h | 25 +
.../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 82 ++-
.../nsksrvr/Interface/marshalingsrvr_srvr.h | 10 +-
.../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 66 ++
.../src/odbc/nsksrvr/Interface/odbcs_srvr.h | 11 +
.../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 29 +-
.../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 9 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 32 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 12 +
.../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 14 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 89 ++-
.../odbc/odbcclient/unixcli/cli/cconnect.cpp | 4 +
.../odbc/odbcclient/unixcli/cli/cconnect.h | 2 +-
.../odbc/odbcclient/unixcli/cli/cdatasource.cpp | 38 +-
.../odbc/odbcclient/unixcli/cli/cdatasource.h | 2 +-
.../odbc/odbcclient/unixcli/cli/drvrglobal.cpp | 2 +
.../odbc/odbcclient/unixcli/cli/drvrglobal.h | 1 +
.../odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 2 +-
.../odbcclient/unixcli/common/TCPIPUnixDrvr.cpp | 5 +-
.../odbcclient/unixcli/common/TCPIPUnixDrvr.h | 1 +
core/sqf/.gitignore | 6 +-
core/sqf/build-scripts/package.exclude | 13 +-
core/sqf/monitor/linux/clio.cxx | 21 +-
core/sqf/monitor/linux/cluster.cxx | 146 ++--
core/sqf/monitor/linux/cluster.h | 3 +-
core/sqf/monitor/linux/commaccept.cxx | 95 ++-
core/sqf/monitor/linux/commaccept.h | 6 +-
core/sqf/monitor/linux/monitor.cxx | 43 +-
core/sqf/monitor/linux/pnodeconfig.cxx | 4 +-
core/sqf/monitor/linux/shell.cxx | 16 +-
core/sqf/monitor/linux/tctrace.cxx | 16 +-
core/sqf/sqenvcom.sh | 2 +-
core/sqf/sql/scripts/gensq.pl | 494 +++++---------
core/sqf/sql/scripts/gomon.cold | 138 ++++
core/sqf/sql/scripts/idtmstart | 26 +
core/sqf/sql/scripts/rmsstart | 27 +
core/sqf/sql/scripts/rmsstop | 29 +
core/sqf/sql/scripts/sqconfig.sample | 117 ----
core/sqf/sql/scripts/sqnodestatus | 5 +-
core/sqf/sql/scripts/sqshell | 29 +
core/sqf/sql/scripts/sscpstart | 28 +
core/sqf/sql/scripts/sscpstop | 27 +
core/sqf/sql/scripts/ssmpstart | 28 +
core/sqf/sql/scripts/ssmpstop | 27 +
core/sqf/sql/scripts/tmstart | 58 ++
core/sqf/src/seabed/src/msmon.cpp | 20 +-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/cli/CliExpExchange.cpp | 2 +-
core/sql/cli/Context.cpp | 24 +-
core/sql/cli/Context.h | 11 -
core/sql/cli/Descriptor.cpp | 3 +
core/sql/cli/Globals.cpp | 18 +-
core/sql/cli/Globals.h | 29 +-
core/sql/common/CharType.cpp | 2 +-
core/sql/common/ComRtUtils.cpp | 51 +-
core/sql/common/ComRtUtils.h | 28 +-
core/sql/common/Ipc.cpp | 17 +-
core/sql/common/Ipc.h | 1 +
core/sql/executor/ExCancel.cpp | 130 ++--
core/sql/executor/ExCancel.h | 10 +-
core/sql/executor/ex_frag_rt.cpp | 23 +-
core/sql/executor/ex_frag_rt.h | 1 +
core/sql/executor/ex_root.cpp | 221 ++----
core/sql/executor/ex_root.h | 28 +-
core/sql/exp/ExpLOB.cpp | 16 +-
core/sql/exp/ExpLOBinterface.cpp | 8 +-
core/sql/generator/Generator.cpp | 55 +-
core/sql/optimizer/BindItemExpr.cpp | 18 +-
core/sql/optimizer/NAClusterInfo.cpp | 671 +------------------
core/sql/optimizer/NAClusterInfo.h | 173 +----
core/sql/optimizer/NATable.cpp | 3 -
core/sql/optimizer/NodeMap.cpp | 132 +---
core/sql/optimizer/NodeMap.h | 15 +-
core/sql/optimizer/OptimizerSimulator.cpp | 71 +-
core/sql/optimizer/SchemaDB.cpp | 248 -------
core/sql/optimizer/SchemaDB.h | 287 --------
core/sql/optimizer/costmethod.cpp | 2 -
core/sql/parser/sqlparser.y | 38 +-
core/sql/regress/compGeneral/EXPECTED001.SB | 15 -
core/sql/regress/compGeneral/TEST001 | 9 -
core/sql/regress/executor/EXPECTED106 | 59 --
core/sql/regress/executor/TEST106 | 27 -
core/sql/regress/hive/EXPECTED018 | 4 +-
core/sql/regress/hive/TEST018 | 4 +-
core/sql/runtimestats/SqlStats.cpp | 2 +
core/sql/runtimestats/ssmpipc.cpp | 38 +-
core/sql/runtimestats/ssmpipc.h | 1 +
core/sql/sqlcomp/DefaultConstants.h | 10 +-
core/sql/sqlcomp/nadefaults.cpp | 37 +-
core/sql/ustat/hs_cli.cpp | 48 +-
core/trafodion.spec | 16 +-
.../java/org/trafodion/jdbc_test/TestBlob.java | 289 ++++++++
.../org/trafodion/jdbc_test/TestBlobBatch.java | 196 ++++++
.../java/org/trafodion/jdbc_test/TestClob.java | 305 ++++++++-
.../org/trafodion/jdbc_test/TestClobBatch.java | 232 +++++++
.../TRAFODION/2.1/package/scripts/params.py | 1 +
.../2.1/package/scripts/trafodionmaster.py | 9 +-
install/python-installer/scripts/hdfs_cmds.py | 8 +-
install/python-installer/scripts/traf_user.py | 7 +
win-odbc64/Common/TCPIPSystemDrvr.cpp | 5 +-
win-odbc64/Common/TCPIPSystemDrvr.h | 1 +
win-odbc64/odbcclient/drvr35/cconnect.cpp | 4 +
win-odbc64/odbcclient/drvr35/cconnect.h | 1 +
win-odbc64/odbcclient/drvr35/cdatasource.cpp | 32 +
win-odbc64/odbcclient/drvr35/cdatasource.h | 1 +
win-odbc64/odbcclient/drvr35/drvrglobal.cpp | 4 +-
win-odbc64/odbcclient/drvr35/drvrglobal.h | 1 +
125 files changed, 3600 insertions(+), 3026 deletions(-)
----------------------------------------------------------------------