Cleaned documentation. Set ATOMIC mode as default using specific constant.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50f75bd6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50f75bd6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50f75bd6 Branch: refs/heads/ignite-843 Commit: 50f75bd6111b5b9163391e4c0913ff5b696a2862 Parents: e51fb42 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Sep 22 11:44:22 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Sep 22 11:44:22 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +++++------------ .../processors/cache/GridCacheProcessor.java | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/50f75bd6/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 9e0f81e..92b5aa1 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 @@ -33,11 +33,6 @@ public enum CacheAtomicityMode { /** * Specified fully {@code ACID}-compliant transactional cache behavior. See * {@link Transaction} 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, @@ -49,18 +44,16 @@ 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 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. + * 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. * <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 CacheMode#PARTITIONED} caches only. */ ATOMIC; @@ -76,4 +69,4 @@ public enum CacheAtomicityMode { @Nullable public static CacheAtomicityMode fromOrdinal(int ord) { return ord >= 0 && ord < VALS.length ? VALS[ord] : null; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/50f75bd6/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 7c16136..9c325aa 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 @@ -271,7 +271,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { cfg.setRebalanceMode(ASYNC); if (cfg.getAtomicityMode() == null) - cfg.setAtomicityMode(ATOMIC); + cfg.setAtomicityMode(CacheConfiguration.DFLT_CACHE_ATOMICITY_MODE); if (cfg.getWriteSynchronizationMode() == null) cfg.setWriteSynchronizationMode(PRIMARY_SYNC);
