Repository: incubator-ignite Updated Branches: refs/heads/ignite-598 b04248577 -> 013233ee0
ignite-598: fix GridEntDrProcessor compilation Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/013233ee Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/013233ee Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/013233ee Branch: refs/heads/ignite-598 Commit: 013233ee06ff3669d7fdbb7fc7b5deef53106935 Parents: b042485 Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon Mar 30 21:14:57 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon Mar 30 21:14:57 2015 +0300 ---------------------------------------------------------------------- .../loadtests/hashmap/GridCacheTestContext.java | 70 ++++++++++++-------- 1 file changed, 42 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/013233ee/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java index 486f7df..39301d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java @@ -17,9 +17,23 @@ package org.apache.ignite.loadtests.hashmap; +import org.apache.ignite.cache.store.*; +import org.apache.ignite.configuration.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.datastructures.*; +import org.apache.ignite.internal.processors.cache.dr.os.*; +import org.apache.ignite.internal.processors.cache.jta.*; +import org.apache.ignite.internal.processors.cache.query.*; +import org.apache.ignite.internal.processors.cache.query.continuous.*; +import org.apache.ignite.internal.processors.cache.transactions.*; +import org.apache.ignite.internal.processors.cache.version.*; +import org.apache.ignite.internal.processors.plugin.*; import org.apache.ignite.testframework.junits.*; +import java.util.*; + +import static org.apache.ignite.testframework.junits.GridAbstractTest.*; + /** * Cache test context. */ @@ -30,33 +44,33 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> { */ @SuppressWarnings("NullableProblems") public GridCacheTestContext(GridTestKernalContext ctx) throws Exception { - // TODO fix it. -// super( -// ctx, -// new GridCacheSharedContext<>( -// ctx, -// new IgniteTxManager(), -// new GridCacheVersionManager(), -// new GridCacheMvccManager(), -// new GridCacheDeploymentManager<K, V>(), -// new GridCachePartitionExchangeManager<K, V>(), -// new GridCacheIoManager() -// ), -// defaultCacheConfiguration(), -// true, -// new GridCacheEventManager(), -// new GridCacheSwapManager(false), -// new GridCacheStoreManager(null, -// new IdentityHashMap<CacheStore, ThreadLocal>(), -// null, -// new CacheConfiguration()), -// new GridCacheEvictionManager(), -// new GridCacheLocalQueryManager<K, V>(), -// new CacheContinuousQueryManager(), -// new GridCacheAffinityManager(), -// new CacheDataStructuresManager(), -// new GridCacheTtlManager(), -// new GridOsCacheDrManager(), -// new CacheNoopJtaManager()); + super( + ctx, + new GridCacheSharedContext<>( + ctx, + new IgniteTxManager(), + new GridCacheVersionManager(), + new GridCacheMvccManager(), + new GridCacheDeploymentManager<K, V>(), + new GridCachePartitionExchangeManager<K, V>(), + new GridCacheIoManager() + ), + defaultCacheConfiguration(), + true, + new GridCacheEventManager(), + new GridCacheSwapManager(false), + new GridCacheStoreManager(null, + new IdentityHashMap<CacheStore, ThreadLocal>(), + null, + new CacheConfiguration()), + new GridCacheEvictionManager(), + new GridCacheLocalQueryManager<K, V>(), + new CacheContinuousQueryManager(), + new GridCacheAffinityManager(), + new CacheDataStructuresManager(), + new GridCacheTtlManager(), + new GridOsCacheDrManager(), + new CacheNoopJtaManager(), + new CachePluginManager(ctx, new CacheConfiguration())); } }