Merge remote-tracking branch 'origin/ignite-sprint-7' into ignite-sprint-7
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea90d863 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea90d863 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea90d863 Branch: refs/heads/ignite-1056 Commit: ea90d8633265723076f729b2dca02873c033ce55 Parents: 1427d75 a0a31e2 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Jul 2 12:10:38 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Jul 2 12:10:38 2015 -0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheSwapManager.java | 257 ++++++++++++------- .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + 8 files changed, 179 insertions(+), 107 deletions(-) ----------------------------------------------------------------------
