Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-494b
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4329e391 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4329e391 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4329e391 Branch: refs/heads/ignite-494b Commit: 4329e3918c269b77887893d8abd7884cc5007920 Parents: 2340f5f cb074fe Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Fri Mar 27 15:45:46 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Fri Mar 27 15:45:46 2015 +0300 ---------------------------------------------------------------------- assembly/libs/README.txt | 1 - modules/core/pom.xml | 14 +- .../internal/MarshallerContextAdapter.java | 5 +- .../ignite/internal/MarshallerContextImpl.java | 65 ++-- .../discovery/GridDiscoveryManager.java | 7 +- .../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 + .../ignite/lang/IgniteProductVersion.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 5 +- .../optimized/OptimizedMarshallerUtils.java | 2 +- .../spi/swapspace/SwapSpaceSpiListener.java | 3 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../org/jsr166/ConcurrentLinkedHashMap.java | 9 + .../GridProjectionForCachesSelfTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 45 ++- ...heValueConsistencyTransactionalSelfTest.java | 2 +- .../IgniteClientAffinityAssignmentSelfTest.java | 99 +++++- ...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 ++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../GridConcurrentLinkedHashMapSelfTest.java | 17 + .../GridSwapSpaceSpiAbstractSelfTest.java | 9 +- .../inmemory/GridTestSwapSpaceSpi.java | 2 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../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 +- 39 files changed, 909 insertions(+), 225 deletions(-) ----------------------------------------------------------------------
