merge [TRAFODION-3014]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/92476567 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/92476567 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/92476567 Branch: refs/heads/master Commit: 92476567fa3246236bd2847333b53f84cfbd1f56 Parents: 3dd0eca c75c6bf Author: Liu Ming <ovis_p...@sina.com> Authored: Fri Apr 13 07:24:32 2018 +0000 Committer: Liu Ming <ovis_p...@sina.com> Committed: Fri Apr 13 07:24:32 2018 +0000 ---------------------------------------------------------------------- NOTICE | 2 +- .../trafodion/jdbc/t4/ExtractLobMessage.java | 13 +-- .../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 +++-- .../org/trafodion/jdbc/t4/T4Properties.java | 48 +++++++++- .../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 --- .../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 --- .../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 39 ++++++-- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 8 +- .../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +++++++--- .../nsksrvr/Interface/marshalingsrvr_srvr.h | 6 +- .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 11 ++- .../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 ++-- .../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 6 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 20 +++-- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 3 +- .../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 5 +- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 94 +++++++------------- .../java/org/trafodion/ci/SessionInterface.java | 2 + core/sql/executor/ExExeUtilLoad.cpp | 1 - core/sql/exp/ExpLOBaccess.cpp | 1 + core/sql/exp/ExpLOBinterface.cpp | 2 - .../org/trafodion/jdbc_test/JdbcCommon.java | 27 ++++-- .../java/org/trafodion/jdbc_test/PropTest.java | 9 +- .../java/org/trafodion/jdbc_test/TestBlob.java | 16 ++-- .../org/trafodion/jdbc_test/TestBlobBatch.java | 12 ++- .../java/org/trafodion/jdbc_test/TestClob.java | 17 +++- .../org/trafodion/jdbc_test/TestClobBatch.java | 15 ++-- .../org/trafodion/jdbc_test/TestForeignKey.java | 87 +++++++++++------- .../trafodion/jdbc_test/TestGetIndexInfo.java | 24 +++-- install/python-installer/scripts/hdfs_cmds.py | 2 +- 30 files changed, 364 insertions(+), 219 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/92476567/core/sql/executor/ExExeUtilLoad.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/92476567/core/sql/exp/ExpLOBaccess.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/92476567/core/sql/exp/ExpLOBinterface.cpp ----------------------------------------------------------------------
