You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/06 14:07:06 UTC
[07/36] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-4' into ignite-646
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-646
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cdbaaba4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cdbaaba4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cdbaaba4
Branch: refs/heads/ignite-695
Commit: cdbaaba4c94b7670aae3e174419ec5cf61d4030b
Parents: 0d982f7 75425c6
Author: avinogradov <av...@gridgain.com>
Authored: Thu Apr 23 15:01:56 2015 +0300
Committer: avinogradov <av...@gridgain.com>
Committed: Thu Apr 23 15:01:56 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheInterceptor.java | 9 +-
.../configuration/CacheConfiguration.java | 30 ++-
.../configuration/IgniteConfiguration.java | 107 +++++++++++
.../ignite/configuration/TopologyValidator.java | 35 ++++
.../org/apache/ignite/internal/IgnitionEx.java | 8 +-
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../connection/GridClientNioTcpConnection.java | 9 +-
.../managers/communication/GridIoManager.java | 33 +++-
.../GridLifecycleAwareMessageFilter.java | 35 ++++
.../discovery/GridDiscoveryManager.java | 18 +-
.../cache/GridCacheAffinityManager.java | 12 --
.../GridCachePartitionExchangeManager.java | 5 +-
.../processors/cache/IgniteCacheProxy.java | 15 +-
.../cache/affinity/GridCacheAffinityImpl.java | 2 +-
.../distributed/dht/GridDhtTopologyFuture.java | 8 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 7 +
.../colocated/GridDhtColocatedLockFuture.java | 24 ++-
.../preloader/GridDhtPartitionSupplyPool.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 17 ++
.../distributed/near/GridNearAtomicCache.java | 2 +-
.../distributed/near/GridNearLockFuture.java | 26 ++-
.../near/GridNearTransactionalCache.java | 2 +-
.../near/GridNearTxPrepareFuture.java | 20 ++
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../processors/job/GridJobProcessor.java | 6 +
.../processors/query/GridQueryIndexing.java | 4 +-
.../processors/query/GridQueryProcessor.java | 2 +-
.../resources/META-INF/classnames.properties | 41 ++---
.../cache/GridCacheAbstractFullApiSelfTest.java | 4 +-
.../cache/IgniteExcangeFutureHistoryTest.java | 74 ++++++++
...gniteTopologyValidatorAbstractCacheTest.java | 183 +++++++++++++++++++
...iteTopologyValidatorAbstractTxCacheTest.java | 125 +++++++++++++
...ValidatorNearPartitionedAtomicCacheTest.java | 30 +++
...logyValidatorNearPartitionedTxCacheTest.java | 30 +++
...logyValidatorPartitionedAtomicCacheTest.java | 49 +++++
...TopologyValidatorPartitionedTxCacheTest.java | 30 +++
...ologyValidatorReplicatedAtomicCacheTest.java | 49 +++++
...eTopologyValidatorReplicatedTxCacheTest.java | 30 +++
.../IgniteCachePutGetRestartAbstractTest.java | 2 +-
...arDisabledFairAffinityPutGetRestartTest.java | 35 ++++
...acheSortedEvictionPolicyPerformanceTest.java | 135 ++++++++++++++
.../GridCacheLocalIsolatedNodesSelfTest.java | 102 +++++++++++
.../testframework/junits/GridAbstractTest.java | 15 ++
.../IgniteCacheFailoverTestSuite.java | 3 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 6 +
.../IgniteTopologyValidatorTestSuit.java | 43 +++++
.../processors/query/h2/IgniteH2Indexing.java | 6 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 34 +++-
.../h2/twostep/GridReduceQueryExecutor.java | 34 +++-
.../h2/GridIndexingSpiAbstractSelfTest.java | 2 +-
.../ignite/schema/generator/CodeGenerator.java | 60 +++++-
.../ignite/internal/GridFactorySelfTest.java | 3 +-
pom.xml | 14 +-
54 files changed, 1480 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cdbaaba4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------