Merge remote-tracking branch 'remotes/origin/master' into ignite-2.1.2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28d72d84 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28d72d84 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28d72d84 Branch: refs/heads/ignite-2.1.2-exchange Commit: 28d72d841d9df333b150937d61ee831207668e37 Parents: fefffc0 7d3c5d0 Author: sboikov <[email protected]> Authored: Mon Jun 19 20:12:33 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Jun 19 20:12:33 2017 +0300 ---------------------------------------------------------------------- .../distributed/GridDistributedLockRequest.java | 20 + .../GridDistributedTxPrepareRequest.java | 20 + .../distributed/dht/GridDhtLockFuture.java | 1 + .../distributed/dht/GridDhtLockRequest.java | 4 + .../dht/GridDhtTransactionalCacheAdapter.java | 3 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 + .../dht/GridDhtTxPrepareRequest.java | 5 +- .../cache/distributed/dht/GridDhtTxRemote.java | 24 +- .../cache/transactions/IgniteTxHandler.java | 3 +- .../processors/odbc/odbc/OdbcMessageParser.java | 55 ++- .../odbc/odbc/OdbcQueryExecuteBatchRequest.java | 95 +++++ .../odbc/odbc/OdbcQueryExecuteBatchResult.java | 75 ++++ .../odbc/odbc/OdbcQueryExecuteRequest.java | 6 +- .../odbc/odbc/OdbcQueryExecuteResult.java | 2 +- .../processors/odbc/odbc/OdbcRequest.java | 4 +- .../odbc/odbc/OdbcRequestHandler.java | 108 ++++- .../IgniteTxCachePrimarySyncTest.java | 34 +- .../IgniteCachePutRetryAbstractSelfTest.java | 37 +- .../dht/TxRecoveryStoreEnabledTest.java | 231 +++++++++++ .../IgniteCacheTxRecoverySelfTestSuite.java | 2 + .../platforms/cpp/core-test/src/test_utils.cpp | 1 + .../src/application_data_buffer_test.cpp | 176 +++----- .../platforms/cpp/odbc-test/src/column_test.cpp | 21 +- .../cpp/odbc-test/src/queries_test.cpp | 404 +++++++++++++++++- .../platforms/cpp/odbc-test/src/row_test.cpp | 9 +- .../platforms/cpp/odbc-test/src/test_utils.cpp | 1 + modules/platforms/cpp/odbc/Makefile.am | 3 + modules/platforms/cpp/odbc/include/Makefile.am | 2 + .../ignite/odbc/app/application_data_buffer.h | 38 +- .../odbc/include/ignite/odbc/app/parameter.h | 20 +- .../include/ignite/odbc/app/parameter_set.h | 268 ++++++++++++ .../ignite/odbc/diagnostic/diagnosable.h | 4 +- .../cpp/odbc/include/ignite/odbc/message.h | 411 +++++++------------ .../include/ignite/odbc/query/batch_query.h | 160 ++++++++ .../odbc/include/ignite/odbc/query/data_query.h | 12 +- .../cpp/odbc/include/ignite/odbc/query/query.h | 3 + .../include/ignite/odbc/query/type_info_query.h | 2 +- .../cpp/odbc/include/ignite/odbc/statement.h | 50 +-- .../platforms/cpp/odbc/project/vs/odbc.vcxproj | 5 + .../cpp/odbc/project/vs/odbc.vcxproj.filters | 15 + .../odbc/src/app/application_data_buffer.cpp | 90 +++- .../platforms/cpp/odbc/src/app/parameter.cpp | 11 +- .../cpp/odbc/src/app/parameter_set.cpp | 242 +++++++++++ modules/platforms/cpp/odbc/src/column.cpp | 1 - .../cpp/odbc/src/config/connection_info.cpp | 36 ++ modules/platforms/cpp/odbc/src/message.cpp | 373 +++++++++++++++++ .../cpp/odbc/src/query/batch_query.cpp | 198 +++++++++ .../platforms/cpp/odbc/src/query/data_query.cpp | 13 +- modules/platforms/cpp/odbc/src/statement.cpp | 250 ++++++----- 49 files changed, 2893 insertions(+), 657 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/28d72d84/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ----------------------------------------------------------------------
