Merge branch 'ignite-1.3.3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d9b9dfa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d9b9dfa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d9b9dfa Branch: refs/heads/ignite-104 Commit: 3d9b9dfacabf4e3a7b8c418965815266e0dcfd2b Parents: 1c10ade 41c76a7 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Jul 31 17:04:42 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Jul 31 17:04:42 2015 -0700 ---------------------------------------------------------------------- .../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 | 84 +++++++++++- .../processors/cache/GridCacheProxyImpl.java | 42 +++--- .../processors/cache/GridCacheSwapManager.java | 2 +- .../distributed/near/GridNearGetFuture.java | 20 +-- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../src/test/config/io-manager-benchmark.xml | 3 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 +++++++++++++++++++ .../testsuites/IgniteCacheTestSuite2.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 4 +- .../visor/commands/kill/VisorKillCommand.scala | 2 +- 14 files changed, 298 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d9b9dfa/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d9b9dfa/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d9b9dfa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d9b9dfa/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d9b9dfa/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ----------------------------------------------------------------------