Merge branches 'ignite-341' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cb074fe9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb074fe9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb074fe9 Branch: refs/heads/ignite-443 Commit: cb074fe98614907b0dd20fca71a44beb2dc5d8f4 Parents: 8aaa5ce 3ebb723 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Mar 27 12:42:53 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Mar 27 12:42:53 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(-) ----------------------------------------------------------------------
