Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41508437 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41508437 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41508437 Branch: refs/heads/ignite-104 Commit: 41508437206d74e5cd5c3269883a876ca257300a Parents: 6b52a23 b056a73 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Mon Aug 3 13:42:41 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Mon Aug 3 13:42:41 2015 -0700 ---------------------------------------------------------------------- .../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 | 84 +++++++++++- .../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 +++ .../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 +- .../testsuites/IgniteCacheTestSuite2.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 +- 43 files changed, 465 insertions(+), 178 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41508437/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ----------------------------------------------------------------------
