You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/05 23:39:49 UTC
[18/22] incubator-trafodion git commit: Merge remote-tracking branch
'origin/master' into TRAFODION-1949
Merge remote-tracking branch 'origin/master' into TRAFODION-1949
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4bc748d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4bc748d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4bc748d3
Branch: refs/heads/master
Commit: 4bc748d3aba9ae54d8b43368229c2b92dab0159c
Parents: 21d6d8d 56f3dbe
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Mon May 2 11:18:22 2016 -0600
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Mon May 2 11:18:22 2016 -0600
----------------------------------------------------------------------
core/Makefile | 13 +-
core/conn/jdbcT4/.gitignore | 5 +
core/conn/jdbcT4/Makefile | 46 +
core/conn/jdbcT4/pom.xml | 169 +
core/conn/jdbcT4/src/assembly/all.xml | 56 +
.../jdbcT4/src/main/java/T4Messages.properties | 686 ++
.../java/org/trafodion/jdbc/t4/Address.java | 117 +
.../main/java/org/trafodion/jdbc/t4/Bytes.java | 269 +
.../jdbc/t4/CONNECTION_CONTEXT_def.java | 149 +
.../jdbc/t4/CachedPreparedStatement.java | 67 +
.../org/trafodion/jdbc/t4/CancelMessage.java | 49 +
.../java/org/trafodion/jdbc/t4/CancelReply.java | 38 +
.../java/org/trafodion/jdbc/t4/Certificate.java | 112 +
.../main/java/org/trafodion/jdbc/t4/Cipher.java | 201 +
.../org/trafodion/jdbc/t4/CloseMessage.java | 48 +
.../java/org/trafodion/jdbc/t4/CloseReply.java | 48 +
.../java/org/trafodion/jdbc/t4/Compression.java | 149 +
.../org/trafodion/jdbc/t4/ConnectMessage.java | 62 +
.../org/trafodion/jdbc/t4/ConnectReply.java | 148 +
.../java/org/trafodion/jdbc/t4/Descriptor2.java | 85 +
.../trafodion/jdbc/t4/ERROR_DESC_LIST_def.java | 42 +
.../org/trafodion/jdbc/t4/ERROR_DESC_def.java | 65 +
.../jdbc/t4/EndTransactionMessage.java | 49 +
.../trafodion/jdbc/t4/EndTransactionReply.java | 49 +
.../org/trafodion/jdbc/t4/ExecuteMessage.java | 107 +
.../org/trafodion/jdbc/t4/ExecuteReply.java | 127 +
.../org/trafodion/jdbc/t4/FetchMessage.java | 63 +
.../java/org/trafodion/jdbc/t4/FetchReply.java | 63 +
.../org/trafodion/jdbc/t4/GenericMessage.java | 45 +
.../org/trafodion/jdbc/t4/GenericReply.java | 43 +
.../jdbc/t4/GetSQLCatalogsMessage.java | 88 +
.../trafodion/jdbc/t4/GetSQLCatalogsReply.java | 54 +
.../jdbc/t4/HPT4ConnectionPoolDataSource.java | 346 +
.../t4/HPT4ConnectionPoolDataSourceFactory.java | 68 +
.../org/trafodion/jdbc/t4/HPT4DataSource.java | 366 ++
.../jdbc/t4/HPT4DataSourceFactory.java | 62 +
.../java/org/trafodion/jdbc/t4/HPT4Desc.java | 542 ++
.../org/trafodion/jdbc/t4/HPT4Exception.java | 38 +
.../java/org/trafodion/jdbc/t4/HPT4Handle.java | 84 +
.../org/trafodion/jdbc/t4/HPT4Messages.java | 324 +
.../jdbc/t4/HPT4ParameterMetaData.java | 243 +
.../trafodion/jdbc/t4/HPT4PooledConnection.java | 238 +
.../jdbc/t4/HPT4PooledConnectionManager.java | 385 ++
.../jdbc/t4/HPT4ResultSetMetaData.java | 309 +
.../main/java/org/trafodion/jdbc/t4/Header.java | 157 +
.../jdbc/t4/InitializeDialogueMessage.java | 66 +
.../jdbc/t4/InitializeDialogueReply.java | 90 +
.../java/org/trafodion/jdbc/t4/InputOutput.java | 682 ++
.../trafodion/jdbc/t4/InterfaceConnection.java | 1420 +++++
.../trafodion/jdbc/t4/InterfaceResultSet.java | 927 +++
.../trafodion/jdbc/t4/InterfaceStatement.java | 1392 +++++
.../trafodion/jdbc/t4/InterfaceUtilities.java | 235 +
.../main/java/org/trafodion/jdbc/t4/Key.java | 161 +
.../org/trafodion/jdbc/t4/LogicalByteArray.java | 345 +
.../org/trafodion/jdbc/t4/MessageDigest.java | 84 +
.../java/org/trafodion/jdbc/t4/NCSAddress.java | 220 +
.../jdbc/t4/OUT_CONNECTION_CONTEXT_def.java | 97 +
.../java/org/trafodion/jdbc/t4/ObjectArray.java | 86 +
.../org/trafodion/jdbc/t4/PrepareMessage.java | 82 +
.../org/trafodion/jdbc/t4/PrepareReply.java | 103 +
.../jdbc/t4/PreparedStatementManager.java | 242 +
.../trafodion/jdbc/t4/SQLItemDescList_def.java | 46 +
.../trafodion/jdbc/t4/SQLItemDescOld_def.java | 54 +
.../org/trafodion/jdbc/t4/SQLItemDesc_def.java | 70 +
.../org/trafodion/jdbc/t4/SQLValueList_def.java | 64 +
.../org/trafodion/jdbc/t4/SQLValue_def.java | 55 +
.../trafodion/jdbc/t4/SQLWarningOrError.java | 47 +
.../trafodion/jdbc/t4/SQL_DataValue_def.java | 54 +
.../org/trafodion/jdbc/t4/SecClientMsgKeys.java | 58 +
.../main/java/org/trafodion/jdbc/t4/SecPwd.java | 265 +
.../trafodion/jdbc/t4/SecResourceBundle.java | 57 +
.../org/trafodion/jdbc/t4/SecdefsCommon.java | 84 +
.../java/org/trafodion/jdbc/t4/Security.java | 319 +
.../trafodion/jdbc/t4/SecurityException.java | 47 +
.../jdbc/t4/SetConnectionOptionMessage.java | 50 +
.../jdbc/t4/SetConnectionOptionReply.java | 45 +
.../java/org/trafodion/jdbc/t4/SymCrypto.java | 87 +
.../java/org/trafodion/jdbc/t4/T4Address.java | 315 +
.../org/trafodion/jdbc/t4/T4Connection.java | 505 ++
.../org/trafodion/jdbc/t4/T4DSProperties.java | 967 +++
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 5901 ++++++++++++++++++
.../java/org/trafodion/jdbc/t4/T4Driver.java | 367 ++
.../org/trafodion/jdbc/t4/T4LogFormatter.java | 236 +
.../trafodion/jdbc/t4/T4LoggingUtilities.java | 816 +++
.../org/trafodion/jdbc/t4/T4Properties.java | 2511 ++++++++
.../java/org/trafodion/jdbc/t4/T4ResultSet.java | 164 +
.../java/org/trafodion/jdbc/t4/T4Statement.java | 204 +
.../org/trafodion/jdbc/t4/T4TimerThread.java | 116 +
.../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java | 115 +
.../org/trafodion/jdbc/t4/T4_Dcs_Connect.java | 123 +
.../java/org/trafodion/jdbc/t4/TRANSPORT.java | 263 +
.../jdbc/t4/TerminateDialogueMessage.java | 38 +
.../jdbc/t4/TerminateDialogueReply.java | 39 +
.../jdbc/t4/TrafT4CallableStatement.java | 2462 ++++++++
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 1987 ++++++
.../jdbc/t4/TrafT4PreparedStatement.java | 2558 ++++++++
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 5106 +++++++++++++++
.../org/trafodion/jdbc/t4/TrafT4Statement.java | 1690 +++++
.../org/trafodion/jdbc/t4/USER_DESC_def.java | 61 +
.../java/org/trafodion/jdbc/t4/Utility.java | 636 ++
.../org/trafodion/jdbc/t4/VERSION_LIST_def.java | 65 +
.../java/org/trafodion/jdbc/t4/VERSION_def.java | 61 +
.../java/org/trafodion/jdbc/t4/Vproc.java-tmpl | 36 +
.../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java | 95 +
.../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java | 86 +
.../jdbc/t4/odbc_SQLSvc_Close_exc_.java | 69 +
.../t4/odbc_SQLSvc_EndTransaction_exc_.java | 87 +
.../jdbc/t4/odbc_SQLSvc_Execute_exc_.java | 89 +
.../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java | 87 +
.../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java | 100 +
.../t4/odbc_SQLSvc_InitializeDialogue_exc_.java | 76 +
.../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java | 68 +
.../odbc_SQLSvc_SetConnectionOption_exc_.java | 70 +
.../t4/odbc_SQLSvc_TerminateDialogue_exc_.java | 66 +
.../jdbcT4/src/main/java/secClient.properties | 53 +
.../CallableStatementSample.java | 83 +
.../CallableStatementSample/IntegerSPJ.java | 28 +
.../main/samples/CallableStatementSample/README | 42 +
.../main/samples/DBMetaSample/DBMetaSample.java | 132 +
.../jdbcT4/src/main/samples/DBMetaSample/README | 904 +++
.../PreparedStatementSample.java | 151 +
.../main/samples/PreparedStatementSample/README | 232 +
core/conn/jdbcT4/src/main/samples/README | 47 +
.../src/main/samples/ResultSetSample/README | 91 +
.../ResultSetSample/ResultSetSample.java | 104 +
.../src/main/samples/StatementSample/README | 92 +
.../StatementSample/StatementSample.java | 104 +
.../src/main/samples/common/sampleUtils.java | 268 +
.../jdbcT4/src/main/samples/t4jdbc.properties | 26 +
.../java/org/trafodion/jdbc/t4/AppTest.java | 61 +
.../java/org/trafodion/jdbc/t4/RunAllTests.java | 31 +
.../org/trafodion/jdbc/t4/T4DriverTest.java | 49 +
core/conn/jdbc_type4/.gitignore | 3 -
core/conn/jdbc_type4/build.xml | 142 -
core/conn/jdbc_type4/getBuildInfo | 24 -
.../CallableStatementSample.java | 83 -
.../CallableStatementSample/IntegerSPJ.java | 28 -
.../samples/CallableStatementSample/README | 42 -
.../samples/DBMetaSample/DBMetaSample.java | 132 -
.../conn/jdbc_type4/samples/DBMetaSample/README | 904 ---
.../PreparedStatementSample.java | 151 -
.../samples/PreparedStatementSample/README | 232 -
core/conn/jdbc_type4/samples/README | 47 -
.../jdbc_type4/samples/ResultSetSample/README | 91 -
.../ResultSetSample/ResultSetSample.java | 104 -
.../jdbc_type4/samples/StatementSample/README | 92 -
.../StatementSample/StatementSample.java | 104 -
core/conn/jdbc_type4/samples/build.xml | 44 -
.../jdbc_type4/samples/common/sampleUtils.java | 268 -
core/conn/jdbc_type4/samples/t4jdbc.properties | 26 -
core/conn/jdbc_type4/src/T4Messages.properties | 686 --
.../src/org/trafodion/jdbc/t4/Address.java | 117 -
.../src/org/trafodion/jdbc/t4/Bytes.java | 269 -
.../jdbc/t4/CONNECTION_CONTEXT_def.java | 149 -
.../jdbc/t4/CachedPreparedStatement.java | 67 -
.../org/trafodion/jdbc/t4/CancelMessage.java | 49 -
.../src/org/trafodion/jdbc/t4/CancelReply.java | 38 -
.../src/org/trafodion/jdbc/t4/Certificate.java | 112 -
.../src/org/trafodion/jdbc/t4/Cipher.java | 201 -
.../src/org/trafodion/jdbc/t4/CloseMessage.java | 48 -
.../src/org/trafodion/jdbc/t4/CloseReply.java | 48 -
.../src/org/trafodion/jdbc/t4/Compression.java | 149 -
.../org/trafodion/jdbc/t4/ConnectMessage.java | 62 -
.../src/org/trafodion/jdbc/t4/ConnectReply.java | 148 -
.../src/org/trafodion/jdbc/t4/Descriptor2.java | 85 -
.../trafodion/jdbc/t4/ERROR_DESC_LIST_def.java | 42 -
.../org/trafodion/jdbc/t4/ERROR_DESC_def.java | 65 -
.../jdbc/t4/EndTransactionMessage.java | 49 -
.../trafodion/jdbc/t4/EndTransactionReply.java | 49 -
.../org/trafodion/jdbc/t4/ExecuteMessage.java | 107 -
.../src/org/trafodion/jdbc/t4/ExecuteReply.java | 127 -
.../src/org/trafodion/jdbc/t4/FetchMessage.java | 63 -
.../src/org/trafodion/jdbc/t4/FetchReply.java | 63 -
.../org/trafodion/jdbc/t4/GenericMessage.java | 45 -
.../src/org/trafodion/jdbc/t4/GenericReply.java | 43 -
.../jdbc/t4/GetSQLCatalogsMessage.java | 88 -
.../trafodion/jdbc/t4/GetSQLCatalogsReply.java | 54 -
.../jdbc/t4/HPT4ConnectionPoolDataSource.java | 346 -
.../t4/HPT4ConnectionPoolDataSourceFactory.java | 68 -
.../org/trafodion/jdbc/t4/HPT4DataSource.java | 366 --
.../jdbc/t4/HPT4DataSourceFactory.java | 62 -
.../src/org/trafodion/jdbc/t4/HPT4Desc.java | 542 --
.../org/trafodion/jdbc/t4/HPT4Exception.java | 38 -
.../src/org/trafodion/jdbc/t4/HPT4Handle.java | 84 -
.../src/org/trafodion/jdbc/t4/HPT4Messages.java | 324 -
.../jdbc/t4/HPT4ParameterMetaData.java | 243 -
.../trafodion/jdbc/t4/HPT4PooledConnection.java | 238 -
.../jdbc/t4/HPT4PooledConnectionManager.java | 385 --
.../jdbc/t4/HPT4ResultSetMetaData.java | 309 -
.../src/org/trafodion/jdbc/t4/Header.java | 157 -
.../jdbc/t4/InitializeDialogueMessage.java | 66 -
.../jdbc/t4/InitializeDialogueReply.java | 90 -
.../src/org/trafodion/jdbc/t4/InputOutput.java | 682 --
.../trafodion/jdbc/t4/InterfaceConnection.java | 1420 -----
.../trafodion/jdbc/t4/InterfaceResultSet.java | 927 ---
.../trafodion/jdbc/t4/InterfaceStatement.java | 1392 -----
.../trafodion/jdbc/t4/InterfaceUtilities.java | 235 -
.../src/org/trafodion/jdbc/t4/Key.java | 161 -
.../org/trafodion/jdbc/t4/LogicalByteArray.java | 345 -
.../org/trafodion/jdbc/t4/MessageDigest.java | 84 -
.../src/org/trafodion/jdbc/t4/NCSAddress.java | 220 -
.../jdbc/t4/OUT_CONNECTION_CONTEXT_def.java | 97 -
.../src/org/trafodion/jdbc/t4/ObjectArray.java | 86 -
.../org/trafodion/jdbc/t4/PrepareMessage.java | 82 -
.../src/org/trafodion/jdbc/t4/PrepareReply.java | 103 -
.../jdbc/t4/PreparedStatementManager.java | 242 -
.../trafodion/jdbc/t4/SQLItemDescList_def.java | 46 -
.../trafodion/jdbc/t4/SQLItemDescOld_def.java | 54 -
.../org/trafodion/jdbc/t4/SQLItemDesc_def.java | 70 -
.../org/trafodion/jdbc/t4/SQLValueList_def.java | 64 -
.../src/org/trafodion/jdbc/t4/SQLValue_def.java | 55 -
.../trafodion/jdbc/t4/SQLWarningOrError.java | 47 -
.../trafodion/jdbc/t4/SQL_DataValue_def.java | 54 -
.../org/trafodion/jdbc/t4/SecClientMsgKeys.java | 58 -
.../src/org/trafodion/jdbc/t4/SecPwd.java | 265 -
.../trafodion/jdbc/t4/SecResourceBundle.java | 57 -
.../org/trafodion/jdbc/t4/SecdefsCommon.java | 84 -
.../src/org/trafodion/jdbc/t4/Security.java | 319 -
.../trafodion/jdbc/t4/SecurityException.java | 47 -
.../jdbc/t4/SetConnectionOptionMessage.java | 50 -
.../jdbc/t4/SetConnectionOptionReply.java | 45 -
.../src/org/trafodion/jdbc/t4/SymCrypto.java | 87 -
.../src/org/trafodion/jdbc/t4/T4Address.java | 315 -
.../src/org/trafodion/jdbc/t4/T4Connection.java | 505 --
.../org/trafodion/jdbc/t4/T4DSProperties.java | 967 ---
.../trafodion/jdbc/t4/T4DatabaseMetaData.java | 5901 ------------------
.../src/org/trafodion/jdbc/t4/T4Driver.java | 367 --
.../org/trafodion/jdbc/t4/T4LogFormatter.java | 236 -
.../trafodion/jdbc/t4/T4LoggingUtilities.java | 816 ---
.../src/org/trafodion/jdbc/t4/T4Properties.java | 2511 --------
.../src/org/trafodion/jdbc/t4/T4ResultSet.java | 164 -
.../src/org/trafodion/jdbc/t4/T4Statement.java | 204 -
.../org/trafodion/jdbc/t4/T4TimerThread.java | 116 -
.../org/trafodion/jdbc/t4/T4_Dcs_Cancel.java | 115 -
.../org/trafodion/jdbc/t4/T4_Dcs_Connect.java | 123 -
.../src/org/trafodion/jdbc/t4/TRANSPORT.java | 263 -
.../jdbc/t4/TerminateDialogueMessage.java | 38 -
.../jdbc/t4/TerminateDialogueReply.java | 39 -
.../jdbc/t4/TrafT4CallableStatement.java | 2462 --------
.../org/trafodion/jdbc/t4/TrafT4Connection.java | 1987 ------
.../jdbc/t4/TrafT4PreparedStatement.java | 2558 --------
.../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 5106 ---------------
.../org/trafodion/jdbc/t4/TrafT4Statement.java | 1690 -----
.../org/trafodion/jdbc/t4/USER_DESC_def.java | 61 -
.../src/org/trafodion/jdbc/t4/Utility.java | 636 --
.../org/trafodion/jdbc/t4/VERSION_LIST_def.java | 65 -
.../src/org/trafodion/jdbc/t4/VERSION_def.java | 61 -
.../src/org/trafodion/jdbc/t4/Vproc.java | 36 -
.../jdbc/t4/odbc_Dcs_GetObjRefHdl_exc_.java | 95 -
.../jdbc/t4/odbc_Dcs_StopSrvr_exc_.java | 86 -
.../jdbc/t4/odbc_SQLSvc_Close_exc_.java | 69 -
.../t4/odbc_SQLSvc_EndTransaction_exc_.java | 87 -
.../jdbc/t4/odbc_SQLSvc_Execute_exc_.java | 89 -
.../jdbc/t4/odbc_SQLSvc_Fetch_exc_.java | 87 -
.../t4/odbc_SQLSvc_GetSQLCatalogs_exc_.java | 100 -
.../t4/odbc_SQLSvc_InitializeDialogue_exc_.java | 76 -
.../jdbc/t4/odbc_SQLSvc_Prepare_exc_.java | 68 -
.../odbc_SQLSvc_SetConnectionOption_exc_.java | 70 -
.../t4/odbc_SQLSvc_TerminateDialogue_exc_.java | 66 -
core/conn/jdbc_type4/src/secClient.properties | 53 -
core/conn/jdbc_type4/test/RunAllTests.java | 31 -
.../test/org/trafodion/jdbc/t4/BaseTest.java | 60 -
.../org/trafodion/jdbc/t4/T4DriverTest.java | 47 -
core/conn/trafci/build.xml | 4 +-
core/conn/trafci/install/Installer.java | 2 +-
core/conn/trafci/utils/trafci_install.sh | 2 +-
core/rest/pom.xml | 6 +-
core/sqf/sqenvcom.sh | 3 +-
core/sqf/sql/scripts/install_traf_components | 8 +-
core/sql/exp/ExpLOB.cpp | 33 +-
core/sql/exp/ExpLOB.h | 4 +-
core/sql/exp/ExpLOBinterface.cpp | 4 +-
core/sql/generator/GenItemFunc.cpp | 1 +
core/sql/generator/GenPreCode.cpp | 13 +-
core/sql/lib_mgmt/Makefile | 4 +-
core/sql/optimizer/ImplRule.cpp | 3 +
core/sql/parser/sqlparser.y | 20 +-
core/sql/regress/executor/EXPECTED130 | 82 +-
core/sql/regress/executor/FILTER130 | 9 +-
core/sql/regress/executor/TEST130 | 16 +-
core/sql/regress/udr/EXPECTED002 | 2 +-
core/sql/regress/udr/TEST002 | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 43 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 3 +-
dcs/pom.xml | 8 +-
.../trafodion/dcs/zookeeper/DcsQuorumPeer.java | 22 +-
.../org/trafodion/dcs/zookeeper/ZKConfig.java | 21 +-
.../trafodion/dcs/zookeeper/ZKServerTool.java | 24 +-
.../org/trafodion/dcs/zookeeper/ZkClient.java | 22 +-
.../org/trafodion/dcs/zookeeper/ZkUtil.java | 23 +-
.../dcs/zookeeper/ZooKeeperMainServerArg.java | 23 +-
dcs/src/test/jdbc_test/jdbc_test.py | 4 +-
tests/phx/phoenix_test.py | 5 +-
293 files changed, 45024 insertions(+), 44995 deletions(-)
----------------------------------------------------------------------