Repository: incubator-ignite Updated Branches: refs/heads/ignite-99-2 52033a952 -> 71b2f03c8
# sprint-1 Move classes to internal package Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/15cbff49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/15cbff49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/15cbff49 Branch: refs/heads/ignite-99-2 Commit: 15cbff49be0299f5992287f9a07e5f496c72ead3 Parents: 70678be Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 23 17:35:52 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 23 17:35:52 2015 +0300 ---------------------------------------------------------------------- .../datagrid/CacheTransactionExample.java | 2 +- .../examples/ScalarCacheQueryExample.scala | 3 +- .../client/impl/ClientCacheFlagsCodecTest.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 16 +-- .../apache/ignite/cache/CacheAtomicityMode.java | 2 +- .../apache/ignite/cache/CacheConfiguration.java | 8 +- .../org/apache/ignite/cache/CacheEntry.java | 12 +- .../java/org/apache/ignite/cache/CacheFlag.java | 110 ------------------- .../apache/ignite/cache/CacheFlagException.java | 67 ----------- .../cache/CachePartialUpdateException.java | 6 +- .../apache/ignite/cache/CacheProjection.java | 1 + .../java/org/apache/ignite/cache/GridCache.java | 2 +- .../apache/ignite/cache/cloner/CacheCloner.java | 2 +- .../internal/processors/cache/CacheFlag.java | 110 +++++++++++++++++++ .../processors/cache/CacheFlagException.java | 67 +++++++++++ .../CachePartialUpdateCheckedException.java | 64 +++++++++++ .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../processors/cache/GridCacheMvccManager.java | 3 +- .../processors/cache/GridCacheProjectionEx.java | 24 ++-- .../cache/GridCacheSharedContext.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../GridCacheDataStructuresManager.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 12 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../near/GridNearTransactionalCache.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 16 +-- .../GridCacheContinuousQueryEntry.java | 2 +- .../transactions/IgniteTransactionsImpl.java | 2 +- .../apache/ignite/transactions/IgniteTx.java | 2 +- .../GridCacheAbstractProjectionSelfTest.java | 4 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 1 + .../GridCachePartitionedProjectionSelfTest.java | 2 +- .../GridCacheReplicatedProjectionSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 3 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 2 +- 45 files changed, 329 insertions(+), 261 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java index b5b43e3..db61b22 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheTransactionExample.java @@ -23,7 +23,7 @@ import org.apache.ignite.transactions.*; import java.io.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala ---------------------------------------------------------------------- diff --git a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala index cda85d9..7a53588 100644 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCacheQueryExample.scala @@ -17,8 +17,9 @@ package org.apache.ignite.scalar.examples -import org.apache.ignite.cache.{CacheMode, CacheFlag, CacheProjection} +import org.apache.ignite.cache.{CacheMode, CacheProjection} import org.apache.ignite.cache.affinity.CacheAffinityKey +import org.apache.ignite.internal.processors.cache.CacheFlag import org.gridgain.scalar._ import scalar._ import org.apache.ignite.Ignite http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java index 7b3c862..b187c02 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/impl/ClientCacheFlagsCodecTest.java @@ -18,9 +18,9 @@ package org.apache.ignite.client.impl; import junit.framework.*; -import org.apache.ignite.cache.*; import org.apache.ignite.client.*; import org.apache.ignite.client.impl.connection.*; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.rest.handlers.cache.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java index 122fad2..d99ccc6 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java @@ -146,14 +146,14 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. * * @param key Key to store in cache. * @param val Value to be associated with the given key. * @return Previously contained value regardless of whether put happened or not. * @throws NullPointerException If either key or value are {@code null}. * @throws CacheException If put operation failed. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws org.apache.ignite.internal.processors.cache.CacheFlagException If projection flags validation failed. */ @Nullable public V getAndPutIfAbsent(K key, V val) throws CacheException; @@ -223,11 +223,11 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * participating in any locks or transactions). * <p> * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and - * {@link org.apache.ignite.cache.CacheFlag#SKIP_SWAP} is not enabled, the evicted entry will + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP} is not enabled, the evicted entry will * be swapped to offheap, and then to disk. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. * * @param keys Keys to evict. */ @@ -257,11 +257,11 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * This method is not transactional. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#SKIP_SWAP}, {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP}, {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. * * @param keys Keys to promote entries for. * @throws CacheException If promote failed. - * @throws org.apache.ignite.cache.CacheFlagException If flags validation failed. + * @throws org.apache.ignite.internal.processors.cache.CacheFlagException If flags validation failed. */ public void localPromote(Set<? extends K> keys) throws CacheException; @@ -270,7 +270,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * is not currently locked, and is not participating in a transaction. * <p> * If {@link CacheConfiguration#isSwapEnabled()} is set to {@code true} and - * {@link org.apache.ignite.cache.CacheFlag#SKIP_SWAP} is not enabled, the evicted entries will + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP} is not enabled, the evicted entries will * also be cleared from swap. * <p> * Note that this operation is local as it merely clears @@ -278,7 +278,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS * remote caches or from underlying persistent storage. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. * * @param keys Keys to clear. * @return {@code True} if entry was successfully cleared from cache, {@code false} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java index a2de8bf..66488a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheAtomicityMode.java @@ -49,7 +49,7 @@ public enum CacheAtomicityMode { * In addition to transactions and locking, one of the main differences in {@code ATOMIC} mode * is that bulk writes, such as {@code putAll(...)}, {@code removeAll(...)}, and {@code transformAll(...)} * methods, become simple batch operations which can partially fail. In case of partial - * failure {@link GridCachePartialUpdateException} will be thrown which will contain a list of keys + * failure {@link org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException} will be thrown which will contain a list of keys * for which the update failed. It is recommended that bulk writes are used whenever multiple keys * need to be inserted or updated in cache, as they reduce number of network trips and provide * better performance. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java index 00be379..ba33e74 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java @@ -1135,7 +1135,7 @@ public class CacheConfiguration extends MutableConfiguration { * swap is disabled which is defined via {@link #DFLT_SWAP_ENABLED} constant. * <p> * Note that this flag may be overridden for cache projection created with flag - * {@link CacheFlag#SKIP_SWAP}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP}. * * @return {@code True} if swap storage is enabled. */ @@ -1320,7 +1320,7 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Cloner to be used for cloning values that are returned to user only if {@link CacheFlag#CLONE} + * Cloner to be used for cloning values that are returned to user only if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} * is set on {@link CacheProjection}. Cloning values is useful when it is needed to get value from * cache, change it and put it back (if the value was not cloned, then user would be updating the * cached reference which would violate cache integrity). @@ -1331,7 +1331,7 @@ public class CacheConfiguration extends MutableConfiguration { * regardless of the {@link Cloneable} interface. If none of the above cloners fit your * logic, you can also provide your own implementation of {@link org.apache.ignite.cache.cloner.CacheCloner} interface. * - * @return Cloner to be used if {@link CacheFlag#CLONE} flag is set on cache projection. + * @return Cloner to be used if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} flag is set on cache projection. */ @SuppressWarnings({"unchecked"}) public CacheCloner getCloner() { @@ -1339,7 +1339,7 @@ public class CacheConfiguration extends MutableConfiguration { } /** - * Sets cloner to be used if {@link CacheFlag#CLONE} flag is set on projection. + * Sets cloner to be used if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} flag is set on projection. * * @param cloner Cloner to use. * @see #getCloner() http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java index 575c2ee..12ff0f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntry.java @@ -473,7 +473,7 @@ public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Ent * which will acquire explicit locks for relevant cache operations. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. * * @param timeout Timeout in milliseconds to wait for lock to be acquired * ({@code '0'} for no expiration). @@ -481,7 +481,7 @@ public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Ent * @return {@code True} if all filters passed and lock was acquired, * {@code false} otherwise. * @throws IgniteCheckedException If lock acquisition resulted in error. - * @throws CacheFlagException If flags validation failed. + * @throws org.apache.ignite.internal.processors.cache.CacheFlagException If flags validation failed. */ public boolean lock(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; @@ -497,7 +497,7 @@ public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Ent * which will acquire explicit locks for relevant cache operations. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. * * @param timeout Timeout in milliseconds to wait for lock to be acquired * ({@code '0'} for no expiration). @@ -505,7 +505,7 @@ public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Ent * @return Future for the lock operation. The future will return {@code true} * whenever all filters pass and locks are acquired before timeout is expired, * {@code false} otherwise. - * @throws CacheFlagException If flags validation failed. + * @throws org.apache.ignite.internal.processors.cache.CacheFlagException If flags validation failed. */ public IgniteFuture<Boolean> lockAsync(long timeout, @Nullable IgnitePredicate<CacheEntry<K, V>>... filter); @@ -521,11 +521,11 @@ public interface CacheEntry<K, V> extends Map.Entry<K, V>, javax.cache.Cache.Ent * which will acquire explicit locks for relevant cache operations. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.internal.processors.cache.CacheFlag#READ}. * * @param filter Optional filter that needs to pass prior to unlock taking effect. * @throws IgniteCheckedException If unlock execution resulted in error. - * @throws CacheFlagException If flags validation failed. + * @throws org.apache.ignite.internal.processors.cache.CacheFlagException If flags validation failed. */ public void unlock(IgnitePredicate<CacheEntry<K, V>>... filter) throws IgniteCheckedException; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java deleted file mode 100644 index ed74b7d..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheFlag.java +++ /dev/null @@ -1,110 +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.cache; - -import org.apache.ignite.*; -import org.apache.ignite.transactions.*; -import org.jetbrains.annotations.*; - -import javax.cache.processor.*; - -/** - * Cache projection flags that specify projection behaviour. This flags can be explicitly passed into - * the following methods on {@link CacheProjection}: - * <ul> - * <li>{@link CacheProjection#flagsOn(CacheFlag...)}</li> - * <li>{@link CacheProjection#flagsOff(CacheFlag...)}</li> - * </ul> - * Also, some flags, like {@link #LOCAL}, or {@link #READ} may be implicitly set whenever - * creating new projections and passing entries to predicate filters. - */ -public enum CacheFlag { - /** - * Only operations that don't require any communication with - * other cache nodes are allowed. This flag is automatically set - * on underlying projection for all the entries that are given to - * predicate filters to make sure that no distribution happens - * from inside of predicate evaluation. - */ - LOCAL, - - /** - * Only operations that don't change cached data are allowed. - * This flag is automatically set on underlying projection for - * all the entries that are given to predicate filters to make - * sure that data cannot be updated during predicate evaluation. - */ - READ, - - /** - * Clone values prior to returning them to user. - * <p> - * Whenever values are returned from cache, they cannot be directly updated - * as cache holds the same references internally. If it is needed to - * update values that are returned from cache, this flag will provide - * automatic cloning of values prior to returning so they can be directly - * updated. - * - * @see CacheConfiguration#getCloner() - */ - CLONE, - - /** Skips store, i.e. no read-through and no write-through behavior. */ - SKIP_STORE, - - /** Skip swap space for reads and writes. */ - SKIP_SWAP, - - /** Synchronous commit. */ - SYNC_COMMIT, - - /** - * Switches a cache projection to work in {@code 'invalidation'} mode. - * Instead of updating remote entries with new values, small invalidation - * messages will be sent to set the values to {@code null}. - * - * @see IgniteTx#isInvalidate() - * @see CacheConfiguration#isInvalidate() - */ - INVALIDATE, - - /** - * Skips version check during {@link IgniteCache#invoke(Object, EntryProcessor, Object[])} writes in - * {@link CacheAtomicityMode#ATOMIC} mode. By default, in {@code ATOMIC} mode, whenever - * {@code transform(...)} is called, cache values (and not the {@code transform} closure) are sent from primary - * node to backup nodes to ensure proper update ordering. - * <p> - * By setting this flag, version check is skipped, and the {@code transform} closure is applied on both, primary - * and backup nodes. Use this flag for better performance if you are sure that there are no - * concurrent updates happening for the same key when {@code transform(...)} method is called. - */ - FORCE_TRANSFORM_BACKUP; - - /** */ - private static final CacheFlag[] VALS = values(); - - /** - * Efficiently gets enumerated value from its ordinal. - * - * @param ord Ordinal value. - * @return Enumerated value or {@code null} if ordinal out of range. - */ - @Nullable public static CacheFlag fromOrdinal(int ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/CacheFlagException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheFlagException.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheFlagException.java deleted file mode 100644 index 014d4dd..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheFlagException.java +++ /dev/null @@ -1,67 +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.cache; - -import org.apache.ignite.*; -import org.apache.ignite.internal.util.typedef.*; -import org.jetbrains.annotations.*; - -import java.util.*; - -/** - * Exception thrown when projection flags check fails. - */ -public class CacheFlagException extends IgniteException { - /** */ - private static final long serialVersionUID = 0L; - - /** Flags that caused this exception. */ - private Collection<CacheFlag> flags; - - /** - * @param flags Cause flags. - */ - public CacheFlagException(@Nullable CacheFlag... flags) { - this(F.asList(flags)); - } - - /** - * @param flags Cause flags. - */ - public CacheFlagException(@Nullable Collection<CacheFlag> flags) { - super(message(flags)); - - this.flags = flags; - } - - /** - * @return Cause flags. - */ - public Collection<CacheFlag> flags() { - return flags; - } - - /** - * @param flags Flags. - * @return String information about cause flags. - */ - private static String message(Collection<CacheFlag> flags) { - return "Cache projection flag violation (if flag is LOCAL, make sure to use peek(..) " + - "instead of get(..) methods)" + (F.isEmpty(flags) ? "." : " [flags=" + flags + ']'); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java index cdaeb05..cab473f 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java @@ -17,6 +17,8 @@ package org.apache.ignite.cache; +import org.apache.ignite.internal.processors.cache.*; + import javax.cache.*; import java.util.*; @@ -28,7 +30,7 @@ public class CachePartialUpdateException extends CacheException { /** * @param e Cause. */ - public CachePartialUpdateException(GridCachePartialUpdateException e) { + public CachePartialUpdateException(CachePartialUpdateCheckedException e) { super(e.getMessage(), e); } @@ -37,6 +39,6 @@ public class CachePartialUpdateException extends CacheException { * @return Collection of failed keys. */ public <K> Collection<K> failedKeys() { - return ((GridCachePartialUpdateException)getCause()).failedKeys(); + return ((CachePartialUpdateCheckedException)getCause()).failedKeys(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java index ba3c43e..13f389d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.cache.store.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.lang.*; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java index d86b221..38b79bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java @@ -163,7 +163,7 @@ public interface GridCache<K, V> extends CacheProjection<K, V> { * {@link #removex(Object, org.apache.ignite.lang.IgnitePredicate[])} method. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link CacheFlag#SKIP_SWAP}. + * {@link org.apache.ignite.internal.processors.cache.CacheFlag#SKIP_SWAP}. * * @return Iterator over keys. * @throws IgniteCheckedException If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java b/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java index 91b6264..e11ec01 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/cloner/CacheCloner.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.*; /** * Cache cloner which clones cached values before returning them from cache. - * It will only be used if {@link org.apache.ignite.cache.CacheFlag#CLONE} flag is set + * It will only be used if {@link org.apache.ignite.internal.processors.cache.CacheFlag#CLONE} flag is set * on projection which the user is working with (this flag is disabled * by default). * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java new file mode 100644 index 0000000..36644ca --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java @@ -0,0 +1,110 @@ +/* + * 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.*; +import org.apache.ignite.transactions.*; +import org.jetbrains.annotations.*; + +import javax.cache.processor.*; + +/** + * Cache projection flags that specify projection behaviour. This flags can be explicitly passed into + * the following methods on {@link org.apache.ignite.cache.CacheProjection}: + * <ul> + * <li>{@link org.apache.ignite.cache.CacheProjection#flagsOn(CacheFlag...)}</li> + * <li>{@link org.apache.ignite.cache.CacheProjection#flagsOff(CacheFlag...)}</li> + * </ul> + * Also, some flags, like {@link #LOCAL}, or {@link #READ} may be implicitly set whenever + * creating new projections and passing entries to predicate filters. + */ +public enum CacheFlag { + /** + * Only operations that don't require any communication with + * other cache nodes are allowed. This flag is automatically set + * on underlying projection for all the entries that are given to + * predicate filters to make sure that no distribution happens + * from inside of predicate evaluation. + */ + LOCAL, + + /** + * Only operations that don't change cached data are allowed. + * This flag is automatically set on underlying projection for + * all the entries that are given to predicate filters to make + * sure that data cannot be updated during predicate evaluation. + */ + READ, + + /** + * Clone values prior to returning them to user. + * <p> + * Whenever values are returned from cache, they cannot be directly updated + * as cache holds the same references internally. If it is needed to + * update values that are returned from cache, this flag will provide + * automatic cloning of values prior to returning so they can be directly + * updated. + * + * @see org.apache.ignite.cache.CacheConfiguration#getCloner() + */ + CLONE, + + /** Skips store, i.e. no read-through and no write-through behavior. */ + SKIP_STORE, + + /** Skip swap space for reads and writes. */ + SKIP_SWAP, + + /** Synchronous commit. */ + SYNC_COMMIT, + + /** + * Switches a cache projection to work in {@code 'invalidation'} mode. + * Instead of updating remote entries with new values, small invalidation + * messages will be sent to set the values to {@code null}. + * + * @see IgniteTx#isInvalidate() + * @see org.apache.ignite.cache.CacheConfiguration#isInvalidate() + */ + INVALIDATE, + + /** + * Skips version check during {@link IgniteCache#invoke(Object, EntryProcessor, Object[])} writes in + * {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC} mode. By default, in {@code ATOMIC} mode, whenever + * {@code transform(...)} is called, cache values (and not the {@code transform} closure) are sent from primary + * node to backup nodes to ensure proper update ordering. + * <p> + * By setting this flag, version check is skipped, and the {@code transform} closure is applied on both, primary + * and backup nodes. Use this flag for better performance if you are sure that there are no + * concurrent updates happening for the same key when {@code transform(...)} method is called. + */ + FORCE_TRANSFORM_BACKUP; + + /** */ + private static final CacheFlag[] VALS = values(); + + /** + * Efficiently gets enumerated value from its ordinal. + * + * @param ord Ordinal value. + * @return Enumerated value or {@code null} if ordinal out of range. + */ + @Nullable public static CacheFlag fromOrdinal(int ord) { + return ord >= 0 && ord < VALS.length ? VALS[ord] : null; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlagException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlagException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlagException.java new file mode 100644 index 0000000..feac108 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlagException.java @@ -0,0 +1,67 @@ +/* + * 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.*; +import org.apache.ignite.internal.util.typedef.*; +import org.jetbrains.annotations.*; + +import java.util.*; + +/** + * Exception thrown when projection flags check fails. + */ +public class CacheFlagException extends IgniteException { + /** */ + private static final long serialVersionUID = 0L; + + /** Flags that caused this exception. */ + private Collection<CacheFlag> flags; + + /** + * @param flags Cause flags. + */ + public CacheFlagException(@Nullable CacheFlag... flags) { + this(F.asList(flags)); + } + + /** + * @param flags Cause flags. + */ + public CacheFlagException(@Nullable Collection<CacheFlag> flags) { + super(message(flags)); + + this.flags = flags; + } + + /** + * @return Cause flags. + */ + public Collection<CacheFlag> flags() { + return flags; + } + + /** + * @param flags Flags. + * @return String information about cause flags. + */ + private static String message(Collection<CacheFlag> flags) { + return "Cache projection flag violation (if flag is LOCAL, make sure to use peek(..) " + + "instead of get(..) methods)" + (F.isEmpty(flags) ? "." : " [flags=" + flags + ']'); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.java new file mode 100644 index 0000000..0272b7c --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CachePartialUpdateCheckedException.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.*; + +import java.util.*; + +/** + * Exception thrown from non-transactional cache in case when update succeeded only partially. + * One can get list of keys for which update failed with method {@link #failedKeys()}. + */ +public class CachePartialUpdateCheckedException extends IgniteCheckedException { + /** */ + private static final long serialVersionUID = 0L; + + /** Failed keys. */ + private final Collection<Object> failedKeys = new ArrayList<>(); + + /** + * @param msg Error message. + */ + public CachePartialUpdateCheckedException(String msg) { + super(msg); + } + + /** + * Gets collection of failed keys. + * @return Collection of failed keys. + */ + public <K> Collection<K> failedKeys() { + return (Collection<K>)failedKeys; + } + + /** + * @param failedKeys Failed keys. + * @param err Error. + */ + public void add(Collection<?> failedKeys, Throwable err) { + this.failedKeys.addAll(failedKeys); + + addSuppressed(err); + } + + /** {@inheritDoc} */ + @Override public String getMessage() { + return super.getMessage() + ": " + failedKeys; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index a6f8301..112483a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -59,7 +59,7 @@ import java.util.concurrent.locks.*; import static java.util.Collections.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java index 0088f25..7c4b044 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java @@ -34,7 +34,7 @@ import java.util.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; /** * Concurrent implementation of cache map. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/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 14b2b81..567d0bb 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 @@ -61,7 +61,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheMemoryMode.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; @@ -1239,7 +1239,7 @@ public class GridCacheContext<K, V> implements Externalizable { } /** - * Clones cached object depending on whether or not {@link org.apache.ignite.cache.CacheFlag#CLONE} flag + * Clones cached object depending on whether or not {@link CacheFlag#CLONE} flag * is set thread locally. * * @param obj Object to clone. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 88e563d..5972041 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -43,7 +43,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxState.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java index bf46488..f7d149f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManager.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.processors.cache.distributed.*; @@ -937,7 +936,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K, public IgniteFuture<?> finishAtomicUpdates(long topVer) { GridCompoundFuture<Object, Object> res = new GridCompoundFuture<>(cctx.kernalContext()); - res.ignoreChildFailures(ClusterTopologyException.class, GridCachePartialUpdateException.class); + res.ignoreChildFailures(ClusterTopologyException.class, CachePartialUpdateCheckedException.class); for (GridCacheAtomicFuture<K, ?> fut : atomicFuts.values()) { if (fut.waitForPartitionExchange() && fut.topologyVersion() < topVer) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java index b23a71e..b727c7b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java @@ -108,7 +108,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * * @param drMap DR map. * @throws IgniteCheckedException If put operation failed. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public void putAllDr(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException; @@ -118,7 +118,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param drMap DR map. * @return Future. * @throws IgniteCheckedException If put operation failed. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public IgniteFuture<?> putAllDrAsync(Map<? extends K, GridCacheDrInfo<V>> drMap) throws IgniteCheckedException; @@ -150,7 +150,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * * @param drMap DR map. * @throws IgniteCheckedException If remove failed. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public void removeAllDr(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException; @@ -160,7 +160,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @param drMap DR map. * @return Future. * @throws IgniteCheckedException If remove failed. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public IgniteFuture<?> removeAllDrAsync(Map<? extends K, GridCacheVersion> drMap) throws IgniteCheckedException; @@ -200,7 +200,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}. * * @param key Key to store in cache. * @param oldVal Old value to match. @@ -208,7 +208,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @return Future for the replace operation. The future will return object containing actual old value and success * flag. * @throws NullPointerException If either key or value are {@code null}. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public IgniteFuture<GridCacheReturn<V>> replacexAsync(K key, V oldVal, V newVal); @@ -225,7 +225,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}. * * @param key Key to store in cache. * @param oldVal Old value to match. @@ -233,7 +233,7 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * @return Object containing actual old value and success flag. * @throws NullPointerException If either key or value are {@code null}. * @throws IgniteCheckedException If replace operation failed. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public GridCacheReturn<V> replacex(K key, V oldVal, V newVal) throws IgniteCheckedException; @@ -247,14 +247,14 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}. * * @param key Key whose mapping is to be removed from cache. * @param val Value to match against currently cached value. * @return Object containing actual old value and success flag. * @throws NullPointerException if the key or value is {@code null}. * @throws IgniteCheckedException If remove failed. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public GridCacheReturn<V> removex(K key, V val) throws IgniteCheckedException; @@ -271,14 +271,14 @@ public interface GridCacheProjectionEx<K, V> extends CacheProjection<K, V> { * if there is one. * <h2 class="header">Cache Flags</h2> * This method is not available if any of the following flags are set on projection: - * {@link org.apache.ignite.cache.CacheFlag#LOCAL}, {@link org.apache.ignite.cache.CacheFlag#READ}. + * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}. * * @param key Key whose mapping is to be removed from cache. * @param val Value to match against currently cached value. * @return Future for the remove operation. The future will return object containing actual old value and success * flag. * @throws NullPointerException if the key or value is {@code null}. - * @throws org.apache.ignite.cache.CacheFlagException If projection flags validation failed. + * @throws CacheFlagException If projection flags validation failed. */ public IgniteFuture<GridCacheReturn<V>> removexAsync(K key, V val); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index 05ef44e..6e818ed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; @@ -37,7 +36,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; /** * Shared context. @@ -417,7 +416,7 @@ public class GridCacheSharedContext<K, V> { /** * @param flags Flags to turn on. - * @throws org.apache.ignite.cache.CacheFlagException If given flags are conflicting with given transaction. + * @throws CacheFlagException If given flags are conflicting with given transaction. */ public void checkTxFlags(@Nullable Collection<CacheFlag> flags) throws CacheFlagException { IgniteTxEx tx = tm().userTxx(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 68531f1..b9265a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -959,8 +959,8 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements * @return Cache exception. */ private CacheException cacheException(IgniteCheckedException e) { - if (e instanceof GridCachePartialUpdateException) - return new CachePartialUpdateException((GridCachePartialUpdateException)e); + if (e instanceof CachePartialUpdateCheckedException) + return new CachePartialUpdateException((CachePartialUpdateCheckedException)e); if (e.getCause() instanceof CacheException) return (CacheException)e.getCause(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java index c0fa767..d49ea9f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheDataStructuresManager.java @@ -41,7 +41,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; @@ -1332,7 +1332,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager catch (ClusterGroupEmptyException e) { throw new IgniteException(e); } - catch (IgniteTxRollbackException | GridCachePartialUpdateException | ClusterTopologyException e) { + catch (IgniteTxRollbackException | CachePartialUpdateCheckedException | ClusterTopologyException e) { if (cnt++ == MAX_UPDATE_RETRIES) throw e; else { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 405e29c..b582799 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -40,7 +40,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; @@ -93,7 +93,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> private final ConcurrentMap<UUID, GridNearAtomicUpdateRequest<K, V>> mappings; /** Error. */ - private volatile GridCachePartialUpdateException err; + private volatile CachePartialUpdateCheckedException err; /** Operation result. */ private volatile GridCacheReturn<Object> opRes; @@ -472,7 +472,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> */ private synchronized void checkComplete() { if ((syncMode == FULL_ASYNC && cctx.config().getAtomicWriteOrderMode() == PRIMARY) || mappings.isEmpty()) { - GridCachePartialUpdateException err0 = err; + CachePartialUpdateCheckedException err0 = err; if (err0 != null) onDone(err0); @@ -867,13 +867,13 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> /** * @param failedKeys Failed keys. * @param err Error cause. - * @return Root {@link GridCachePartialUpdateException}. + * @return Root {@link org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException}. */ private synchronized IgniteCheckedException addFailedKeys(Collection<K> failedKeys, Throwable err) { - GridCachePartialUpdateException err0 = this.err; + CachePartialUpdateCheckedException err0 = this.err; if (err0 == null) - err0 = this.err = new GridCachePartialUpdateException("Failed to update keys (retry update if possible)."); + err0 = this.err = new CachePartialUpdateCheckedException("Failed to update keys (retry update if possible)."); err0.add(failedKeys, err); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 0c01c6c..5873a3f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -37,7 +37,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.GridCachePeekMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index 4ad049a..d25225f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -38,7 +38,7 @@ import java.io.*; import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; import static org.apache.ignite.internal.processors.dr.GridDrType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 25718fc..689f965 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -34,7 +34,7 @@ import javax.cache.expiry.*; import java.io.*; import java.util.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 9a14def..9942e68 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.*; import java.io.*; import java.util.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 6109196..f7d0e0a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -39,7 +39,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; /** @@ -882,7 +882,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { IgniteBiTuple<Boolean, ?> res = null; - GridCachePartialUpdateException err = null; + CachePartialUpdateCheckedException err = null; boolean intercept = ctx.config().getInterceptor() != null; @@ -980,7 +980,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { * @param filter Optional filter. * @param subjId Subject ID. * @param taskName Task name. - * @throws GridCachePartialUpdateException If update failed. + * @throws org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException If update failed. * @return Results map for invoke operation. */ @SuppressWarnings({"ForLoopReplaceableByForEach", "unchecked"}) @@ -1009,7 +1009,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { List<GridCacheEntryEx<K, V>> filtered = new ArrayList<>(size); - GridCachePartialUpdateException err = null; + CachePartialUpdateCheckedException err = null; Iterator<?> valsIter = vals != null ? vals.iterator() : null; @@ -1257,13 +1257,13 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { * @return Partial update exception. */ @SuppressWarnings({"unchecked", "ConstantConditions", "ForLoopReplaceableByForEach"}) - @Nullable private GridCachePartialUpdateException updatePartialBatch( + @Nullable private CachePartialUpdateCheckedException updatePartialBatch( List<GridCacheEntryEx<K, V>> entries, final GridCacheVersion ver, @Nullable Map<K, V> putMap, @Nullable Collection<K> rmvKeys, @Nullable ExpiryPolicy expiryPlc, - @Nullable GridCachePartialUpdateException err, + @Nullable CachePartialUpdateCheckedException err, UUID subjId, String taskName ) { @@ -1419,8 +1419,8 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** * @return New partial update exception. */ - private static GridCachePartialUpdateException partialUpdateException() { - return new GridCachePartialUpdateException("Failed to update keys (retry update if possible)."); + private static CachePartialUpdateCheckedException partialUpdateException() { + return new CachePartialUpdateCheckedException("Failed to update keys (retry update if possible)."); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java index 601591f..f4084a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java @@ -34,7 +34,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.internal.processors.cache.GridCacheValueBytes.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java index 31008ca..32e11ea 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java index 289d91a..7beca55 100644 --- a/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java +++ b/modules/core/src/main/java/org/apache/ignite/transactions/IgniteTx.java @@ -69,7 +69,7 @@ import java.util.*; * message is sent without waiting for reply. If it is necessary to know whenever remote nodes have committed * as well, synchronous commit or synchronous rollback should be enabled via * {@link CacheConfiguration#setWriteSynchronizationMode} - * or by setting proper flags on cache projection, such as {@link org.apache.ignite.cache.CacheFlag#SYNC_COMMIT}. + * or by setting proper flags on cache projection, such as {@link org.apache.ignite.internal.processors.cache.CacheFlag#SYNC_COMMIT}. * <p> * Note that in this mode, optimistic failures are only possible in conjunction with * {@link IgniteTxIsolation#SERIALIZABLE} isolation level. In all other cases, optimistic http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java index 74dc817..6337339 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractProjectionSelfTest.java @@ -29,7 +29,7 @@ import java.util.concurrent.*; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; /** @@ -693,7 +693,7 @@ public abstract class GridCacheAbstractProjectionSelfTest extends GridCacheAbstr } /** - * Tests {@link org.apache.ignite.cache.CacheFlag#SKIP_SWAP} flag on multiple nodes. + * Tests {@link CacheFlag#SKIP_SWAP} flag on multiple nodes. * * @throws Exception If error occurs. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java index c38ae1c..7657842 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -28,7 +28,7 @@ import java.util.*; import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java index 6c4aa4a..fa12084 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java @@ -33,7 +33,7 @@ import java.util.concurrent.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java index 6b3f275..c5c0752 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java @@ -33,7 +33,7 @@ import org.apache.ignite.testframework.junits.common.*; import java.util.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index a4350e8..ffedc53 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -200,7 +200,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA cache.putAll(upd); } } - catch (GridCachePartialUpdateException ignored) { + catch (CachePartialUpdateCheckedException ignored) { // No-op. } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java index 488a3fd..41fb81d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java @@ -29,7 +29,7 @@ import java.io.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; /** * Tests cache value consistency for ATOMIC mode. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java index 19b947a..5e14bc7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxMultiNodeSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.cache.affinity.*; import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.transactions.*; import org.apache.ignite.internal.processors.cache.distributed.dht.*; import org.apache.ignite.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java index 3f4feb1..29c4005 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedProjectionSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.internal.util.typedef.*; import java.util.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; import static org.apache.ignite.cache.CacheMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java index 93057f0..53f0902 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedProjectionSelfTest.java @@ -21,7 +21,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.internal.processors.cache.*; import static org.apache.ignite.cache.CacheMode.*; -import static org.apache.ignite.cache.CacheFlag.*; +import static org.apache.ignite.internal.processors.cache.CacheFlag.*; /** * Projection tests for replicated cache. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 5a5beae..a3d69c5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -26,6 +26,7 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.apache.ignite.marshaller.optimized.*; @@ -145,7 +146,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo break; } - catch (GridCachePartialUpdateException e) { + catch (CachePartialUpdateCheckedException e) { if (j == 4) throw new Exception("Failed to clear cache for grid: " + i, e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/15cbff49/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java index abb0420..2b694b9 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridAbstractMultinodeRedeployTest.java @@ -39,7 +39,7 @@ abstract class GridAbstractMultinodeRedeployTest extends GridCommonAbstractTest private IgniteDeploymentMode depMode; /** */ - private static final String TASK_NAME = "org.gridgain.grid.tests.p2p.GridP2PTestTaskExternalPath1"; + private static final String TASK_NAME = "org.apache.ignite.tests.p2p.P2PTestTaskExternalPath1"; /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
