Merge branches 'ignite-1142' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1142
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fec11d62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fec11d62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fec11d62 Branch: refs/heads/ignite-1142 Commit: fec11d6214dc08c16775d8ca14bc3fa19229f352 Parents: ab5c7e4 93b2057 Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Aug 3 12:18:27 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Aug 3 12:18:27 2015 +0300 ---------------------------------------------------------------------- .../JettyRestProcessorAbstractSelfTest.java | 14 +- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 21 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 26 ++ .../managers/communication/GridIoManager.java | 188 +++++++- .../processors/cache/GridCacheMvccManager.java | 73 +-- .../processors/cache/GridCacheProxyImpl.java | 42 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 20 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../handlers/query/QueryCommandHandler.java | 6 +- .../util/nio/GridCommunicationClient.java | 5 +- .../util/nio/GridNioFinishedFuture.java | 12 + .../ignite/internal/util/nio/GridNioFuture.java | 14 + .../internal/util/nio/GridNioFutureImpl.java | 15 + .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 5 + .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 84 +++- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 45 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../src/test/config/io-manager-benchmark.xml | 3 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - .../IgniteCacheNearOffheapGetSelfTest.java | 131 ++++++ ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++++++++++++++++++ .../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +- .../testsuites/IgniteCacheTestSuite2.java | 1 + .../IgniteSpiCommunicationSelfTestSuite.java | 1 + .../http/jetty/GridJettyRestHandler.java | 12 +- .../parser/dialect/OracleMetadataDialect.java | 4 +- .../visor/commands/kill/VisorKillCommand.scala | 2 +- 35 files changed, 1087 insertions(+), 179 deletions(-) ----------------------------------------------------------------------
