IGNITE-443 Fixed review notes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b06af8da Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b06af8da Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b06af8da Branch: refs/heads/ignite-sprint-3 Commit: b06af8da9e8ec259a2c032d9d847693216e3e4ce Parents: 84d5cb9 Author: nikolay_tikhonov <[email protected]> Authored: Thu Mar 12 16:35:28 2015 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Thu Mar 12 16:35:28 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/GridKernalContextImpl.java | 4 +- .../processors/cache/CacheConflictManager.java | 30 +++++++ .../cache/CacheConflictResolverManager.java | 30 ------- .../cache/CacheStubConflictManager.java | 32 ++++++++ .../cache/CacheStubConflictResolverManager.java | 32 -------- .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheProcessor.java | 2 +- .../processors/cache/dr/GridCacheDrManager.java | 5 -- .../cache/dr/os/GridOsCacheDrManager.java | 5 -- .../version/CacheVersionConflictResolver.java | 85 ++++++++++++++++++++ ...ridCacheVersionAbstractConflictResolver.java | 56 ------------- .../GridCacheVersionConflictResolver.java | 59 -------------- .../loadtests/hashmap/GridCacheTestContext.java | 2 +- 13 files changed, 154 insertions(+), 194 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 333a852..a605387 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -800,8 +800,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable return (T)new GridOsCacheDrManager(); else if (cls.equals(IgniteCacheObjectProcessor.class)) return (T)new IgniteCacheObjectProcessorImpl(this); - else if (cls.equals(CacheConflictResolverManager.class)) - return (T)new CacheStubConflictResolverManager<>(); + else if (cls.equals(CacheConflictManager.class)) + return (T)new CacheStubConflictManager<>(); throw new IgniteException("Unsupported component type: " + cls); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.java new file mode 100644 index 0000000..3d9de4a --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictManager.java @@ -0,0 +1,30 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache; + +import org.apache.ignite.internal.processors.cache.version.*; + +/** + * Conflict resolver manager. + */ +public abstract class CacheConflictManager<K, V> extends GridCacheManagerAdapter<K, V> { + /** + * @return Cache conflict resolver. + */ + public abstract CacheVersionConflictResolver conflictResolver(); +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java deleted file mode 100644 index cd11278..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictResolverManager.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache; - -import org.apache.ignite.internal.processors.cache.version.*; - -/** - * Conflict resolver manager. - */ -public abstract class CacheConflictResolverManager<K, V> extends GridCacheManagerAdapter<K, V> { - /** - * @return Cache conflict resolver. - */ - public abstract GridCacheVersionAbstractConflictResolver conflictResolver(); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictManager.java new file mode 100644 index 0000000..943ca69 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictManager.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache; + +import org.apache.ignite.internal.processors.cache.version.*; + +/** + * Stub conflict resolver manager. + */ +public class CacheStubConflictManager<K ,V> extends CacheConflictManager<K ,V> { + /** + * @return Cache conflict resolver. + */ + @Override public CacheVersionConflictResolver conflictResolver() { + return null; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictResolverManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictResolverManager.java deleted file mode 100644 index e284d69..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheStubConflictResolverManager.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache; - -import org.apache.ignite.internal.processors.cache.version.*; - -/** - * Stub conflict resolver manager. - */ -public class CacheStubConflictResolverManager<K ,V> extends CacheConflictResolverManager<K ,V> { - /** - * @return Cache conflict resolver. - */ - @Override public GridCacheVersionAbstractConflictResolver conflictResolver() { - return null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 3dace7a..d0aed3f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -135,7 +135,7 @@ public class GridCacheContext<K, V> implements Externalizable { private CacheJtaManagerAdapter jtaMgr; /** Conflict resolver manager. */ - private CacheConflictResolverManager rslvrMgr; + private CacheConflictManager rslvrMgr; /** Managers. */ private List<GridCacheManager<K, V>> mgrs = new LinkedList<>(); @@ -189,7 +189,7 @@ public class GridCacheContext<K, V> implements Externalizable { private CacheWeakQueryIteratorsHolder<Map.Entry<K, V>> itHolder; /** Conflict resolver. */ - private GridCacheVersionAbstractConflictResolver conflictRslvr; + private CacheVersionConflictResolver conflictRslvr; /** */ private CacheObjectContext cacheObjCtx; @@ -239,7 +239,7 @@ public class GridCacheContext<K, V> implements Externalizable { GridCacheTtlManager ttlMgr, GridCacheDrManager drMgr, CacheJtaManagerAdapter jtaMgr, - CacheConflictResolverManager<K, V> rslvrMgr) { + CacheConflictManager<K, V> rslvrMgr) { assert ctx != null; assert sharedCtx != null; assert cacheCfg != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 6019fde..0ba04d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -625,7 +625,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheDataStructuresManager dataStructuresMgr = new CacheDataStructuresManager(); GridCacheTtlManager ttlMgr = new GridCacheTtlManager(); GridCacheDrManager drMgr = ctx.createComponent(GridCacheDrManager.class); - CacheConflictResolverManager rslvrMgr = ctx.createComponent(CacheConflictResolverManager.class); + CacheConflictManager rslvrMgr = ctx.createComponent(CacheConflictManager.class); GridCacheStoreManager storeMgr = new GridCacheStoreManager(ctx, sesHolders, cfgStore, cfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java index dbf90c9..edff1b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java @@ -33,11 +33,6 @@ public interface GridCacheDrManager extends GridCacheManager { public byte dataCenterId(); /** - * @return Cache version conflict resolver. - */ - public GridCacheVersionAbstractConflictResolver conflictResolver(); - - /** * Performs replication. * * @param key Key. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java index 7cec4eb..2b02428 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java @@ -64,11 +64,6 @@ public class GridOsCacheDrManager implements GridCacheDrManager { } /** {@inheritDoc} */ - @Override public GridCacheVersionAbstractConflictResolver conflictResolver() { - return null; - } - - /** {@inheritDoc} */ @Override public void replicate(KeyCacheObject key, @Nullable CacheObject val, long ttl, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java new file mode 100644 index 0000000..05311db --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/CacheVersionConflictResolver.java @@ -0,0 +1,85 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.version; + +import org.apache.ignite.*; +import org.apache.ignite.internal.processors.cache.*; + +/** + * Cache version conflict resolver. + */ +public class CacheVersionConflictResolver { + /** + * Resolve the conflict. + * + * @param oldEntry Old entry. + * @param newEntry New entry. + * @param atomicVerComparator Whether to use atomic version comparator. + * @return Conflict resolution context. + * @throws IgniteCheckedException If failed. + */ + public <K, V> GridCacheVersionConflictContext<K, V> resolve(GridCacheVersionedEntryEx<K, V> oldEntry, + GridCacheVersionedEntryEx<K, V> newEntry, boolean atomicVerComparator) throws IgniteCheckedException { + GridCacheVersionConflictContext<K, V> ctx = new GridCacheVersionConflictContext<>(oldEntry, newEntry); + + resolve0(ctx, oldEntry, newEntry, atomicVerComparator); + + return ctx; + } + + /** + * Internal conflict resolution routine. + * + * @param ctx Context. + * @param oldEntry Old entry. + * @param newEntry New entry. + * @param atomicVerComparator Whether to use atomic version comparator. + * @throws IgniteCheckedException If failed. + */ + protected <K, V> void resolve0(GridCacheVersionConflictContext<K, V> ctx, + GridCacheVersionedEntryEx<K, V> oldEntry, GridCacheVersionedEntryEx<K, V> newEntry, + boolean atomicVerComparator) throws IgniteCheckedException { + if (newEntry.dataCenterId() != oldEntry.dataCenterId()) + ctx.useNew(); + else { + if (oldEntry.isStartVersion()) + ctx.useNew(); + else { + if (atomicVerComparator) { + // Handle special case when version check using ATOMIC cache comparator is required. + if (GridCacheMapEntry.ATOMIC_VER_COMPARATOR.compare(oldEntry.version(), newEntry.version()) >= 0) + ctx.useOld(); + else + ctx.useNew(); + } + else { + long topVerDiff = newEntry.topologyVersion() - oldEntry.topologyVersion(); + + if (topVerDiff > 0) + ctx.useNew(); + else if (topVerDiff < 0) + ctx.useOld(); + else if (newEntry.order() > oldEntry.order()) + ctx.useNew(); + else + ctx.useOld(); + } + } + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAbstractConflictResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAbstractConflictResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAbstractConflictResolver.java deleted file mode 100644 index 8bc6425..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionAbstractConflictResolver.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache.version; - -import org.apache.ignite.*; - -/** - * Cache version conflict resolver. - */ -public abstract class GridCacheVersionAbstractConflictResolver { - /** - * Resolve the conflict. - * - * @param oldEntry Old entry. - * @param newEntry New entry. - * @param atomicVerComparator Whether to use atomic version comparator. - * @return Conflict resolution context. - * @throws IgniteCheckedException If failed. - */ - public <K, V> GridCacheVersionConflictContext<K, V> resolve(GridCacheVersionedEntryEx<K, V> oldEntry, - GridCacheVersionedEntryEx<K, V> newEntry, boolean atomicVerComparator) throws IgniteCheckedException { - GridCacheVersionConflictContext<K, V> ctx = new GridCacheVersionConflictContext<>(oldEntry, newEntry); - - resolve0(ctx, oldEntry, newEntry, atomicVerComparator); - - return ctx; - } - - /** - * Internal conflict resolution routine. - * - * @param ctx Context. - * @param oldEntry Old entry. - * @param newEntry New entry. - * @param atomicVerComparator Whether to use atomic version comparator. - * @throws IgniteCheckedException If failed. - */ - protected abstract <K, V> void resolve0(GridCacheVersionConflictContext<K, V> ctx, - GridCacheVersionedEntryEx<K, V> oldEntry, GridCacheVersionedEntryEx<K, V> newEntry, - boolean atomicVerComparator) throws IgniteCheckedException; -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictResolver.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictResolver.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictResolver.java deleted file mode 100644 index 869993c..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionConflictResolver.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache.version; - -import org.apache.ignite.*; -import org.apache.ignite.internal.processors.cache.*; - -/** - * Default conflict resolver. - */ -public class GridCacheVersionConflictResolver extends GridCacheVersionAbstractConflictResolver { - /** {@inheritDoc} */ - @Override protected <K, V> void resolve0(GridCacheVersionConflictContext<K, V> ctx, - GridCacheVersionedEntryEx<K, V> oldEntry, GridCacheVersionedEntryEx<K, V> newEntry, - boolean atomicVerComparator) throws IgniteCheckedException { - if (newEntry.dataCenterId() != oldEntry.dataCenterId()) - ctx.useNew(); - else { - if (oldEntry.isStartVersion()) - ctx.useNew(); - else { - if (atomicVerComparator) { - // Handle special case when version check using ATOMIC cache comparator is required. - if (GridCacheMapEntry.ATOMIC_VER_COMPARATOR.compare(oldEntry.version(), newEntry.version()) >= 0) - ctx.useOld(); - else - ctx.useNew(); - } - else { - long topVerDiff = newEntry.topologyVersion() - oldEntry.topologyVersion(); - - if (topVerDiff > 0) - ctx.useNew(); - else if (topVerDiff < 0) - ctx.useOld(); - else if (newEntry.order() > oldEntry.order()) - ctx.useNew(); - else - ctx.useOld(); - } - } - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b06af8da/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 0ee8434..95bf8bd 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 @@ -69,6 +69,6 @@ public class GridCacheTestContext<K, V> extends GridCacheContext<K, V> { new GridCacheTtlManager(), new GridOsCacheDrManager(), new CacheNoopJtaManager(), - new CacheStubConflictResolverManager<K, V>()); + new CacheStubConflictManager<K, V>()); } }
