Merge remote-tracking branch 'remotes/origin/master' into ignite-1189
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d78e4c8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d78e4c8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d78e4c8e Branch: refs/heads/ignite-1175 Commit: d78e4c8eef921775d2d5d1fcd5adf151c3d46923 Parents: 4d528be b056a73 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Aug 4 13:32:45 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Aug 4 13:32:45 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 21 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 43 +- .../managers/communication/GridIoManager.java | 188 +++++++- .../processors/cache/GridCacheMvccManager.java | 73 +-- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 42 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../ignite/internal/util/IgniteUtils.java | 16 + .../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 | 43 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../src/test/config/io-manager-benchmark.xml | 3 +- .../GridJobMasterLeaveAwareSelfTest.java | 10 +- .../IgniteClientReconnectAbstractTest.java | 5 +- .../IgniteClientReconnectCacheTest.java | 5 +- .../GridDeploymentMessageCountSelfTest.java | 5 +- .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../GridCacheAtomicMessageCountSelfTest.java | 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - ...ridCacheReplicatedSynchronousCommitTest.java | 5 +- .../IgniteCacheAbstractStopBusySelfTest.java | 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 6 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 4 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 ++++++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java | 5 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../near/IgniteCacheNearTxRollbackTest.java | 6 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++++++++++++++++++ .../testsuites/IgniteCacheTestSuite2.java | 1 + .../IgniteSpiCommunicationSelfTestSuite.java | 1 + .../ignite/util/TestTcpCommunicationSpi.java | 6 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 15 +- .../parser/dialect/OracleMetadataDialect.java | 4 +- .../src/test/java/config/ignite-test-config.xml | 43 ++ .../ignite/internal/GridFactorySelfTest.java | 9 + .../visor/commands/kill/VisorKillCommand.scala | 2 +- 55 files changed, 1148 insertions(+), 197 deletions(-) ----------------------------------------------------------------------
