ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6031b87e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6031b87e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6031b87e Branch: refs/heads/ignite-410 Commit: 6031b87e2b4afa977214b90534c9a771aa5c3f9f Parents: 9b288fa Author: sboikov <sboi...@gridgain.com> Authored: Wed Mar 11 10:35:02 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Mar 11 11:13:29 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheInterceptor.java | 8 +- .../apache/ignite/cache/IgniteImmutable.java | 2 +- .../configuration/CacheConfiguration.java | 20 ++-- .../cache/CacheEntryInfoCollection.java | 3 + .../cache/CacheEntryPredicateContainsValue.java | 3 + .../cache/CacheEntryPredicateHasValue.java | 3 + .../cache/CacheEntryPredicateNoValue.java | 3 + .../cache/CacheEntrySerializablePredicate.java | 3 + .../processors/cache/CacheEvictionEntry.java | 3 + .../cache/CacheInvokeDirectResult.java | 3 + .../cache/CacheObjectByteArrayImpl.java | 3 + .../processors/cache/CacheObjectImpl.java | 3 + .../processors/cache/KeyCacheObjectImpl.java | 4 +- .../distributed/near/CacheVersionedValue.java | 3 + .../continuous/CacheContinuousQueryEntry.java | 3 + .../cache/transactions/IgniteTxKey.java | 3 + .../cache/transactions/TxEntryValueHolder.java | 3 + .../version/GridCacheRawVersionedEntry.java | 3 + .../IgniteCacheObjectProcessorImpl.java | 2 +- .../dataload/IgniteDataLoaderEntry.java | 3 + .../resources/META-INF/classnames.properties | 118 ++++++++++--------- ...pyOnGetDisabledMultiNodeFullApiSelfTest.java | 36 ------ ...yOnReadDisabledMultiNodeFullApiSelfTest.java | 36 ++++++ ...pyOnGetDisabledMultiNodeFullApiSelfTest.java | 37 ------ ...yOnReadDisabledMultiNodeFullApiSelfTest.java | 37 ++++++ .../IgniteCacheFullApiSelfTestSuite.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../ignite/tools/classgen/ClassesGenerator.java | 14 +-- 28 files changed, 212 insertions(+), 156 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java index 7e0d53e..ff94f86 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheInterceptor.java @@ -65,7 +65,7 @@ public interface CacheInterceptor<K, V> { * <p> * This method should not throw any exception. * - * @param entry Old entry. If {@link CacheConfiguration#isCopyOnGet()} is {@code true}, then is copy. + * @param entry Old entry. If {@link CacheConfiguration#isCopyOnRead()} is {@code true}, then is copy. * @param newVal New value. * @return Value to be put to cache. Returning {@code null} cancels the update. * @see IgniteCache#put(Object, Object) @@ -82,7 +82,7 @@ public interface CacheInterceptor<K, V> { * <p> * This method should not throw any exception. * - * @param entry Current entry. If {@link CacheConfiguration#isCopyOnGet()} is {@code true} then is copy. + * @param entry Current entry. If {@link CacheConfiguration#isCopyOnRead()} is {@code true} then is copy. */ public void onAfterPut(Cache.Entry<K, V> entry); @@ -97,7 +97,7 @@ public interface CacheInterceptor<K, V> { * <p> * This method should not throw any exception. * - * @param entry Old entry. If {@link CacheConfiguration#isCopyOnGet()} is {@code true} then is copy. + * @param entry Old entry. If {@link CacheConfiguration#isCopyOnRead()} is {@code true} then is copy. * @return Tuple. The first value is the flag whether remove should be cancelled or not. * The second is the value to be returned as result of {@code remove()} operation, * may be {@code null}. @@ -115,7 +115,7 @@ public interface CacheInterceptor<K, V> { * <p> * This method should not throw any exception. * - * @param entry Removed entry. If {@link CacheConfiguration#isCopyOnGet()} is {@code true} then is copy. + * @param entry Removed entry. If {@link CacheConfiguration#isCopyOnRead()} is {@code true} then is copy. */ public void onAfterRemove(Cache.Entry<K, V> entry); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java b/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java index b6389ea..4a389c0 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/IgniteImmutable.java @@ -22,7 +22,7 @@ import org.apache.ignite.configuration.*; import java.lang.annotation.*; /** - * If cache configuration flag {@link CacheConfiguration#isCopyOnGet()} is set + * If cache configuration flag {@link CacheConfiguration#isCopyOnRead()} is set * then for each operation implying return value copy of the value stored in cache is created. * Also if this flag is set copies are created for values passed to {@link CacheInterceptor} and * to {@link org.apache.ignite.cache.IgniteEntryProcessor}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 53c773d..7292b5a 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -217,8 +217,8 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** Cache distribution mode. */ private CacheDistributionMode distro = DFLT_DISTRIBUTION_MODE; - /** Default value for 'copyOnGet' flag. */ - public static final boolean DFLT_COPY_ON_GET = true; + /** Default value for 'copyOnRead' flag. */ + public static final boolean DFLT_COPY_ON_READ = true; /** Write synchronization mode. */ private CacheWriteSynchronizationMode writeSync; @@ -319,8 +319,8 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** Collection of type metadata. */ private Collection<CacheTypeMetadata> typeMeta; - /** Copy on get flag. */ - private boolean cpOnGet = DFLT_COPY_ON_GET; + /** Copy on read flag. */ + private boolean cpOnRead = DFLT_COPY_ON_READ; /** Empty constructor (all values are initialized to their defaults). */ public CacheConfiguration() { @@ -352,7 +352,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { cacheLoaderFactory = cc.getCacheLoaderFactory(); cacheMode = cc.getCacheMode(); cacheWriterFactory = cc.getCacheWriterFactory(); - cpOnGet = cc.isCopyOnGet(); + cpOnRead = cc.isCopyOnRead(); dfltLockTimeout = cc.getDefaultLockTimeout(); dfltQryTimeout = cc.getDefaultQueryTimeout(); distro = cc.getDistributionMode(); @@ -1612,18 +1612,18 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { * @return Copy on get flag. * @see IgniteImmutable */ - public boolean isCopyOnGet() { - return cpOnGet; + public boolean isCopyOnRead() { + return cpOnRead; } /** * Set copy on get flag. * * @param cpOnGet Copy on get flag. - * @see #isCopyOnGet + * @see #isCopyOnRead */ - public void setCopyOnGet(boolean cpOnGet) { - this.cpOnGet = cpOnGet; + public void setCopyOnRead(boolean cpOnGet) { + this.cpOnRead = cpOnGet; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java index 024d251..52158f0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryInfoCollection.java @@ -28,6 +28,9 @@ import java.util.*; */ public class CacheEntryInfoCollection implements Message { /** */ + private static final long serialVersionUID = 0L; + + /** */ @GridDirectCollection(GridCacheEntryInfo.class) private List<GridCacheEntryInfo> infos; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java index 7767009..14018cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateContainsValue.java @@ -30,6 +30,9 @@ import java.nio.*; */ public class CacheEntryPredicateContainsValue extends CacheEntryPredicateAdapter { /** */ + private static final long serialVersionUID = 0L; + + /** */ @GridToStringInclude private CacheObject val; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java index 6f9e0c8..210cc70 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateHasValue.java @@ -21,6 +21,9 @@ package org.apache.ignite.internal.processors.cache; * */ public class CacheEntryPredicateHasValue extends CacheEntryPredicateAdapter { + /** */ + private static final long serialVersionUID = 0L; + /** {@inheritDoc} */ @Override public boolean apply(GridCacheEntryEx e) { return peekVisibleValue(e) != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java index 25cdbec..4c8917f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryPredicateNoValue.java @@ -21,6 +21,9 @@ package org.apache.ignite.internal.processors.cache; * */ public class CacheEntryPredicateNoValue extends CacheEntryPredicateAdapter { + /** */ + private static final long serialVersionUID = 0L; + /** {@inheritDoc} */ @Override public boolean apply(GridCacheEntryEx e) { return peekVisibleValue(e) == null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java index 42c7846..0c07bfd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntrySerializablePredicate.java @@ -29,6 +29,9 @@ import java.nio.*; */ public class CacheEntrySerializablePredicate implements CacheEntryPredicate { /** */ + private static final long serialVersionUID = 0L; + + /** */ @GridToStringInclude @GridDirectTransient private CacheEntryPredicate p; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java index da3d975..6d3ad5e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictionEntry.java @@ -29,6 +29,9 @@ import java.nio.*; */ public class CacheEvictionEntry implements Message { /** */ + private static final long serialVersionUID = 0L; + + /** */ @GridToStringInclude private KeyCacheObject key; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java index e5db368..7b153d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheInvokeDirectResult.java @@ -32,6 +32,9 @@ import java.nio.*; */ public class CacheInvokeDirectResult implements Message { /** */ + private static final long serialVersionUID = 0L; + + /** */ private KeyCacheObject key; /** */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java index 333f6dc..3f9d1dd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectByteArrayImpl.java @@ -31,6 +31,9 @@ import java.util.*; */ public class CacheObjectByteArrayImpl implements CacheObject, Externalizable { /** */ + private static final long serialVersionUID = 0L; + + /** */ protected byte[] val; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java index 234845a..828d886 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java @@ -24,6 +24,9 @@ import org.jetbrains.annotations.*; * */ public class CacheObjectImpl extends CacheObjectAdapter { + /** */ + private static final long serialVersionUID = 0L; + /** * */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java index 3298a88..429b30c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.*; */ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheObject, Comparable<KeyCacheObjectImpl> { /** */ - static final int DIRECT_TYPE = 90; + private static final long serialVersionUID = 0L; /** * @@ -102,7 +102,7 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb /** {@inheritDoc} */ @Override public byte directType() { - return DIRECT_TYPE; + return 90; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java index 91ac41f..97b96c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/CacheVersionedValue.java @@ -30,6 +30,9 @@ import java.nio.*; * Cache object and version. */ public class CacheVersionedValue implements Message { + /** */ + private static final long serialVersionUID = 0L; + /** Value. */ @GridToStringInclude private CacheObject val; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java index 7a77dc6..060afb9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java @@ -34,6 +34,9 @@ import java.nio.*; */ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message { /** */ + private static final long serialVersionUID = 0L; + + /** */ private static final EventType[] EVT_TYPE_VALS = EventType.values(); /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java index 2237d63..f80f960 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxKey.java @@ -31,6 +31,9 @@ import java.nio.*; * for multiple caches. */ public class IgniteTxKey implements Message { + /** */ + private static final long serialVersionUID = 0L; + /** Key. */ @GridToStringInclude private KeyCacheObject key; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java index ede43bf..0bd3d52 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/TxEntryValueHolder.java @@ -34,6 +34,9 @@ import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*; @IgniteCodeGeneratingFail // Need to handle 'hasWriteVal' flag during write. public class TxEntryValueHolder implements Message { /** */ + private static final long serialVersionUID = 0L; + + /** */ @GridToStringInclude private CacheObject val; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java index 8235ec0..500e466 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java @@ -34,6 +34,9 @@ import java.nio.*; */ public class GridCacheRawVersionedEntry<K, V> extends IgniteDataLoaderEntry implements GridCacheVersionedEntry<K, V>, GridCacheVersionable, Externalizable { + /** */ + private static final long serialVersionUID = 0L; + /** Key bytes. */ @GridDirectTransient private byte[] keyBytes; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index c05d343..1966a21 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -272,7 +272,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme return new CacheObjectContext(ctx, new GridCacheDefaultAffinityKeyMapper(), - ccfg.isCopyOnGet() && memMode == ONHEAP_TIERED, + ccfg.isCopyOnRead() && memMode == ONHEAP_TIERED, ctx.config().isPeerClassLoadingEnabled() || ccfg.isQueryIndexEnabled()); } else http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderEntry.java index f719cfc..93e71fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderEntry.java @@ -30,6 +30,9 @@ import java.util.*; */ public class IgniteDataLoaderEntry implements Map.Entry<KeyCacheObject, CacheObject>, Message { /** */ + private static final long serialVersionUID = 0L; + + /** */ @GridToStringInclude protected KeyCacheObject key; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties index 808b6ba..677220f 100644 --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@ -244,43 +244,53 @@ org.apache.ignite.internal.processors.affinity.GridAffinityMessage org.apache.ignite.internal.processors.affinity.GridAffinityProcessor$2 org.apache.ignite.internal.processors.affinity.GridAffinityUtils$AffinityJob org.apache.ignite.internal.processors.cache.CacheAtomicUpdateTimeoutCheckedException +org.apache.ignite.internal.processors.cache.CacheEntryInfoCollection +org.apache.ignite.internal.processors.cache.CacheEntryPredicate +org.apache.ignite.internal.processors.cache.CacheEntryPredicateAdapter +org.apache.ignite.internal.processors.cache.CacheEntryPredicateContainsValue +org.apache.ignite.internal.processors.cache.CacheEntryPredicateHasValue +org.apache.ignite.internal.processors.cache.CacheEntryPredicateNoValue +org.apache.ignite.internal.processors.cache.CacheEntrySerializablePredicate +org.apache.ignite.internal.processors.cache.CacheEvictionEntry org.apache.ignite.internal.processors.cache.CacheFlag org.apache.ignite.internal.processors.cache.CacheFlagException +org.apache.ignite.internal.processors.cache.CacheInvokeDirectResult org.apache.ignite.internal.processors.cache.CacheInvokeEntry$Operation org.apache.ignite.internal.processors.cache.CacheInvokeResult +org.apache.ignite.internal.processors.cache.CacheObject +org.apache.ignite.internal.processors.cache.CacheObjectAdapter +org.apache.ignite.internal.processors.cache.CacheObjectByteArrayImpl +org.apache.ignite.internal.processors.cache.CacheObjectImpl org.apache.ignite.internal.processors.cache.CachePartialUpdateCheckedException org.apache.ignite.internal.processors.cache.CacheStorePartialUpdateException org.apache.ignite.internal.processors.cache.CacheWeakQueryIteratorsHolder$WeakQueryFutureIterator org.apache.ignite.internal.processors.cache.GridCacheAdapter -org.apache.ignite.internal.processors.cache.GridCacheAdapter$10 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$11 org.apache.ignite.internal.processors.cache.GridCacheAdapter$12 org.apache.ignite.internal.processors.cache.GridCacheAdapter$13 org.apache.ignite.internal.processors.cache.GridCacheAdapter$14 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$15 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$16$1 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$15$1 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$16 org.apache.ignite.internal.processors.cache.GridCacheAdapter$17 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$18 org.apache.ignite.internal.processors.cache.GridCacheAdapter$2 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$27$1 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$29 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$26$1 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$28 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$29$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$3 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$30$1 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$31 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$33 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$30 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$32 org.apache.ignite.internal.processors.cache.GridCacheAdapter$5 org.apache.ignite.internal.processors.cache.GridCacheAdapter$6 org.apache.ignite.internal.processors.cache.GridCacheAdapter$65 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$66 org.apache.ignite.internal.processors.cache.GridCacheAdapter$67 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$68 org.apache.ignite.internal.processors.cache.GridCacheAdapter$69 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$7 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$70 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$70$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$71 org.apache.ignite.internal.processors.cache.GridCacheAdapter$72 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$72$1 org.apache.ignite.internal.processors.cache.GridCacheAdapter$73 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$74 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$75 -org.apache.ignite.internal.processors.cache.GridCacheAdapter$77 +org.apache.ignite.internal.processors.cache.GridCacheAdapter$8 org.apache.ignite.internal.processors.cache.GridCacheAdapter$9 org.apache.ignite.internal.processors.cache.GridCacheAdapter$GlobalClearAllCallable org.apache.ignite.internal.processors.cache.GridCacheAdapter$GlobalSizeCallable @@ -308,13 +318,12 @@ org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$ValueIterator org.apache.ignite.internal.processors.cache.GridCacheConcurrentMap$Values org.apache.ignite.internal.processors.cache.GridCacheContext org.apache.ignite.internal.processors.cache.GridCacheContext$2 -org.apache.ignite.internal.processors.cache.GridCacheContext$3 +org.apache.ignite.internal.processors.cache.GridCacheContext$5 org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$1 org.apache.ignite.internal.processors.cache.GridCacheDefaultAffinityKeyMapper$2 org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager$2 org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager$4 -org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager$5 org.apache.ignite.internal.processors.cache.GridCacheEntryInfo org.apache.ignite.internal.processors.cache.GridCacheEntryRedeployException org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException @@ -359,26 +368,22 @@ org.apache.ignite.internal.processors.cache.GridCacheProcessor$1 org.apache.ignite.internal.processors.cache.GridCacheProcessor$2 org.apache.ignite.internal.processors.cache.GridCacheProcessor$LocalAffinityFunction org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl -org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$1 -org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$2 -org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$3 -org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$4 -org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$FullFilter -org.apache.ignite.internal.processors.cache.GridCacheProjectionImpl$KeyValueFilter org.apache.ignite.internal.processors.cache.GridCacheProxyImpl org.apache.ignite.internal.processors.cache.GridCacheReturn org.apache.ignite.internal.processors.cache.GridCacheStoreManager$1 org.apache.ignite.internal.processors.cache.GridCacheStoreManager$2 org.apache.ignite.internal.processors.cache.GridCacheStoreManager$3 +org.apache.ignite.internal.processors.cache.GridCacheStoreManager$4 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$10 -org.apache.ignite.internal.processors.cache.GridCacheSwapManager$13 +org.apache.ignite.internal.processors.cache.GridCacheSwapManager$12 +org.apache.ignite.internal.processors.cache.GridCacheSwapManager$14 +org.apache.ignite.internal.processors.cache.GridCacheSwapManager$17 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$2 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$3 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$4 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$5 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$6 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$7 -org.apache.ignite.internal.processors.cache.GridCacheSwapManager$8 org.apache.ignite.internal.processors.cache.GridCacheSwapManager$IteratorWrapper org.apache.ignite.internal.processors.cache.GridCacheUtilityKey org.apache.ignite.internal.processors.cache.GridCacheUtils$10 @@ -396,7 +401,9 @@ org.apache.ignite.internal.processors.cache.GridCacheUtils$20 org.apache.ignite.internal.processors.cache.GridCacheUtils$21 org.apache.ignite.internal.processors.cache.GridCacheUtils$22 org.apache.ignite.internal.processors.cache.GridCacheUtils$23 -org.apache.ignite.internal.processors.cache.GridCacheUtils$25 +org.apache.ignite.internal.processors.cache.GridCacheUtils$24 +org.apache.ignite.internal.processors.cache.GridCacheUtils$26 +org.apache.ignite.internal.processors.cache.GridCacheUtils$27 org.apache.ignite.internal.processors.cache.GridCacheUtils$3 org.apache.ignite.internal.processors.cache.GridCacheUtils$4 org.apache.ignite.internal.processors.cache.GridCacheUtils$5 @@ -404,7 +411,6 @@ org.apache.ignite.internal.processors.cache.GridCacheUtils$6 org.apache.ignite.internal.processors.cache.GridCacheUtils$7 org.apache.ignite.internal.processors.cache.GridCacheUtils$8 org.apache.ignite.internal.processors.cache.GridCacheUtils$9 -org.apache.ignite.internal.processors.cache.GridCacheValueBytes org.apache.ignite.internal.processors.cache.GridCacheValueCollection org.apache.ignite.internal.processors.cache.GridCacheValueCollection$1 org.apache.ignite.internal.processors.cache.GridCacheWriteBehindStore$StatefulValue @@ -419,6 +425,8 @@ org.apache.ignite.internal.processors.cache.IgniteCacheProxy$5 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$6 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$7 org.apache.ignite.internal.processors.cache.IgniteCacheProxy$ClIter +org.apache.ignite.internal.processors.cache.KeyCacheObject +org.apache.ignite.internal.processors.cache.KeyCacheObjectImpl org.apache.ignite.internal.processors.cache.affinity.GridCacheAffinityProxy org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$BlockSetCallable org.apache.ignite.internal.processors.cache.datastructures.CacheDataStructuresManager$QueueHeaderPredicate @@ -564,14 +572,15 @@ org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPre org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$9 org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloader$MessageHandler org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPreloaderAssignments +org.apache.ignite.internal.processors.cache.distributed.near.CacheVersionedValue org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache org.apache.ignite.internal.processors.cache.distributed.near.GridNearAtomicCache$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$2 org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$2$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$2$2 +org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$2$3 org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$3 -org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$4 org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter$EntrySet$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$1 org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetFuture$2 @@ -614,11 +623,10 @@ org.apache.ignite.internal.processors.cache.dr.GridCacheDrInfo org.apache.ignite.internal.processors.cache.local.GridLocalCache org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$10 -org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$11 -org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$3 +org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$4 org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$5 org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$6 -org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$7 +org.apache.ignite.internal.processors.cache.local.atomic.GridLocalAtomicCache$9 org.apache.ignite.internal.processors.cache.query.CacheQueryType org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$1 org.apache.ignite.internal.processors.cache.query.GridCacheDistributedQueryFuture$3 @@ -635,10 +643,8 @@ org.apache.ignite.internal.processors.cache.query.GridCacheQueryFutureAdapter$2 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$1$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$1$2 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$10 -org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$11 +org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$11$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$12$1 -org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$13$1 -org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$14$1 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$2 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$3 org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager$4 @@ -669,6 +675,7 @@ org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEntry org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryEvent org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler +org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$2 org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler$DeployableObject org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryManager$JCacheQueryRemoteFilter org.apache.ignite.internal.processors.cache.query.jdbc.GridCacheQueryJdbcMetadataTask @@ -734,10 +741,14 @@ org.apache.ignite.internal.processors.cache.transactions.IgniteTxMap$1$1 org.apache.ignite.internal.processors.cache.transactions.TransactionMetricsAdapter org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl org.apache.ignite.internal.processors.cache.transactions.TransactionProxyImpl$1 +org.apache.ignite.internal.processors.cache.transactions.TxEntryValueHolder org.apache.ignite.internal.processors.cache.version.GridCacheRawVersionedEntry org.apache.ignite.internal.processors.cache.version.GridCacheVersion org.apache.ignite.internal.processors.cache.version.GridCacheVersionConflictContext$State org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx +org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$1 +org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$2 +org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$3 org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage org.apache.ignite.internal.processors.clock.GridClockDeltaVersion org.apache.ignite.internal.processors.closure.GridClosurePolicy @@ -771,14 +782,15 @@ org.apache.ignite.internal.processors.dataload.GridDataLoadCacheUpdaters$Batched org.apache.ignite.internal.processors.dataload.GridDataLoadCacheUpdaters$Individual org.apache.ignite.internal.processors.dataload.GridDataLoadRequest org.apache.ignite.internal.processors.dataload.GridDataLoadResponse +org.apache.ignite.internal.processors.dataload.GridDataLoadUpdateJob$1 org.apache.ignite.internal.processors.dataload.GridDataLoaderProcessor$3 +org.apache.ignite.internal.processors.dataload.IgniteDataLoaderEntry org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$1 org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$4 +org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$5 org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Buffer$1 org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Buffer$2 org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$DataLoaderPda -org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Entries0 -org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$Entry0 org.apache.ignite.internal.processors.dataload.IgniteDataLoaderImpl$IsolatedUpdater org.apache.ignite.internal.processors.datastructures.CacheDataStructuresConfigurationKey org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor$1 @@ -993,6 +1005,8 @@ org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException org.apache.ignite.internal.util.F0$1 +org.apache.ignite.internal.util.F0$10 +org.apache.ignite.internal.util.F0$11 org.apache.ignite.internal.util.F0$2 org.apache.ignite.internal.util.F0$3 org.apache.ignite.internal.util.F0$4 @@ -1110,11 +1124,7 @@ org.apache.ignite.internal.util.lang.GridFunc$100 org.apache.ignite.internal.util.lang.GridFunc$100$1 org.apache.ignite.internal.util.lang.GridFunc$100$2 org.apache.ignite.internal.util.lang.GridFunc$101 -org.apache.ignite.internal.util.lang.GridFunc$101$1 -org.apache.ignite.internal.util.lang.GridFunc$101$2 org.apache.ignite.internal.util.lang.GridFunc$102 -org.apache.ignite.internal.util.lang.GridFunc$102$1 -org.apache.ignite.internal.util.lang.GridFunc$102$2 org.apache.ignite.internal.util.lang.GridFunc$103 org.apache.ignite.internal.util.lang.GridFunc$104 org.apache.ignite.internal.util.lang.GridFunc$105 @@ -1130,23 +1140,23 @@ org.apache.ignite.internal.util.lang.GridFunc$113 org.apache.ignite.internal.util.lang.GridFunc$114 org.apache.ignite.internal.util.lang.GridFunc$115 org.apache.ignite.internal.util.lang.GridFunc$116 -org.apache.ignite.internal.util.lang.GridFunc$117 org.apache.ignite.internal.util.lang.GridFunc$118 +org.apache.ignite.internal.util.lang.GridFunc$119 org.apache.ignite.internal.util.lang.GridFunc$12 -org.apache.ignite.internal.util.lang.GridFunc$120 org.apache.ignite.internal.util.lang.GridFunc$121 -org.apache.ignite.internal.util.lang.GridFunc$123 +org.apache.ignite.internal.util.lang.GridFunc$122 org.apache.ignite.internal.util.lang.GridFunc$124 +org.apache.ignite.internal.util.lang.GridFunc$125 org.apache.ignite.internal.util.lang.GridFunc$126 -org.apache.ignite.internal.util.lang.GridFunc$127 org.apache.ignite.internal.util.lang.GridFunc$128 +org.apache.ignite.internal.util.lang.GridFunc$129 org.apache.ignite.internal.util.lang.GridFunc$13 org.apache.ignite.internal.util.lang.GridFunc$130 org.apache.ignite.internal.util.lang.GridFunc$131 org.apache.ignite.internal.util.lang.GridFunc$132 org.apache.ignite.internal.util.lang.GridFunc$133 -org.apache.ignite.internal.util.lang.GridFunc$134 org.apache.ignite.internal.util.lang.GridFunc$135 +org.apache.ignite.internal.util.lang.GridFunc$136 org.apache.ignite.internal.util.lang.GridFunc$137 org.apache.ignite.internal.util.lang.GridFunc$138 org.apache.ignite.internal.util.lang.GridFunc$139 @@ -1171,9 +1181,7 @@ org.apache.ignite.internal.util.lang.GridFunc$155 org.apache.ignite.internal.util.lang.GridFunc$156 org.apache.ignite.internal.util.lang.GridFunc$157 org.apache.ignite.internal.util.lang.GridFunc$158 -org.apache.ignite.internal.util.lang.GridFunc$159 org.apache.ignite.internal.util.lang.GridFunc$16 -org.apache.ignite.internal.util.lang.GridFunc$160 org.apache.ignite.internal.util.lang.GridFunc$17 org.apache.ignite.internal.util.lang.GridFunc$18 org.apache.ignite.internal.util.lang.GridFunc$19 @@ -1230,12 +1238,12 @@ org.apache.ignite.internal.util.lang.GridFunc$64 org.apache.ignite.internal.util.lang.GridFunc$65 org.apache.ignite.internal.util.lang.GridFunc$66 org.apache.ignite.internal.util.lang.GridFunc$67 +org.apache.ignite.internal.util.lang.GridFunc$67$1 org.apache.ignite.internal.util.lang.GridFunc$68 -org.apache.ignite.internal.util.lang.GridFunc$69 -org.apache.ignite.internal.util.lang.GridFunc$69$1 +org.apache.ignite.internal.util.lang.GridFunc$68$1 org.apache.ignite.internal.util.lang.GridFunc$7 org.apache.ignite.internal.util.lang.GridFunc$70 -org.apache.ignite.internal.util.lang.GridFunc$70$1 +org.apache.ignite.internal.util.lang.GridFunc$71 org.apache.ignite.internal.util.lang.GridFunc$72 org.apache.ignite.internal.util.lang.GridFunc$73 org.apache.ignite.internal.util.lang.GridFunc$74 @@ -1247,21 +1255,25 @@ org.apache.ignite.internal.util.lang.GridFunc$79 org.apache.ignite.internal.util.lang.GridFunc$8 org.apache.ignite.internal.util.lang.GridFunc$80 org.apache.ignite.internal.util.lang.GridFunc$81 -org.apache.ignite.internal.util.lang.GridFunc$82 org.apache.ignite.internal.util.lang.GridFunc$83 +org.apache.ignite.internal.util.lang.GridFunc$84 org.apache.ignite.internal.util.lang.GridFunc$85 org.apache.ignite.internal.util.lang.GridFunc$86 org.apache.ignite.internal.util.lang.GridFunc$87 org.apache.ignite.internal.util.lang.GridFunc$88 -org.apache.ignite.internal.util.lang.GridFunc$89 org.apache.ignite.internal.util.lang.GridFunc$9 -org.apache.ignite.internal.util.lang.GridFunc$90 +org.apache.ignite.internal.util.lang.GridFunc$91 +org.apache.ignite.internal.util.lang.GridFunc$92 org.apache.ignite.internal.util.lang.GridFunc$93 org.apache.ignite.internal.util.lang.GridFunc$94 org.apache.ignite.internal.util.lang.GridFunc$95 org.apache.ignite.internal.util.lang.GridFunc$96 org.apache.ignite.internal.util.lang.GridFunc$97 +org.apache.ignite.internal.util.lang.GridFunc$97$1 +org.apache.ignite.internal.util.lang.GridFunc$97$2 org.apache.ignite.internal.util.lang.GridFunc$98 +org.apache.ignite.internal.util.lang.GridFunc$98$1 +org.apache.ignite.internal.util.lang.GridFunc$98$2 org.apache.ignite.internal.util.lang.GridFunc$99 org.apache.ignite.internal.util.lang.GridFunc$99$1 org.apache.ignite.internal.util.lang.GridFunc$99$2 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnGetDisabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnGetDisabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnGetDisabledMultiNodeFullApiSelfTest.java deleted file mode 100644 index 204412e..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnGetDisabledMultiNodeFullApiSelfTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache.distributed.near; - -import org.apache.ignite.configuration.*; - -/** - * - */ -public class GridCacheAtomicCopyOnGetDisabledMultiNodeFullApiSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); - - assert ccfg.isCopyOnGet(); - - ccfg.setCopyOnGet(false); - - return ccfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.java new file mode 100644 index 0000000..ec51dfc --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.java @@ -0,0 +1,36 @@ +/* + * 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.distributed.near; + +import org.apache.ignite.configuration.*; + +/** + * + */ +public class GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest extends GridCacheAtomicMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(gridName); + + assert ccfg.isCopyOnRead(); + + ccfg.setCopyOnRead(false); + + return ccfg; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnGetDisabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnGetDisabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnGetDisabledMultiNodeFullApiSelfTest.java deleted file mode 100644 index 9d1b2dd..0000000 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnGetDisabledMultiNodeFullApiSelfTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache.distributed.near; - -import org.apache.ignite.configuration.*; - -/** - * - */ -public class GridCachePartitionedCopyOnGetDisabledMultiNodeFullApiSelfTest - extends GridCachePartitionedMultiNodeFullApiSelfTest { - /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); - - assert ccfg.isCopyOnGet(); - - ccfg.setCopyOnGet(false); - - return ccfg; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.java new file mode 100644 index 0000000..3b45f68 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.java @@ -0,0 +1,37 @@ +/* + * 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.distributed.near; + +import org.apache.ignite.configuration.*; + +/** + * + */ +public class GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest + extends GridCachePartitionedMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ + @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(gridName); + + assert ccfg.isCopyOnRead(); + + ccfg.setCopyOnRead(false); + + return ccfg; + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index a0103b7..5043f8c 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@ -68,9 +68,9 @@ public class IgniteCacheFullApiSelfTestSuite extends TestSuite { suite.addTestSuite(GridCacheReplicatedRendezvousAffinityMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedCopyOnGetDisabledMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCachePartitionedCopyOnReadDisabledMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCacheAtomicCopyOnGetDisabledMultiNodeFullApiSelfTest.class); + suite.addTestSuite(GridCacheAtomicCopyOnReadDisabledMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedMultiNodeP2PDisabledFullApiSelfTest.class); suite.addTestSuite(GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java index 74de96f..3290827 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java @@ -358,9 +358,8 @@ public class IgniteCacheTestSuite extends TestSuite { suite.addTestSuite(IgniteCacheTxLoadAllTest.class); suite.addTestSuite(IgniteCacheTxLocalLoadAllTest.class); - // TODO: IGNITE-402 -// suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class); -// suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class); + suite.addTestSuite(IgniteCacheAtomicLoaderWriterTest.class); + suite.addTestSuite(IgniteCacheTxLoaderWriterTest.class); suite.addTestSuite(IgniteCacheAtomicStoreSessionTest.class); suite.addTestSuite(IgniteCacheTxStoreSessionTest.class); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6031b87e/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java ---------------------------------------------------------------------- diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java index 68272f7..377f8c2 100644 --- a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java +++ b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java @@ -44,10 +44,10 @@ public class ClassesGenerator { assert args.length >= 3; String basePath = args[0]; - String header = args[1]; + String hdr = args[1]; String[] packages = args[2].split(":"); - ClassesGenerator gen = new ClassesGenerator(basePath, header, packages); + ClassesGenerator gen = new ClassesGenerator(basePath, hdr, packages); gen.generate(); } @@ -69,19 +69,19 @@ public class ClassesGenerator { private final String basePath; /** */ - private final String header; + private final String hdr; /** */ private final String[] packages; /** * @param basePath Base file path. - * @param header Header. + * @param hdr Header. * @param packages Included packages. */ - private ClassesGenerator(String basePath, String header, String[] packages) { + private ClassesGenerator(String basePath, String hdr, String[] packages) { this.basePath = basePath; - this.header = header; + this.hdr = hdr; this.packages = packages; } @@ -105,7 +105,7 @@ public class ClassesGenerator { PrintStream out = new PrintStream(new File(basePath, FILE_PATH)); - out.println(header); + out.println(hdr); out.println(); for (Class cls : classes)
