Merge branches 'ignite-7725' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-7725
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/964f8e56 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/964f8e56 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/964f8e56 Branch: refs/heads/ignite-7725 Commit: 964f8e56d5715ed745b866f8875c375796abdc29 Parents: e3aa02a f897370 Author: Alexey Kuznetsov <[email protected]> Authored: Fri Feb 16 22:37:41 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Feb 16 22:37:41 2018 +0700 ---------------------------------------------------------------------- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 2 + .../thin/JdbcThinBulkLoadAbstractSelfTest.java | 14 +- .../ignite/jdbc/thin/JdbcThinTcpIoTest.java | 165 +++++++++++++++++++ .../internal/jdbc/thin/JdbcThinStatement.java | 2 +- .../internal/jdbc/thin/JdbcThinTcpIo.java | 94 ++++++++++- .../bulkload/BulkLoadAckClientParameters.java | 48 +++--- .../cache/CacheAffinitySharedManager.java | 10 +- .../cache/binary/BinaryMetadataTransport.java | 8 +- .../binary/CacheObjectBinaryProcessorImpl.java | 4 + .../GridDhtPartitionsExchangeFuture.java | 2 +- .../GridCacheDatabaseSharedManager.java | 64 +++---- .../snapshot/IgniteCacheSnapshotManager.java | 9 +- .../odbc/jdbc/JdbcBulkLoadAckResult.java | 6 +- .../apache/ignite/internal/sql/SqlKeyword.java | 4 +- .../sql/command/SqlBulkLoadCommand.java | 30 ++-- ...teAllBaselineNodesOnlineFullApiSelfTest.java | 4 +- .../IgniteBaselineAbstractFullApiSelfTest.java | 2 +- ...gniteOfflineBaselineNodeFullApiSelfTest.java | 4 +- ...eOnlineNodeOutOfBaselineFullApiSelfTest.java | 2 +- ...teStableBaselineCachePutAllFailoverTest.java | 3 +- ...teStableBaselineCacheRemoveFailoverTest.java | 3 +- ...gniteAbstractStandByClientReconnectTest.java | 133 ++++++++++++--- .../IgniteStandByClientReconnectTest.java | 94 +++++------ .../query/h2/DmlStatementsProcessor.java | 6 +- 24 files changed, 530 insertions(+), 183 deletions(-) ----------------------------------------------------------------------
