Merge branch 'sprint-2' into ignite-430
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e0b86cdf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e0b86cdf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e0b86cdf Branch: refs/heads/ignite-430 Commit: e0b86cdf8054187110a0fcba65a1812ee7b45996 Parents: b6990f6 cb074fe Author: Andrey Gura <ag...@okko.tv> Authored: Fri Mar 27 19:37:48 2015 +0300 Committer: Andrey Gura <ag...@okko.tv> Committed: Fri Mar 27 19:37:48 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(-) ----------------------------------------------------------------------
