IGNITE-443 Fixed javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18cc3848 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18cc3848 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18cc3848 Branch: refs/heads/ignite-443 Commit: 18cc3848957f33439e669878eeb6d095a0d8200a Parents: f35beae Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Mar 12 12:10:42 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Mar 12 12:10:42 2015 +0300 ---------------------------------------------------------------------- .../cache/CacheConflictContextImpl.java | 64 ++++++++++++++++++++ .../cache/CacheConflictResolverManager.java | 2 +- .../DrReceiverCacheConflictContextImpl.java | 64 -------------------- .../IgniteCacheConflictResolverManager.java | 9 ++- .../GridCacheVersionConflictResolver.java | 2 +- ...CacheConflictResolverLocalStoreSelfTest.java | 4 +- 6 files changed, 74 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18cc3848/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictContextImpl.java new file mode 100644 index 0000000..e4f334e --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheConflictContextImpl.java @@ -0,0 +1,64 @@ +/* + * 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.cache.*; +import org.apache.ignite.internal.processors.cache.version.*; +import org.jetbrains.annotations.*; + +/** + * Conflict context implementation. + */ +public class CacheConflictContextImpl<K, V> implements CacheConflictContext<K, V> { + /** Underlying cache conflict context. */ + private final GridCacheVersionConflictContext<K, V> ctx; + + /** + * Constructor. + * + * @param ctx Underlying cache conflict context. + */ + public CacheConflictContextImpl(GridCacheVersionConflictContext<K, V> ctx) { + this.ctx = ctx; + } + + /** {@inheritDoc} */ + @Override public CacheResolveEntry<K, V> oldEntry() { + return new CacheResolveEntryImpl<>(ctx.oldEntry()); + } + + /** {@inheritDoc} */ + @Override public CacheResolveEntry<K, V> newEntry() { + return new CacheResolveEntryImpl<>(ctx.newEntry()); + } + + /** {@inheritDoc} */ + @Override public void useOld() { + ctx.useOld(); + } + + /** {@inheritDoc} */ + @Override public void useNew() { + ctx.useNew(); + } + + /** {@inheritDoc} */ + @Override public void merge(@Nullable V mergeVal, long ttl) { + ctx.merge(mergeVal, ttl); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18cc3848/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 index ea1e1b0..b1ca3af 100644 --- 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 @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.cache; /** - * + * Conflict resolver manager. */ public abstract class CacheConflictResolverManager<K, V> extends GridCacheManagerAdapter<K, V> { /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18cc3848/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DrReceiverCacheConflictContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DrReceiverCacheConflictContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DrReceiverCacheConflictContextImpl.java deleted file mode 100644 index 99c19f4..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DrReceiverCacheConflictContextImpl.java +++ /dev/null @@ -1,64 +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.cache.*; -import org.apache.ignite.internal.processors.cache.version.*; -import org.jetbrains.annotations.*; - -/** - * DR conflict context implementation. - */ -public class DrReceiverCacheConflictContextImpl<K, V> implements CacheConflictContext<K, V> { - /** Underlying cache conflict context. */ - private final GridCacheVersionConflictContext<K, V> ctx; - - /** - * Constructor. - * - * @param ctx Underlying cache conflict context. - */ - public DrReceiverCacheConflictContextImpl(GridCacheVersionConflictContext<K, V> ctx) { - this.ctx = ctx; - } - - /** {@inheritDoc} */ - @Override public CacheResolveEntry<K, V> oldEntry() { - return new CacheResolveEntryImpl<>(ctx.oldEntry()); - } - - /** {@inheritDoc} */ - @Override public CacheResolveEntry<K, V> newEntry() { - return new CacheResolveEntryImpl<>(ctx.newEntry()); - } - - /** {@inheritDoc} */ - @Override public void useOld() { - ctx.useOld(); - } - - /** {@inheritDoc} */ - @Override public void useNew() { - ctx.useNew(); - } - - /** {@inheritDoc} */ - @Override public void merge(@Nullable V mergeVal, long ttl) { - ctx.merge(mergeVal, ttl); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18cc3848/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java index 50cc508..dfb01d7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheConflictResolverManager.java @@ -20,14 +20,17 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.internal.processors.cache.version.*; /** - * + * Conflict resolver manager. */ public class IgniteCacheConflictResolverManager<K ,V> extends CacheConflictResolverManager<K ,V> { /** * @return Cache conflict resolver. */ @Override public GridCacheEntryAbstractConflictResolver conflictResolver() { - return new GridCacheVersionConflictResolver(cctx.config().getConflictResolverMode(), - cctx.config().getConflictResolver()); + if (cctx.store().isLocalStore()) + return new GridCacheVersionConflictResolver(cctx.config().getConflictResolverMode(), + cctx.config().getConflictResolver()); + else + return null; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18cc3848/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 index 896d151..73056b4 100644 --- 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 @@ -51,7 +51,7 @@ public class GridCacheVersionConflictResolver extends GridCacheEntryAbstractConf if (mode == ALWAYS) { if (rslvr != null) { // Try falling back to user resolver. - rslvr.resolve(new DrReceiverCacheConflictContextImpl(ctx)); + rslvr.resolve(new CacheConflictContextImpl(ctx)); ctx.manualResolve(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18cc3848/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConflictResolverLocalStoreSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConflictResolverLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConflictResolverLocalStoreSelfTest.java index 608d616..2e8f0e6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConflictResolverLocalStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConflictResolverLocalStoreSelfTest.java @@ -36,7 +36,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CachePreloadMode.*; +import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** @@ -107,7 +107,7 @@ public class GridCacheConflictResolverLocalStoreSelfTest extends GridCommonAbstr cacheCfg.setAtomicityMode(CacheAtomicityMode.ATOMIC); cacheCfg.setDistributionMode(CacheDistributionMode.PARTITIONED_ONLY); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - cacheCfg.setPreloadMode(SYNC); + cacheCfg.setRebalanceMode(SYNC); if (gridName.endsWith("1")) cacheCfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory<CacheStore>(LOCAL_STORE_1));
