http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java new file mode 100644 index 0000000..04c83a5 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheMode.java @@ -0,0 +1,73 @@ +/* + * 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.jetbrains.annotations.*; + +/** + * Enumeration of all supported caching modes. Cache mode is specified in {@link CacheConfiguration} + * and cannot be changed after cache has started. + */ +public enum CacheMode { + /** + * Specifies local-only cache behaviour. In this mode caches residing on + * different grid nodes will not know about each other. + * <p> + * Other than distribution, {@code local} caches still have all + * the caching features, such as eviction, expiration, swapping, + * querying, etc... This mode is very useful when caching read-only data + * or data that automatically expires at a certain interval and + * then automatically reloaded from persistence store. + */ + LOCAL, + + /** + * Specifies fully replicated cache behavior. In this mode all the keys are distributed + * to all participating nodes. User still has affinity control + * over subset of nodes for any given key via {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} + * configuration. + */ + REPLICATED, + + /** + * Specifies partitioned cache behaviour. In this mode the overall + * key set will be divided into partitions and all partitions will be split + * equally between participating nodes. User has affinity + * control over key assignment via {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} + * configuration. + * <p> + * Note that partitioned cache is always fronted by local + * {@code 'near'} cache which stores most recent data. You + * can configure the size of near cache via {@link CacheConfiguration#getNearEvictionPolicy()} + * configuration property. + */ + PARTITIONED; + + /** Enumerated values. */ + private static final CacheMode[] 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 CacheMode fromOrdinal(int ord) { + return ord >= 0 && ord < VALS.length ? VALS[ord] : null; + } +}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java index 1af69fd..9ea530a 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePeekMode.java @@ -42,7 +42,7 @@ public enum CachePeekMode { /** * Peek into near cache only (don't peek into partitioned cache). - * In case of {@link org.apache.ignite.cache.GridCacheMode#LOCAL} cache, behaves as {@link #ALL} mode. + * In case of {@link CacheMode#LOCAL} cache, behaves as {@link #ALL} mode. */ NEAR, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 3c099ff..3a070d4 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 @@ -256,7 +256,7 @@ public interface GridCache<K, V> extends GridCacheProjection<K, V> { * preloading until the node topology is stable to make sure that no redundant re-partitioning * happens. * <p> - * In case of{@link GridCacheMode#PARTITIONED} caches, for better efficiency user should + * In case of{@link CacheMode#PARTITIONED} caches, for better efficiency user should * usually make sure that new nodes get placed on the same place of consistent hash ring as * the left nodes, and that nodes are restarted before * {@link CacheConfiguration#getPreloadPartitionedDelay() preloadDelay} expires. To place nodes http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicUpdateTimeoutException.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicUpdateTimeoutException.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicUpdateTimeoutException.java deleted file mode 100644 index f43954a..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicUpdateTimeoutException.java +++ /dev/null @@ -1,47 +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.*; - -/** - * Exception thrown when atomic operation timeout occurs. - */ -public class GridCacheAtomicUpdateTimeoutException extends IgniteCheckedException { - /** */ - private static final long serialVersionUID = 0L; - - /** - * Creates new timeout exception with given error message. - * - * @param msg Error message. - */ - public GridCacheAtomicUpdateTimeoutException(String msg) { - super(msg); - } - - /** - * Creates new timeout exception with given error message and optional nested exception. - * - * @param msg Error message. - * @param cause Optional nested exception (can be <tt>null</tt>). - */ - public GridCacheAtomicUpdateTimeoutException(String msg, Throwable cause) { - super(msg, cause); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicWriteOrderMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicWriteOrderMode.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicWriteOrderMode.java deleted file mode 100644 index f258145..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicWriteOrderMode.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.cache; - -import org.jetbrains.annotations.*; - -/** - * Cache write ordering mode. This enumeration is taken into account only in {@link GridCacheAtomicityMode#ATOMIC} - * atomicity mode. Write ordering mode determines which node assigns the write version, sender or the primary node. - * <p> - * For example, {@link #CLOCK} mode assigns write versions on a sender node which generally leads to better - * performance in {@link GridCacheWriteSynchronizationMode#FULL_SYNC} synchronization mode, since in this case - * sender can send write requests to primary and backups at the same time. Otherwise, if ordering mode is - * {@link #PRIMARY}, it would only send request to primary node, which in turn will assign write version - * and forward it to backups. - * <p> - * {@link #CLOCK} mode will be automatically configured only with {@link GridCacheWriteSynchronizationMode#FULL_SYNC} - * write synchronization mode, as for other synchronization modes it does not render better performance. - */ -public enum GridCacheAtomicWriteOrderMode { - /** - * In this mode, write versions are assigned on a sender node which generally leads to better - * performance in {@link GridCacheWriteSynchronizationMode#FULL_SYNC} synchronization mode, since in this case - * sender can send write requests to primary and backups at the same time. - * <p> - * This mode will be automatically configured only with {@link GridCacheWriteSynchronizationMode#FULL_SYNC} - * write synchronization mode, as for other synchronization modes it does not render better performance. - */ - CLOCK, - - /** - * Cache version is assigned only on primary node. This means that sender will only send write request - * to primary node, which in turn will assign write version and forward it to backups. - */ - PRIMARY; - - /** Enumerated values. */ - private static final GridCacheAtomicWriteOrderMode[] 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 GridCacheAtomicWriteOrderMode fromOrdinal(byte ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicityMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicityMode.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicityMode.java deleted file mode 100644 index 8075b85..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheAtomicityMode.java +++ /dev/null @@ -1,79 +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.transactions.*; -import org.jetbrains.annotations.*; - -/** - * Cache atomicity mode controls whether cache should maintain fully transactional semantics - * or more light-weight atomic behavior. It is recommended that {@link #ATOMIC} mode is - * used whenever transactions and explicit locking are not needed. Note that in {@link #ATOMIC} - * mode cache will still maintain full data consistency across all cache nodes. - * <p> - * Cache atomicity may be set via {@link CacheConfiguration#getAtomicityMode()} - * configuration property. - */ -public enum GridCacheAtomicityMode { - /** - * Specified fully {@code ACID}-compliant transactional cache behavior. See - * {@link IgniteTx} for more information about transactions. - * <p> - * This mode is currently the default cache atomicity mode. However, cache - * atomicity mode will be changed to {@link #ATOMIC} starting from version {@code 5.2}, - * so it is recommended that desired atomicity mode is explicitly configured - * instead of relying on default value. - */ - TRANSACTIONAL, - - /** - * Specifies atomic-only cache behaviour. In this mode distributed transactions and distributed - * locking are not supported. Disabling transactions and locking allows to achieve much higher - * performance and throughput ratios. - * <p> - * 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 - * 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. - * <p> - * Note that even without locking and transactions, {@code ATOMIC} mode still provides - * full consistency guarantees across all cache nodes. - * <p> - * Also note that all data modifications in {@code ATOMIC} mode are guaranteed to be atomic - * and consistent with writes to the underlying persistent store, if one is configured. - * <p> - * This mode is currently implemented for {@link GridCacheMode#PARTITIONED} caches only. - */ - ATOMIC; - - /** Enumerated values. */ - private static final GridCacheAtomicityMode[] 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 GridCacheAtomicityMode fromOrdinal(int ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCacheFlag.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheFlag.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheFlag.java index 642c8b5..f8f9ca9 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheFlag.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheFlag.java @@ -18,7 +18,6 @@ package org.apache.ignite.cache; import org.apache.ignite.*; -import org.apache.ignite.cache.CacheConfiguration; import org.apache.ignite.transactions.*; import org.jetbrains.annotations.*; @@ -86,7 +85,7 @@ public enum GridCacheFlag { /** * Skips version check during {@link IgniteCache#invoke(Object, EntryProcessor, Object[])} writes in - * {@link GridCacheAtomicityMode#ATOMIC} mode. By default, in {@code ATOMIC} mode, whenever + * {@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> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCacheMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheMode.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheMode.java deleted file mode 100644 index 27fc454..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheMode.java +++ /dev/null @@ -1,73 +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.jetbrains.annotations.*; - -/** - * Enumeration of all supported caching modes. Cache mode is specified in {@link CacheConfiguration} - * and cannot be changed after cache has started. - */ -public enum GridCacheMode { - /** - * Specifies local-only cache behaviour. In this mode caches residing on - * different grid nodes will not know about each other. - * <p> - * Other than distribution, {@code local} caches still have all - * the caching features, such as eviction, expiration, swapping, - * querying, etc... This mode is very useful when caching read-only data - * or data that automatically expires at a certain interval and - * then automatically reloaded from persistence store. - */ - LOCAL, - - /** - * Specifies fully replicated cache behavior. In this mode all the keys are distributed - * to all participating nodes. User still has affinity control - * over subset of nodes for any given key via {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} - * configuration. - */ - REPLICATED, - - /** - * Specifies partitioned cache behaviour. In this mode the overall - * key set will be divided into partitions and all partitions will be split - * equally between participating nodes. User has affinity - * control over key assignment via {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction} - * configuration. - * <p> - * Note that partitioned cache is always fronted by local - * {@code 'near'} cache which stores most recent data. You - * can configure the size of near cache via {@link CacheConfiguration#getNearEvictionPolicy()} - * configuration property. - */ - PARTITIONED; - - /** Enumerated values. */ - private static final GridCacheMode[] 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 GridCacheMode fromOrdinal(int ord) { - return ord >= 0 && ord < VALS.length ? VALS[ord] : null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCachePeekMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCachePeekMode.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCachePeekMode.java index 225669f..a5d63e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCachePeekMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCachePeekMode.java @@ -58,14 +58,14 @@ public enum GridCachePeekMode { /** * Peek value from near cache only (don't peek from partitioned cache). - * In case of {@link GridCacheMode#LOCAL} or {@link GridCacheMode#REPLICATED} cache, + * In case of {@link CacheMode#LOCAL} or {@link CacheMode#REPLICATED} cache, * behaves as {@link #GLOBAL} mode. */ NEAR_ONLY, /** * Peek value from partitioned cache only (skip near cache). - * In case of {@link GridCacheMode#LOCAL} or {@link GridCacheMode#REPLICATED} cache, + * In case of {@link CacheMode#LOCAL} or {@link CacheMode#REPLICATED} cache, * behaves as {@link #GLOBAL} mode. */ PARTITIONED_ONLY; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCachePreloadMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCachePreloadMode.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCachePreloadMode.java index 4ee32d9..11aea17 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCachePreloadMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCachePreloadMode.java @@ -29,8 +29,8 @@ import org.jetbrains.annotations.*; * pluggable {@link org.apache.ignite.cache.affinity.GridCacheAffinityFunction}), while partitioned caches will only load the entries for which * current node is primary or back up. * <p> - * Note that preload mode only makes sense for {@link GridCacheMode#REPLICATED} and {@link GridCacheMode#PARTITIONED} - * caches. Caches with {@link GridCacheMode#LOCAL} mode are local by definition and therefore cannot preload + * Note that preload mode only makes sense for {@link CacheMode#REPLICATED} and {@link CacheMode#PARTITIONED} + * caches. Caches with {@link CacheMode#LOCAL} mode are local by definition and therefore cannot preload * any values from neighboring nodes. */ public enum GridCachePreloadMode { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCacheProjection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheProjection.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheProjection.java index 15977f3..d3a7517 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheProjection.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheProjection.java @@ -583,7 +583,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * be stored in cache only if they pass the filter. Note that filter check is atomic, * so value stored in cache is guaranteed to be consistent with the filters. If cache * previously contained value for the given key, then this value is returned. - * In case of {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} caches, + * In case of {@link CacheMode#PARTITIONED} or {@link CacheMode#REPLICATED} caches, * the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent @@ -620,9 +620,9 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * be stored in cache only if they pass the filter. Note that filter check is atomic, * so value stored in cache is guaranteed to be consistent with the filters. If cache * previously contained value for the given key, then this value is returned. Otherwise, - * in case of {@link GridCacheMode#REPLICATED} caches, the value will be loaded from swap + * in case of {@link CacheMode#REPLICATED} caches, the value will be loaded from swap * and, if it's not there, and read-through is allowed, from the underlying - * {@link CacheStore} storage. In case of {@link GridCacheMode#PARTITIONED} caches, + * {@link CacheStore} storage. In case of {@link CacheMode#PARTITIONED} caches, * the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap and read-through is allowed, * from the underlying persistent storage. If value has to be loaded from persistent @@ -717,7 +717,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Stores given key-value pair in cache only if cache had no previous mapping for it. If cache * previously contained value for the given key, then this value is returned. - * In case of {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} caches, + * In case of {@link CacheMode#PARTITIONED} or {@link CacheMode#REPLICATED} caches, * the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent @@ -748,7 +748,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Asynchronously stores given key-value pair in cache only if cache had no previous mapping for it. If cache * previously contained value for the given key, then this value is returned. In case of - * {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} caches, + * {@link CacheMode#PARTITIONED} or {@link CacheMode#REPLICATED} caches, * the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent @@ -829,7 +829,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Stores given key-value pair in cache only if there is a previous mapping for it. - * In case of {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} caches, + * In case of {@link CacheMode#PARTITIONED} or {@link CacheMode#REPLICATED} caches, * the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent @@ -860,7 +860,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Asynchronously stores given key-value pair in cache only if there is a previous mapping for it. If cache * previously contained value for the given key, then this value is returned.In case of - * {@link GridCacheMode#PARTITIONED} caches, the value will be loaded from the primary node, + * {@link CacheMode#PARTITIONED} caches, the value will be loaded from the primary node, * which in its turn may load the value from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent * storage, {@link CacheStore#load(IgniteTx, Object)} method will be used. @@ -1142,7 +1142,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * * @return New transaction * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart() throws IllegalStateException; @@ -1153,7 +1153,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * @param isolation Isolation. * @return New transaction. * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation); @@ -1167,7 +1167,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * @param txSize Number of entries participating in transaction (may be approximate). * @return New transaction. * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStart(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize); @@ -1203,7 +1203,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * @return Started transaction. * @throws IllegalStateException If transaction is already started by this thread. * @throws IgniteCheckedException If local node is not primary for any of provided keys. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStartAffinity(Object affinityKey, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException; @@ -1239,7 +1239,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * @return Started transaction. * @throws IllegalStateException If transaction is already started by this thread. * @throws IgniteCheckedException If local node is not primary for any of provided keys. - * @throws UnsupportedOperationException If cache is {@link GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStartPartition(int partId, IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize) throws IllegalStateException, IgniteCheckedException; @@ -1399,7 +1399,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Removes given key mapping from cache. If cache previously contained value for the given key, - * then this value is returned. In case of {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} + * then this value is returned. In case of {@link CacheMode#PARTITIONED} or {@link CacheMode#REPLICATED} * caches, the value will be loaded from the primary node, which in its turn may load the value * from the disk-based swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent @@ -1432,7 +1432,7 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> /** * Asynchronously removes given key mapping from cache. If cache previously contained value for the given key, - * then this value is returned. In case of {@link GridCacheMode#PARTITIONED} or {@link GridCacheMode#REPLICATED} + * then this value is returned. In case of {@link CacheMode#PARTITIONED} or {@link CacheMode#REPLICATED} * caches, the value will be loaded from the primary node, which in its turn may load the value * from the swap storage, and consecutively, if it's not in swap, * from the underlying persistent storage. If value has to be loaded from persistent @@ -1852,15 +1852,15 @@ public interface GridCacheProjection<K, V> extends Iterable<GridCacheEntry<K, V> * <p> * Note that for {@code LOCAL} non-distributed caches this method will always return {@code 0} * - * @return Size of near cache key set or {@code 0} if cache is not {@link GridCacheMode#PARTITIONED}. + * @return Size of near cache key set or {@code 0} if cache is not {@link CacheMode#PARTITIONED}. */ public int nearSize(); /** - * Gets the number of all primary entries cached on this node. For {@link GridCacheMode#LOCAL} non-distributed + * Gets the number of all primary entries cached on this node. For {@link CacheMode#LOCAL} non-distributed * cache mode, this method is identical to {@link #size()}. * <p> - * For {@link GridCacheMode#PARTITIONED} and {@link GridCacheMode#REPLICATED} modes, this method will + * For {@link CacheMode#PARTITIONED} and {@link CacheMode#REPLICATED} modes, this method will * return number of primary entries cached on this node (excluding any backups). The complexity of * this method is O(P), where P is the total number of partitions. * <p> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/GridCacheWriteSynchronizationMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheWriteSynchronizationMode.java b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheWriteSynchronizationMode.java index 389c980..4585ea9 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCacheWriteSynchronizationMode.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCacheWriteSynchronizationMode.java @@ -48,7 +48,7 @@ public enum GridCacheWriteSynchronizationMode { FULL_ASYNC, /** - * This flag only makes sense for {@link GridCacheMode#PARTITIONED} mode. When enabled, GridGain + * This flag only makes sense for {@link CacheMode#PARTITIONED} mode. When enabled, GridGain * will wait for write or commit to complete on {@code primary} node, but will not wait for * backups to be updated. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/affinity/GridCacheAffinityFunction.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/affinity/GridCacheAffinityFunction.java b/modules/core/src/main/java/org/apache/ignite/cache/affinity/GridCacheAffinityFunction.java index c33bcad..b57ea89 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/affinity/GridCacheAffinityFunction.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/affinity/GridCacheAffinityFunction.java @@ -36,9 +36,9 @@ import java.util.*; * On each topology change, partition-to-node mapping is calculated using * {@link #assignPartitions(GridCacheAffinityFunctionContext)} method, which assigns a collection * of nodes to each partition. - * This collection of nodes is used for node affinity. In {@link org.apache.ignite.cache.GridCacheMode#REPLICATED REPLICATED} + * This collection of nodes is used for node affinity. In {@link org.apache.ignite.cache.CacheMode#REPLICATED REPLICATED} * cache mode the key will be cached on all returned nodes; generally, all caching nodes - * participate in caching every key in replicated mode. In {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED PARTITIONED} + * participate in caching every key in replicated mode. In {@link org.apache.ignite.cache.CacheMode#PARTITIONED PARTITIONED} * mode, only primary and backup nodes are returned with primary node always in the * first position. So if there is {@code 1} backup node, then the returned collection will * have {@code 2} nodes in it - {@code primary} node in first position, and {@code backup} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java index 4cfd5d5..ccd5ddd 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/datastructures/GridCacheDataStructures.java @@ -78,7 +78,7 @@ public interface GridCacheDataStructures { * Will get a named queue from cache and create one if it has not been created yet and {@code create} flag * is {@code true}. * If queue is present in cache already, queue properties will not be changed. Use - * collocation for {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED} caches if you have lots of relatively + * collocation for {@link org.apache.ignite.cache.CacheMode#PARTITIONED} caches if you have lots of relatively * small queues as it will make fetching, querying, and iteration a lot faster. If you have * few very large queues, then you should consider turning off collocation as they simply * may not fit in a single node's memory. However note that in this case @@ -89,7 +89,7 @@ public interface GridCacheDataStructures { * @param collocated If {@code true} then all items within the same queue will be collocated on the same node. * Otherwise elements of the same queue maybe be cached on different nodes. If you have lots of relatively * small queues, then you should use collocation. If you have few large queues, then you should turn off - * collocation. This parameter works only for {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED} cache. + * collocation. This parameter works only for {@link org.apache.ignite.cache.CacheMode#PARTITIONED} cache. * @param create Boolean flag indicating whether data structure should be created if does not exist. * @return Queue with given properties. * @throws IgniteCheckedException If remove failed. @@ -130,7 +130,7 @@ public interface GridCacheDataStructures { * @param name Set name. * @param collocated If {@code true} then all items within the same set will be collocated on the same node. * Otherwise elements of the same set maybe be cached on different nodes. This parameter works only - * for {@link org.apache.ignite.cache.GridCacheMode#PARTITIONED} cache. + * for {@link org.apache.ignite.cache.CacheMode#PARTITIONED} cache. * @param create Flag indicating whether set should be created if does not exist. * @return Set with given properties. * @throws IgniteCheckedException If failed. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java index 3295229..254504b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheContinuousQuery.java @@ -30,8 +30,8 @@ import java.util.*; * Continuous queries are executed as follows: * <ol> * <li> - * Query is sent to requested grid nodes. Note that for {@link org.apache.ignite.cache.GridCacheMode#LOCAL LOCAL} - * and {@link org.apache.ignite.cache.GridCacheMode#REPLICATED REPLICATED} caches query will be always executed + * Query is sent to requested grid nodes. Note that for {@link org.apache.ignite.cache.CacheMode#LOCAL LOCAL} + * and {@link org.apache.ignite.cache.CacheMode#REPLICATED REPLICATED} caches query will be always executed * locally. * </li> * <li> @@ -304,8 +304,8 @@ public interface GridCacheContinuousQuery<K, V> extends AutoCloseable { * Note that if grid contains nodes without appropriate cache, * these nodes will be filtered out. * <p> - * Also note that for {@link org.apache.ignite.cache.GridCacheMode#LOCAL LOCAL} - * and {@link org.apache.ignite.cache.GridCacheMode#REPLICATED REPLICATED} caches + * Also note that for {@link org.apache.ignite.cache.CacheMode#LOCAL LOCAL} + * and {@link org.apache.ignite.cache.CacheMode#REPLICATED REPLICATED} caches * query will be always executed locally. * * @throws IgniteCheckedException In case of error. @@ -318,8 +318,8 @@ public interface GridCacheContinuousQuery<K, V> extends AutoCloseable { * Note that if provided projection contains nodes without * appropriate cache, these nodes will be filtered out. * <p> - * Also note that for {@link org.apache.ignite.cache.GridCacheMode#LOCAL LOCAL} - * and {@link org.apache.ignite.cache.GridCacheMode#REPLICATED REPLICATED} caches + * Also note that for {@link org.apache.ignite.cache.CacheMode#LOCAL LOCAL} + * and {@link org.apache.ignite.cache.CacheMode#REPLICATED REPLICATED} caches * query will be always executed locally. * * @param prj Grid projection. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java index b696c3f..7fddd46 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/GridCacheQuery.java @@ -81,7 +81,7 @@ import org.jetbrains.annotations.*; * <li> * Joins will work correctly only if joined objects are stored in * collocated mode or at least one side of the join is stored in - * {@link org.apache.ignite.cache.GridCacheMode#REPLICATED} cache. Refer to + * {@link org.apache.ignite.cache.CacheMode#REPLICATED} cache. Refer to * {@link org.apache.ignite.cache.affinity.GridCacheAffinityKey} javadoc for more information about colocation. * </li> * </ul> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/cache/query/QueryContinuousPredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryContinuousPredicate.java b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryContinuousPredicate.java index 7a2b0f0..b77589b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryContinuousPredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryContinuousPredicate.java @@ -28,8 +28,8 @@ import javax.cache.event.*; * Continuous queries are executed as follows: * <ol> * <li> - * Query is sent to requested grid nodes. Note that for {@link org.apache.ignite.cache.GridCacheMode#LOCAL LOCAL} - * and {@link org.apache.ignite.cache.GridCacheMode#REPLICATED REPLICATED} caches query will be always executed + * Query is sent to requested grid nodes. Note that for {@link org.apache.ignite.cache.CacheMode#LOCAL LOCAL} + * and {@link org.apache.ignite.cache.CacheMode#REPLICATED REPLICATED} caches query will be always executed * locally. * </li> * <li> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java index ae541fd..1db5076 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java @@ -81,9 +81,9 @@ import java.util.logging.*; import static org.apache.ignite.configuration.IgniteConfiguration.*; import static org.apache.ignite.IgniteState.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.IgniteComponentType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java index 9f88caf..c6223c2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteTransactionsEx.java @@ -34,7 +34,7 @@ public interface IgniteTransactionsEx extends IgniteTransactions { * @param txSize Number of entries participating in transaction (may be approximate). * @return New transaction. * @throws IllegalStateException If transaction is already started by this thread. - * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.GridCacheAtomicityMode#ATOMIC}. + * @throws UnsupportedOperationException If cache is {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC}. */ public IgniteTx txStartSystem(IgniteTxConcurrency concurrency, IgniteTxIsolation isolation, long timeout, int txSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java index 878533f..c92a4e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java @@ -40,7 +40,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.internal.GridClosureCallMode.*; import static org.apache.ignite.internal.processors.affinity.GridAffinityUtils.*; @@ -317,7 +317,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { ClusterNode n = it.next(); - GridCacheMode mode = U.cacheMode(n, cacheName); + CacheMode mode = U.cacheMode(n, cacheName); assert mode != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java index 118a672..481a7ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.*; import java.io.*; import static org.apache.ignite.cache.CacheConfiguration.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; /** @@ -43,10 +43,10 @@ public class GridCacheAttributes implements Externalizable { private String name; /** Cache mode. */ - private GridCacheMode cacheMode; + private CacheMode cacheMode; /** Cache atomicity mode. */ - private GridCacheAtomicityMode atomicityMode; + private CacheAtomicityMode atomicityMode; /** Default time to live for cache entries. */ private long ttl; @@ -236,14 +236,14 @@ public class GridCacheAttributes implements Externalizable { /** * @return Cache mode. */ - public GridCacheMode cacheMode() { + public CacheMode cacheMode() { return cacheMode != null ? cacheMode : DFLT_CACHE_MODE; } /** * @return Cache atomicity mode. */ - public GridCacheAtomicityMode atomicityMode() { + public CacheAtomicityMode atomicityMode() { return atomicityMode != null ? atomicityMode : DFLT_CACHE_ATOMICITY_MODE; } @@ -575,8 +575,8 @@ public class GridCacheAttributes implements Externalizable { /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - atomicityMode = GridCacheAtomicityMode.fromOrdinal(U.readEnumOrdinal0(in)); - cacheMode = GridCacheMode.fromOrdinal(U.readEnumOrdinal0(in)); + atomicityMode = CacheAtomicityMode.fromOrdinal(U.readEnumOrdinal0(in)); + cacheMode = CacheMode.fromOrdinal(U.readEnumOrdinal0(in)); dfltLockTimeout = in.readLong(); dfltQryTimeout = in.readLong(); evictMaxOverflowRatio = in.readFloat(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 8d5c54d..78349b1 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 @@ -60,7 +60,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheFlag.*; import static org.apache.ignite.cache.GridCacheMemoryMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; @@ -401,7 +401,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return {@code True} if cache is replicated cache. */ public boolean isReplicated() { - return cacheCfg.getCacheMode() == GridCacheMode.REPLICATED; + return cacheCfg.getCacheMode() == CacheMode.REPLICATED; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java index e490959..fb67fcb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryImpl.java @@ -32,7 +32,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; 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/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java index f7f7ee2..755af5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionEntry.java @@ -32,7 +32,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index 491345f..b70ec90 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -49,7 +49,7 @@ import java.util.concurrent.locks.Lock; import static java.util.concurrent.TimeUnit.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.cache.GridCacheMemoryMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; import static org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionState.*; import static org.jdk8.backport.ConcurrentLinkedDeque8.*; @@ -226,7 +226,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V * Outputs warnings if potential configuration problems are detected. */ private void reportConfigurationProblems() { - GridCacheMode mode = cctx.config().getCacheMode(); + CacheMode mode = cctx.config().getCacheMode(); if (plcEnabled && !cctx.isNear() && mode == PARTITIONED) { if (!evictSync) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 070312d..b9d5f0d 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 @@ -1163,9 +1163,9 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> subjId, null, taskName); } - GridCacheMode mode = cctx.config().getCacheMode(); + CacheMode mode = cctx.config().getCacheMode(); - if (mode == GridCacheMode.LOCAL || mode == GridCacheMode.REPLICATED || + if (mode == CacheMode.LOCAL || mode == CacheMode.REPLICATED || (tx != null && tx.local() && !isNear())) cctx.continuousQueries().onEntryUpdate(this, key, val, valueBytesUnlocked(), old, oldBytes, false); @@ -1325,9 +1325,9 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> null, taskName); } - GridCacheMode mode = cctx.config().getCacheMode(); + CacheMode mode = cctx.config().getCacheMode(); - if (mode == GridCacheMode.LOCAL || mode == GridCacheMode.REPLICATED || + if (mode == CacheMode.LOCAL || mode == CacheMode.REPLICATED || (tx != null && tx.local() && !isNear())) cctx.continuousQueries().onEntryUpdate(this, key, null, null, old, oldBytes, false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index dc31ae8..c9be61c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -57,10 +57,10 @@ import java.util.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.configuration.IgniteDeploymentMode.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.CacheConfiguration.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; @@ -206,12 +206,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (cfg.getAtomicityMode() == ATOMIC) { if (cfg.getAtomicWriteOrderMode() == null) { cfg.setAtomicWriteOrderMode(cfg.getWriteSynchronizationMode() == FULL_SYNC ? - GridCacheAtomicWriteOrderMode.CLOCK : - GridCacheAtomicWriteOrderMode.PRIMARY); + CacheAtomicWriteOrderMode.CLOCK : + CacheAtomicWriteOrderMode.PRIMARY); } else if (cfg.getWriteSynchronizationMode() != FULL_SYNC && - cfg.getAtomicWriteOrderMode() == GridCacheAtomicWriteOrderMode.CLOCK) { - cfg.setAtomicWriteOrderMode(GridCacheAtomicWriteOrderMode.PRIMARY); + cfg.getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.CLOCK) { + cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY); U.warn(log, "Automatically set write order mode to PRIMARY for better performance " + "[writeSynchronizationMode=" + cfg.getWriteSynchronizationMode() + ", " + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java index 9200543..70bd5d0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java @@ -39,7 +39,7 @@ import java.io.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 49fbbe1..b473666 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@ -41,9 +41,9 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheDistributionMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.cache.GridCachePreloadMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 06f2af7..5eb1ae8 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 @@ -40,9 +40,9 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.GridCacheFlag.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.internal.GridClosureCallMode.*; @@ -1037,7 +1037,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager */ private void checkTransactionalWithNear() throws IgniteCheckedException { if (cctx.atomic()) - throw new IgniteCheckedException("Data structures require GridCacheAtomicityMode.TRANSACTIONAL atomicity mode " + + throw new IgniteCheckedException("Data structures require CacheAtomicityMode.TRANSACTIONAL atomicity mode " + "(change atomicity mode from ATOMIC to TRANSACTIONAL in configuration)"); if (!cctx.isReplicated() && !cctx.isLocal() && !CU.isNearEnabled(cctx)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index c1fb563..23be1cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -50,7 +50,7 @@ import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; import static org.apache.ignite.IgniteSystemProperties.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.GridCachePeekMode.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; @@ -593,7 +593,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { long accessTtl, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { return new FinishedLockFuture(new UnsupportedOperationException("Locks are not supported for " + - "GridCacheAtomicityMode.ATOMIC mode (use GridCacheAtomicityMode.TRANSACTIONAL instead)")); + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index c325731..61e278c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -167,7 +167,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void> long mapTime0 = mapTime; if (mapTime0 > 0 && U.currentTimeMillis() > mapTime0 + timeout) { - IgniteCheckedException ex = new GridCacheAtomicUpdateTimeoutException("Cache update timeout out " + + IgniteCheckedException ex = new CacheAtomicUpdateTimeoutException("Cache update timeout out " + "(consider increasing networkTimeout configuration property)."); updateRes.addFailedKeys(keys, ex); @@ -189,7 +189,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void> /** {@inheritDoc} */ @Override public boolean waitForPartitionExchange() { // Wait dht update futures in PRIMARY mode. - return cctx.config().getAtomicWriteOrderMode() == GridCacheAtomicWriteOrderMode.PRIMARY; + return cctx.config().getAtomicWriteOrderMode() == CacheAtomicWriteOrderMode.PRIMARY; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 8a819b2..ede8115 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 @@ -39,7 +39,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; -import static org.apache.ignite.cache.GridCacheAtomicWriteOrderMode.*; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.GridCacheFlag.*; import static org.apache.ignite.cache.GridCacheWriteSynchronizationMode.*; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; @@ -302,7 +302,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object> long mapTime0 = mapTime; if (mapTime0 > 0 && U.currentTimeMillis() > mapTime0 + timeout) - onDone(new GridCacheAtomicUpdateTimeoutException("Cache update timeout out " + + onDone(new CacheAtomicUpdateTimeoutException("Cache update timeout out " + "(consider increasing networkTimeout configuration property).")); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/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 4406c56..5f9c2c6 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 @@ -1434,7 +1434,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { long accessTtl, IgnitePredicate<GridCacheEntry<K, V>>[] filter) { return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " + - "GridCacheAtomicityMode.ATOMIC mode (use GridCacheAtomicityMode.TRANSACTIONAL instead)")); + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } /** {@inheritDoc} */ @@ -1443,7 +1443,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { long timeout, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) { return new GridFinishedFutureEx<>(new UnsupportedOperationException("Locks are not supported for " + - "GridCacheAtomicityMode.ATOMIC mode (use GridCacheAtomicityMode.TRANSACTIONAL instead)")); + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)")); } /** {@inheritDoc} */ @@ -1451,7 +1451,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Override public void unlockAll(@Nullable Collection<? extends K> keys, @Nullable IgnitePredicate<GridCacheEntry<K, V>>... filter) throws IgniteCheckedException { throw new UnsupportedOperationException("Locks are not supported for " + - "GridCacheAtomicityMode.ATOMIC mode (use GridCacheAtomicityMode.TRANSACTIONAL instead)"); + "CacheAtomicityMode.ATOMIC mode (use CacheAtomicityMode.TRANSACTIONAL instead)"); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java index 50d972c..a53beae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java @@ -35,7 +35,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.internal.GridTopic.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java index 4f68057..876973f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheLocalQueryManager.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Local query manager. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java index 977c9e9..9342c5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java @@ -455,7 +455,7 @@ public class GridCacheQueryAdapter<T> implements GridCacheQuery<T> { * @return Nodes to execute on. */ private Collection<ClusterNode> nodes() { - GridCacheMode cacheMode = cctx.config().getCacheMode(); + CacheMode cacheMode = cctx.config().getCacheMode(); switch (cacheMode) { case LOCAL: http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index cf5febe..0be08eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -47,7 +47,7 @@ import java.sql.*; import java.util.*; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.internal.GridClosureCallMode.*; import static org.apache.ignite.internal.processors.cache.query.GridCacheQueryType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java index c65c60d..66ecf63 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java @@ -34,7 +34,7 @@ import javax.cache.event.*; import java.util.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; /** * Continuous query implementation. @@ -261,7 +261,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou if (prj.nodes().isEmpty()) throw new ClusterTopologyException("Failed to execute query (projection is empty): " + this); - GridCacheMode mode = ctx.config().getCacheMode(); + CacheMode mode = ctx.config().getCacheMode(); if (mode == LOCAL || mode == REPLICATED) { Collection<ClusterNode> nodes = prj.nodes(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java index f9a5866..97b4d63 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java @@ -40,7 +40,7 @@ import java.util.*; import java.util.Date; import java.util.concurrent.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.compute.ComputeJobResultPolicy.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java index 2bda02f..6130f2c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/GridDataLoadCacheUpdaters.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.*; import java.util.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; 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/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java index a4803fc..bb98e31 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java @@ -293,7 +293,7 @@ public class IgniteDataLoaderImpl<K, V> implements IgniteDataLoader<K, V>, Delay assert a != null; - updater = a.atomicityMode() == GridCacheAtomicityMode.ATOMIC ? + updater = a.atomicityMode() == CacheAtomicityMode.ATOMIC ? GridDataLoadCacheUpdaters.<K, V>batched() : GridDataLoadCacheUpdaters.<K, V>groupLocked(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java index 7cd28f3..f912f47 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java @@ -49,7 +49,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.events.IgniteEventType.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java index e9f566b..ffcefd8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsMetaManager.java @@ -38,7 +38,7 @@ import java.io.*; import java.util.*; import static org.apache.ignite.events.IgniteEventType.*; -import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.CacheAtomicityMode.*; import static org.apache.ignite.internal.processors.fs.GridGgfsFileInfo.*; 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/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java index 5b84497..d99b3f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/IgniteFsProcessor.java @@ -41,7 +41,7 @@ import java.util.concurrent.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.GridCacheMemoryMode.*; -import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.CacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; import static org.apache.ignite.internal.GridNodeAttributes.*; import static org.apache.ignite.internal.processors.license.GridLicenseSubsystem.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index 57a0c15..542504d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -578,7 +578,7 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { private boolean replicatedCacheAvailable(String cacheName) { GridCacheAdapter<Object,Object> cache = ctx.cache().internalCache(cacheName); - return cache != null && cache.configuration().getCacheMode() == GridCacheMode.REPLICATED; + return cache != null && cache.configuration().getCacheMode() == CacheMode.REPLICATED; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java index d08e16e..4cd5694 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java @@ -103,7 +103,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter private boolean replicatedCacheAvailable(String cacheName) { GridCacheAdapter<Object,Object> cache = ctx.cache().internalCache(cacheName); - return cache != null && cache.configuration().getCacheMode() == GridCacheMode.REPLICATED; + return cache != null && cache.configuration().getCacheMode() == CacheMode.REPLICATED; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4065d18/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java index 1d07321..9c051c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java @@ -7215,7 +7215,7 @@ public abstract class GridUtils { * @param cacheName Cache to check. * @return Cache mode or {@code null} if cache is not found. */ - @Nullable public static GridCacheMode cacheMode(ClusterNode n, String cacheName) { + @Nullable public static CacheMode cacheMode(ClusterNode n, String cacheName) { GridCacheAttributes[] caches = n.attribute(ATTR_CACHE); if (caches != null) @@ -7234,7 +7234,7 @@ public abstract class GridUtils { * @param cacheName Cache to check. * @return Cache mode or {@code null} if cache is not found. */ - @Nullable public static GridCacheAtomicityMode atomicityMode(ClusterNode n, String cacheName) { + @Nullable public static CacheAtomicityMode atomicityMode(ClusterNode n, String cacheName) { GridCacheAttributes[] caches = n.attribute(ATTR_CACHE); if (caches != null)
