Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-157
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d245dc81 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d245dc81 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d245dc81 Branch: refs/heads/ignite-709_2 Commit: d245dc818d18f9474854cd9550e60efc87732ce0 Parents: f9c5fbe 2361640 Author: sboikov <sboi...@gridgain.com> Authored: Fri May 8 15:21:01 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri May 8 15:21:01 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 - modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../processors/cache/GridCacheAdapter.java | 26 ++- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheProxyImpl.java | 24 -- .../processors/cache/GridCacheSwapManager.java | 215 +++++++++++++----- .../processors/cache/IgniteInternalCache.java | 27 --- .../colocated/GridDhtColocatedLockFuture.java | 2 + .../distributed/near/GridNearCacheAdapter.java | 10 - .../processors/cache/local/GridLocalCache.java | 8 +- .../local/atomic/GridLocalAtomicCache.java | 27 ++- .../cache/query/GridCacheQueryManager.java | 21 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../processors/igfs/IgfsDeleteWorker.java | 4 + .../offheap/GridOffHeapProcessor.java | 17 ++ .../util/offheap/GridOffHeapPartitionedMap.java | 9 + .../unsafe/GridUnsafePartitionedMap.java | 155 ++++++------- .../core/src/main/resources/ignite.properties | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 227 +++++++++++-------- .../cache/GridCacheAbstractSelfTest.java | 4 +- .../cache/OffHeapTieredTransactionSelfTest.java | 127 +++++++++++ ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 ++++ ...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +- ...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 +++++ ...earDisabledOffHeapTieredFullApiSelfTest.java | 33 +++ ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 +++ ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 +++ ...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...achePartitionedMultiNodeFullApiSelfTest.java | 15 +- ...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +- ...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...PartitionedOffHeapTieredFullApiSelfTest.java | 32 +++ ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 ++++++ ...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +- ...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 +++ ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 +++ ...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 +++ .../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +- ...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 +++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../IgniteCacheFullApiSelfTestSuite.java | 18 ++ .../testsuites/IgniteCacheTestSuite3.java | 3 - modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- ...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 29 ++- .../IgniteCacheQuerySelfTestSuite.java | 1 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 6 +- 79 files changed, 1269 insertions(+), 406 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d245dc81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d245dc81/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d245dc81/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite3.java ----------------------------------------------------------------------
