Repository: incubator-ignite Updated Branches: refs/heads/ignite-611 684db5218 -> 7e56bf6fe
Merge remote-tracking branch 'remotes/origin/sprint-2' into sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7c2e0e4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7c2e0e4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7c2e0e4f Branch: refs/heads/ignite-611 Commit: 7c2e0e4fcb80c5e9003bf03f4ee2005217136837 Parents: 71ecef2 cb074fe Author: sboikov <sboi...@gridgain.com> Authored: Fri Mar 27 15:14:44 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Mar 27 15:14:44 2015 +0300 ---------------------------------------------------------------------- .../swapspace/GridSwapSpaceManager.java | 6 +- .../processors/cache/GridCacheMapEntry.java | 24 +- .../processors/cache/GridCacheProcessor.java | 17 +- .../distributed/dht/GridDhtLocalPartition.java | 101 +++++- .../cache/query/GridCacheQueryManager.java | 4 +- .../processors/query/GridQueryIndexing.java | 3 +- .../processors/query/GridQueryProcessor.java | 22 +- .../ignite/internal/util/lang/GridFunc.java | 14 + .../spi/swapspace/SwapSpaceSpiListener.java | 3 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../GridSwapSpaceSpiAbstractSelfTest.java | 9 +- .../inmemory/GridTestSwapSpaceSpi.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 50 +-- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 95 ++++-- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 64 ++-- .../query/h2/opt/GridH2RowDescriptor.java | 2 +- .../processors/query/h2/opt/GridH2Table.java | 31 +- .../query/h2/opt/GridH2TreeIndex.java | 4 +- ...CacheOffheapTieredMultithreadedSelfTest.java | 319 +++++++++++++++++++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 42 +-- .../h2/GridIndexingSpiAbstractSelfTest.java | 8 +- .../IgniteCacheQuerySelfTestSuite.java | 2 +- 22 files changed, 665 insertions(+), 159 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7c2e0e4f/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ----------------------------------------------------------------------
