ignite-4587 Merged with master branch
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bfb5851 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bfb5851 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bfb5851 Branch: refs/heads/ignite-4587 Commit: 0bfb5851c2de06b27d3d784a744a21bf24d5d1c1 Parents: c9d08d3 530075b Author: agura <[email protected]> Authored: Tue Apr 11 20:01:51 2017 +0300 Committer: agura <[email protected]> Committed: Tue Apr 11 20:01:51 2017 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 4 + .../ignite/cache/CacheAtomicWriteOrderMode.java | 64 --- .../org/apache/ignite/cache/CacheEntry.java | 11 - .../configuration/CacheConfiguration.java | 28 -- .../configuration/IgniteConfiguration.java | 60 --- .../ignite/internal/GridKernalContext.java | 16 - .../ignite/internal/GridKernalContextImpl.java | 31 -- .../apache/ignite/internal/IgniteKernal.java | 2 - .../communication/GridIoMessageFactory.java | 12 - .../processors/cache/CacheEntryImplEx.java | 8 +- .../cache/GridCacheAtomicVersionComparator.java | 24 +- .../processors/cache/GridCacheMapEntry.java | 10 +- .../processors/cache/GridCacheMvcc.java | 23 +- .../processors/cache/GridCacheProcessor.java | 17 - .../cache/GridCacheSwapEntryImpl.java | 4 +- .../processors/cache/GridCacheUtils.java | 7 +- .../dht/atomic/GridDhtAtomicCache.java | 21 +- ...idNearAtomicAbstractSingleUpdateRequest.java | 1 - .../atomic/GridNearAtomicFullUpdateRequest.java | 3 +- ...GridNearAtomicSingleUpdateFilterRequest.java | 3 +- ...GridNearAtomicSingleUpdateInvokeRequest.java | 3 +- .../cache/transactions/IgniteTxEntry.java | 8 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../version/GridCachePlainVersionedEntry.java | 5 - .../version/GridCacheRawVersionedEntry.java | 5 - .../cache/version/GridCacheVersion.java | 47 +- .../cache/version/GridCacheVersionEx.java | 19 +- .../cache/version/GridCacheVersionManager.java | 9 +- .../cache/version/GridCacheVersionedEntry.java | 7 - .../clock/GridClockDeltaSnapshot.java | 235 --------- .../clock/GridClockDeltaSnapshotMessage.java | 154 ------ .../processors/clock/GridClockDeltaVersion.java | 194 -------- .../processors/clock/GridClockMessage.java | 171 ------- .../processors/clock/GridClockServer.java | 222 --------- .../processors/clock/GridClockSource.java | 30 -- .../clock/GridClockSyncProcessor.java | 481 ------------------- .../processors/clock/GridJvmClockSource.java | 28 -- .../datastructures/DataStructuresProcessor.java | 2 - .../internal/processors/igfs/IgfsUtils.java | 2 - .../utils/PlatformConfigurationUtils.java | 3 - .../ignite/internal/util/IgniteUtils.java | 26 +- .../visor/cache/VisorCacheConfiguration.java | 12 - .../ignite/startup/BasicWarmupClosure.java | 1 - .../resources/META-INF/classnames.properties | 4 +- .../config/websession/example-cache-base.xml | 1 - .../test/config/websession/spring-cache-1.xml | 6 - .../test/config/websession/spring-cache-2.xml | 6 - .../test/config/websession/spring-cache-3.xml | 6 - .../IgniteClientReconnectCacheTest.java | 87 ++-- .../CacheAtomicSingleMessageCountSelfTest.java | 2 - .../cache/CacheEnumOperationsAbstractTest.java | 2 - ...torPartitionCounterRandomOperationsTest.java | 2 - .../CacheStoreUsageMultinodeAbstractTest.java | 2 - .../EntryVersionConsistencyReadThroughTest.java | 2 - .../cache/GridCacheAbstractFullApiSelfTest.java | 15 +- .../GridCacheAbstractLocalStoreSelfTest.java | 16 +- .../GridCacheAbstractRemoveFailureTest.java | 9 - .../GridCacheAtomicMessageCountSelfTest.java | 54 +-- .../cache/GridCacheEntryVersionSelfTest.java | 2 - .../cache/GridCacheIncrementTransformTest.java | 2 - .../GridCacheInterceptorAbstractSelfTest.java | 24 +- ...erceptorAtomicPrimaryWriteOrderSelfTest.java | 47 -- ...omicReplicatedPrimaryWriteOrderSelfTest.java | 48 -- ...acheInterceptorAtomicReplicatedSelfTest.java | 8 - .../GridCacheInterceptorAtomicSelfTest.java | 8 - ...GridCacheInterceptorLocalAtomicSelfTest.java | 8 - .../cache/GridCacheMvccFlagsTest.java | 4 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 24 +- .../processors/cache/GridCacheMvccSelfTest.java | 8 +- ...HeapMultiThreadedUpdateAbstractSelfTest.java | 2 - .../GridCacheOffHeapTieredAbstractSelfTest.java | 3 - ...heOffHeapTieredEvictionAbstractSelfTest.java | 3 - .../GridCacheReturnValueTransferSelfTest.java | 15 +- ...ridCacheStoreManagerDeserializationTest.java | 10 - .../processors/cache/GridCacheTestEntryEx.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 10 - .../cache/GridCacheVersionMultinodeTest.java | 40 -- .../cache/GridCacheVersionSelfTest.java | 4 +- .../GridCacheVersionTopologyChangeTest.java | 2 - .../cache/IgniteCacheAbstractTest.java | 14 - .../cache/IgniteCacheAtomicInvokeTest.java | 7 - .../cache/IgniteCacheAtomicPeekModesTest.java | 7 - ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 57 --- ...maryWriteOrderNearEnabledStoreValueTest.java | 31 -- ...heAtomicPrimaryWriteOrderStoreValueTest.java | 32 -- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 32 -- .../cache/IgniteCacheAtomicStoreValueTest.java | 7 - .../IgniteCacheAtomicWithStoreInvokeTest.java | 32 ++ .../IgniteCacheConfigVariationsFullApiTest.java | 6 - .../IgniteCacheEntryListenerAtomicTest.java | 7 - ...niteCacheEntryListenerExpiredEventsTest.java | 2 - .../IgniteCacheEntryProcessorCallTest.java | 3 - .../IgniteCacheInterceptorSelfTestSuite.java | 2 - ...gniteCacheInvokeReadThroughAbstractTest.java | 2 - .../IgniteCacheP2pUnmarshallingErrorTest.java | 6 - .../IgniteCacheReadThroughStoreCallTest.java | 2 - .../IgniteCacheStoreValueAbstractTest.java | 4 - .../cache/IgniteCacheTxPeekModesTest.java | 7 - .../cache/IgniteExchangeFutureHistoryTest.java | 6 - ...logyValidatorPartitionedAtomicCacheTest.java | 7 - ...ologyValidatorReplicatedAtomicCacheTest.java | 7 - ...sExchangeOnDiscoveryHistoryOverflowTest.java | 7 - .../IgniteCacheAtomicExecutionContextTest.java | 7 - ...iteCachePartitionedExecutionContextTest.java | 7 - ...niteCacheReplicatedExecutionContextTest.java | 7 - .../IgniteCacheTxExecutionContextTest.java | 7 - ...CacheAtomicNearUpdateTopologyChangeTest.java | 7 - .../CacheLateAffinityAssignmentTest.java | 2 - ...NearDisabledAtomicInvokeRestartSelfTest.java | 6 - ...dCacheMultithreadedFailoverAbstractTest.java | 18 +- ...chePartitionedReloadAllAbstractSelfTest.java | 11 - .../GridCacheTransformEventSelfTest.java | 2 - .../IgniteCacheAtomicNodeJoinTest.java | 6 - ...niteCacheClientNodeChangingTopologyTest.java | 92 +--- .../IgniteCacheMessageRecoveryAbstractTest.java | 2 - ...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 - .../dht/GridCacheAtomicFullApiSelfTest.java | 19 - .../dht/GridCacheAtomicNearCacheSelfTest.java | 53 +- ...EnabledPrimaryWriteOrderFullApiSelfTest.java | 31 -- ...eAtomicPrimaryWriteOrderFullApiSelfTest.java | 32 -- ...tomicPrimaryWriteOrderReloadAllSelfTest.java | 32 -- .../GridCacheDhtAtomicRemoveFailureTest.java | 7 - .../dht/IgniteCacheConcurrentPutGetRemove.java | 2 - ...artitionedBackupNodeFailureRecoveryTest.java | 7 - .../IgniteCachePutRetryAbstractSelfTest.java | 16 - .../atomic/GridCacheAtomicFailoverSelfTest.java | 3 - ...eAtomicInvalidPartitionHandlingSelfTest.java | 66 +-- ...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 -- ...tomicPrimaryWriteOrderRemoveFailureTest.java | 53 -- .../GridCacheAtomicRemoveFailureTest.java | 7 - ...micPrimaryWriteOrderNearEnabledSelfTest.java | 39 -- ...sistencyAtomicPrimaryWriteOrderSelfTest.java | 32 -- ...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 32 -- ...LateAffDisabledMultiNodeFullApiSelfTest.java | 35 ++ ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 35 -- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 10 - ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 19 - ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 31 -- .../GridCacheAtomicNearRemoveFailureTest.java | 7 - ...icNoStripedPoolMultiNodeFullApiSelfTest.java | 35 ++ .../GridCacheAtomicOffHeapFullApiSelfTest.java | 11 - ...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 11 - ...idCacheAtomicPartitionedMetricsSelfTest.java | 2 - ...derFairAffinityMultiNodeFullApiSelfTest.java | 36 -- ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 32 -- ...rderMultiNodeP2PDisabledFullApiSelfTest.java | 33 -- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 52 -- ...PrimaryWriteOrderOffHeapFullApiSelfTest.java | 32 -- ...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 -- ...ityOrderOffHeapMultiNodeFullApiSelfTest.java | 33 -- ...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 -- .../near/GridCacheNearEvictionSelfTest.java | 2 - ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 - ...achePartitionedMultiNodeFullApiSelfTest.java | 4 - .../near/NearCacheSyncUpdateTest.java | 27 +- .../GridCacheRebalancingOrderingTest.java | 2 - ...cheRebalancingPartitionDistributionTest.java | 2 - ...ridCacheAtomicReplicatedMetricsSelfTest.java | 2 - ...eplicatedAtomicMultiNodeFullApiSelfTest.java | 19 - ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 33 -- .../IgniteCacheAtomicExpiryPolicyTest.java | 7 - ...iteCacheAtomicExpiryPolicyWithStoreTest.java | 7 - ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 32 -- ...rimaryWriteOrderOffheapExpiryPolicyTest.java | 31 -- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 32 -- ...teOrderWithStoreOffheapExpiryPolicyTest.java | 31 -- .../IgniteCacheExpiryPolicyAbstractTest.java | 13 +- .../IgniteCacheExpiryPolicyTestSuite.java | 4 - .../IgniteCacheAtomicLoadAllTest.java | 7 - .../IgniteCacheAtomicLoaderWriterTest.java | 7 - ...gniteCacheAtomicNoLoadPreviousValueTest.java | 7 - .../IgniteCacheAtomicNoReadThroughTest.java | 7 - .../IgniteCacheAtomicNoWriteThroughTest.java | 7 - .../IgniteCacheAtomicStoreSessionTest.java | 7 - ...eCacheAtomicStoreSessionWriteBehindTest.java | 7 - ...IgniteCacheJdbcBlobStoreNodeRestartTest.java | 8 - .../GridCacheAtomicLocalMetricsSelfTest.java | 2 - ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 -- ...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 -- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 -- ...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 31 -- ...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 31 -- ...derOffHeapTieredMultiJvmFullApiSelfTest.java | 36 -- ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 -- .../GridCacheSwapScanQueryAbstractSelfTest.java | 3 - ...FailoverAtomicPrimaryWriteOrderSelfTest.java | 50 -- ...tinuousQueryAsyncFailoverAtomicSelfTest.java | 43 ++ ...eContinuousQueryAsyncFilterListenerTest.java | 2 - ...acheContinuousQueryExecuteInPrimaryTest.java | 2 - ...ContinuousQueryFailoverAbstractSelfTest.java | 10 - ...ryFailoverAtomicNearEnabledSelfSelfTest.java | 9 +- ...ousQueryFailoverAtomicOffheapTieredTest.java | 33 ++ ...tomicPrimaryWriteOrderOffheapTieredTest.java | 33 -- ...FailoverAtomicPrimaryWriteOrderSelfTest.java | 44 -- ...usQueryFailoverAtomicReplicatedSelfTest.java | 9 +- ...heContinuousQueryFailoverAtomicSelfTest.java | 36 ++ ...ontinuousQueryOperationFromCallbackTest.java | 2 - .../CacheContinuousQueryOperationP2PTest.java | 2 - .../CacheContinuousQueryOrderingEventTest.java | 2 - ...acheContinuousQueryRandomOperationsTest.java | 2 - .../CacheKeepBinaryIterationTest.java | 2 - ...teCacheClientWriteBehindStoreAtomicTest.java | 7 - .../transactions/DepthFirstSearchTest.java | 18 +- .../CacheVersionedEntryAbstractTest.java | 2 - .../clock/GridTimeSyncProcessorSelfTest.java | 224 --------- .../DataStreamerUpdateAfterLoadTest.java | 18 +- .../ServicePredicateAccessCacheTest.java | 4 +- .../tcp/TcpCommunicationSpiDropNodesTest.java | 1 - .../TcpCommunicationSpiFaultyClientTest.java | 1 - .../configvariations/ConfigVariations.java | 3 - .../testframework/junits/GridAbstractTest.java | 2 - .../junits/common/GridCommonAbstractTest.java | 19 - .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite2.java | 2 - .../IgniteCacheFailoverTestSuite3.java | 2 - ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 14 - .../IgniteCacheFullApiSelfTestSuite.java | 32 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 6 +- .../testsuites/IgniteCacheTestSuite3.java | 4 - .../testsuites/IgniteCacheTestSuite4.java | 4 - .../CacheHibernateBlobStoreNodeRestartTest.java | 8 - .../CacheOperationsWithExpirationTest.java | 2 - .../CacheRandomOperationsMultithreadedTest.java | 2 - .../IgniteCacheCrossCacheJoinRandomTest.java | 2 - ...acheDistributedJoinCollocatedAndNotTest.java | 2 - ...acheDistributedJoinCustomAffinityMapper.java | 2 - .../IgniteCacheDistributedJoinNoIndexTest.java | 2 - ...ributedJoinPartitionedAndReplicatedTest.java | 2 - ...CacheDistributedJoinQueryConditionsTest.java | 2 - ...PartitionedAndReplicatedCollocationTest.java | 2 - ...teCacheJoinPartitionedAndReplicatedTest.java | 2 - .../IgniteCacheQuerySelfTestSuite4.java | 12 +- .../cpp/core-test/config/cache-test.xml | 3 - .../Cache/CacheConfigurationTest.cs | 2 - .../Config/native-client-test-cache.xml | 3 - .../IgniteConfigurationSerializerTest.cs | 1 - .../Apache.Ignite.Core.csproj | 1 - .../Configuration/CacheAtomicWriteOrderMode.cs | 43 -- .../Cache/Configuration/CacheConfiguration.cs | 7 - .../IgniteConfigurationSection.xsd | 12 - .../commands/cache/VisorCacheCommand.scala | 1 - modules/web-console/backend/app/mongo.js | 3 - .../generator/ConfigurationGenerator.js | 5 +- .../generator/PlatformGenerator.js | 1 - .../defaults/Cache.platform.service.js | 4 - .../generator/defaults/Cache.service.js | 3 - .../generator/defaults/Cluster.service.js | 2 - .../states/configuration/caches/concurrency.pug | 11 - .../states/configuration/clusters/time.pug | 10 +- modules/yardstick/README.txt | 1 - .../yardstick/IgniteBenchmarkArguments.java | 15 +- .../org/apache/ignite/yardstick/IgniteNode.java | 3 - 252 files changed, 443 insertions(+), 4825 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index ab0aff2,90955e5..23cbc2b --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@@ -40,11 -40,8 +40,10 @@@ import javax.cache.configuration.Comple import javax.cache.configuration.Factory; import javax.cache.configuration.MutableConfiguration; import javax.cache.expiry.ExpiryPolicy; +import javax.cache.integration.CacheLoader; +import javax.cache.integration.CacheWriter; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; - import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CacheInterceptor; http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 49ae9bb,ca0f201..b88ef6a --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@@ -517,14 -496,10 +505,12 @@@ public class IgniteConfiguration cacheKeyCfg = cfg.getCacheKeyConfiguration(); cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled(); callbackPoolSize = cfg.getAsyncCallbackPoolSize(); - connectorCfg = cfg.getConnectorConfiguration(); classLdr = cfg.getClassLoader(); clientMode = cfg.isClientMode(); - clockSyncFreq = cfg.getClockSyncFrequency(); - clockSyncSamples = cfg.getClockSyncSamples(); + connectorCfg = cfg.getConnectorConfiguration(); consistentId = cfg.getConsistentId(); + daemon = cfg.isDaemon(); + dataStreamerPoolSize = cfg.getDataStreamerThreadPoolSize(); deployMode = cfg.getDeploymentMode(); discoStartupDelay = cfg.getDiscoveryStartupDelay(); failureDetectionTimeout = cfg.getFailureDetectionTimeout(); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index c20ed48,2896784..be8f1fc --- 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 @@@ -3306,14 -3289,12 +3305,14 @@@ public class GridDhtAtomicCache<K, V> e } } catch (ClusterTopologyCheckedException ignored) { - U.warn(msgLog, "Failed to send DHT atomic update response, node left [futId=" + req.futureVersion() + - ", node=" + req.nodeId() + ']'); + if (msgLog.isDebugEnabled()) { + msgLog.debug("Failed to send deferred DHT update response, node left [" + + "futIds=" + msg.futureIds() + ", node=" + primaryId + ']'); + } } catch (IgniteCheckedException e) { - U.error(log, "Failed to send deferred DHT update response to remote node [" + - U.error(msgLog, "Failed to send DHT atomic update response [futId=" + req.futureVersion() + - ", node=" + nodeId + ", res=" + res + ']', e); ++ U.error(log, "Failed to send deferredDHT update response to remote node [" + + "futIds=" + msg.futureIds() + ", node=" + primaryId + ']', e); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java index 6811236,107537c..c469688 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractSingleUpdateRequest.java @@@ -47,10 -106,10 +47,9 @@@ public abstract class GridNearAtomicAbs /** * Constructor. - * - * @param cacheId Cache ID. + * @param cacheId Cache ID. * @param nodeId Node ID. - * @param futVer Future version. - * @param fastMap Fast map scheme flag. + * @param futId Future ID. * @param topVer Topology version. * @param topLocked Topology locked flag. * @param syncMode Synchronization mode. http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java index 9c27135,422a3f9..aebb043 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java @@@ -118,10 -172,10 +118,9 @@@ public class GridNearAtomicFullUpdateRe /** * Constructor. - * - * @param cacheId Cache ID. + * @param cacheId Cache ID. * @param nodeId Node ID. - * @param futVer Future version. - * @param fastMap Fast map scheme flag. + * @param futId Future ID. * @param topVer Topology version. * @param topLocked Topology locked flag. * @param syncMode Synchronization mode. http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java index 849a1a7,d768fa7..2fa810b --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java @@@ -55,10 -55,10 +55,9 @@@ public class GridNearAtomicSingleUpdate /** * Constructor. - * - * @param cacheId Cache ID. + * @param cacheId Cache ID. * @param nodeId Node ID. - * @param futVer Future version. - * @param fastMap Fast map scheme flag. + * @param futId Future ID. * @param topVer Topology version. * @param topLocked Topology locked flag. * @param syncMode Synchronization mode. http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java index 9733440,711a178..b9be484 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java @@@ -73,10 -73,10 +73,9 @@@ public class GridNearAtomicSingleUpdate /** * Constructor. - * - * @param cacheId Cache ID. + * @param cacheId Cache ID. * @param nodeId Node ID. - * @param futVer Future version. - * @param fastMap Fast map scheme flag. + * @param futId Future ID. * @param topVer Topology version. * @param topLocked Topology locked flag. * @param syncMode Synchronization mode. http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheRawVersionedEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersion.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/version/GridCacheVersionEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java index 4306d7e,0000000..e69de29 mode 100644,000000..100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaSnapshotMessage.java http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java index 19c75e6,0000000..e69de29 mode 100644,000000..100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockDeltaVersion.java http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java index 51d396a,0000000..e69de29 mode 100644,000000..100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockServer.java http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java index c10b6d1,0000000..e69de29 mode 100644,000000..100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/clock/GridClockSyncProcessor.java http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java index 3cf88d3,4453dba..bb11b7f --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsUtils.java @@@ -25,8 -22,6 +25,7 @@@ import org.apache.ignite.IgniteExceptio import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.binary.BinaryRawReader; import org.apache.ignite.binary.BinaryRawWriter; - import org.apache.ignite.cache.CacheAtomicWriteOrderMode; +import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.cluster.ClusterTopologyException; @@@ -522,38 -403,6 +521,37 @@@ public class IgfsUtils } } + + /** + * @return Default IGFS cache configuration. + */ + private static CacheConfiguration defaultCacheConfig() { + CacheConfiguration cfg = new CacheConfiguration(); - cfg.setAtomicWriteOrderMode(CacheAtomicWriteOrderMode.PRIMARY); + cfg.setAtomicityMode(TRANSACTIONAL); + cfg.setWriteSynchronizationMode(FULL_SYNC); + cfg.setCacheMode(CacheMode.PARTITIONED); + + return cfg; + } + + /** + * @return Default IGFS meta cache configuration. + */ + private static CacheConfiguration defaultMetaCacheConfig() { + CacheConfiguration cfg = defaultCacheConfig(); + + cfg.setBackups(1); + + return cfg; + } + + /** + * @return Default IGFS data cache configuration. + */ + private static CacheConfiguration defaultDataCacheConfig() { + return defaultCacheConfig(); + } + /** * Create empty directory with the given ID. * http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformConfigurationUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/java/org/apache/ignite/startup/BasicWarmupClosure.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/main/resources/META-INF/classnames.properties ---------------------------------------------------------------------- diff --cc modules/core/src/main/resources/META-INF/classnames.properties index 8c5a72e,c3c2cac..27baf1a --- a/modules/core/src/main/resources/META-INF/classnames.properties +++ b/modules/core/src/main/resources/META-INF/classnames.properties @@@ -984,14 -976,18 +983,13 @@@ org.apache.ignite.internal.processors.c org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectByteArrayImpl org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserCacheObjectImpl org.apache.ignite.internal.processors.cacheobject.IgniteCacheObjectProcessorImpl$UserKeyCacheObjectImpl - org.apache.ignite.internal.processors.clock.GridClockDeltaSnapshotMessage - org.apache.ignite.internal.processors.clock.GridClockDeltaVersion + org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1 org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLA -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1MLAV2 -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1V2 -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2 +org.apache.ignite.internal.processors.closure.GridClosureProcessor$C1 org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLA -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2MLAV2 -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2V2 -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4 +org.apache.ignite.internal.processors.closure.GridClosureProcessor$C2 org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4MLA -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4MLAV2 -org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4V2 +org.apache.ignite.internal.processors.closure.GridClosureProcessor$C4 org.apache.ignite.internal.processors.closure.GridClosureProcessor$T1 org.apache.ignite.internal.processors.closure.GridClosureProcessor$T10 org.apache.ignite.internal.processors.closure.GridClosureProcessor$T11 http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/config/websession/spring-cache-1.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/config/websession/spring-cache-2.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/config/websession/spring-cache-3.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAtomicSingleMessageCountSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 20bd9eb,26346a0..e80083c --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@@ -3410,64 -2915,6 +3403,58 @@@ public abstract class GridCacheAbstract } /** + * @param async If {@code true} uses asynchronous operation. + * @throws Exception In case of error. + */ + private void globalRemoveAll(boolean async) throws Exception { + IgniteCache<String, Integer> cache = jcache(); + + cache.put("key1", 1); + cache.put("key2", 2); + cache.put("key3", 3); + + checkSize(F.asSet("key1", "key2", "key3")); + - atomicClockModeDelay(cache); - + if (async) + cache.removeAllAsync(F.asSet("key1", "key2")).get(); + else + cache.removeAll(F.asSet("key1", "key2")); + + checkSize(F.asSet("key3")); + + checkContainsKey(false, "key1"); + checkContainsKey(false, "key2"); + checkContainsKey(true, "key3"); + + // Put values again. + cache.put("key1", 1); + cache.put("key2", 2); + cache.put("key3", 3); + - atomicClockModeDelay(cache); - + if (async) + jcache(gridCount() > 1 ? 1 : 0).removeAllAsync().get(); + else + jcache(gridCount() > 1 ? 1 : 0).removeAll(); + + assertEquals(0, cache.localSize()); + long entryCnt = hugeRemoveAllEntryCount(); + + for (int i = 0; i < entryCnt; i++) + cache.put(String.valueOf(i), i); + + for (int i = 0; i < entryCnt; i++) + assertEquals(Integer.valueOf(i), cache.get(String.valueOf(i))); + - atomicClockModeDelay(cache); - + if (async) + cache.removeAllAsync().get(); + else + cache.removeAll(); + + for (int i = 0; i < entryCnt; i++) + assertNull(cache.get(String.valueOf(i))); + } + + /** * @return Count of entries to be removed in removeAll() test. */ protected long hugeRemoveAllEntryCount() { http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java index 94e5917,7dff70d..f6fe8df --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java @@@ -173,20 -169,17 +169,17 @@@ public abstract class GridCacheAbstract cacheCfg.setNearConfiguration(nearConfiguration()); cacheCfg.setWriteSynchronizationMode(FULL_SYNC); - if (primaryWriteOrderMode) - cacheCfg.setAtomicWriteOrderMode(PRIMARY); - cacheCfg.setRebalanceMode(SYNC); - if (gridName.endsWith("1")) + if (igniteInstanceName.endsWith("1")) cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_1)); - else if (gridName.endsWith("2")) + else if (igniteInstanceName.endsWith("2")) cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_2)); - else if (gridName.endsWith("3")) + else if (igniteInstanceName.endsWith("3")) cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_3)); - else if (gridName.endsWith("4")) + else if (igniteInstanceName.endsWith("4")) cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_4)); - else if (gridName.endsWith("5")) + else if (igniteInstanceName.endsWith("5")) cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_5)); else cacheCfg.setCacheStoreFactory(singletonFactory(LOCAL_STORE_6)); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java index a12b6b9,138ca70..1365577 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicMessageCountSelfTest.java @@@ -58,12 -55,9 +55,9 @@@ public class GridCacheAtomicMessageCoun /** Client mode flag. */ private boolean client; - /** Write sync mode. */ - private CacheAtomicWriteOrderMode writeOrderMode; - /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); + @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryVersionSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheIncrementTransformTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheInterceptorAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapMultiThreadedUpdateAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java index 0f7ca61,ff7a09c..5073687 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredAbstractSelfTest.java @@@ -71,11 -70,9 +70,9 @@@ public abstract class GridCacheOffHeapT } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName); - ccfg.setAtomicWriteOrderMode(PRIMARY); - ccfg.setMemoryMode(OFFHEAP_TIERED); ccfg.setOffHeapMaxMemory(1024 * 1024); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java index be6e59a,fc41112..0640693 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapTieredEvictionAbstractSelfTest.java @@@ -62,11 -61,9 +61,9 @@@ public abstract class GridCacheOffHeapT } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName); - ccfg.setAtomicWriteOrderMode(PRIMARY); - ccfg.setMemoryMode(OFFHEAP_TIERED); ccfg.setNearConfiguration(null); ccfg.setOffHeapMaxMemory(0); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManagerDeserializationTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionMultinodeTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java index 4bada88,1950c72..2b23b83 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheConfigVariationsFullApiTest.java @@@ -3431,18 -2715,12 +3429,16 @@@ public class IgniteCacheConfigVariation cache.put("key2", 2); cache.put("key3", 3); - atomicClockModeDelay(cache); - if (async) { - IgniteCache asyncCache0 = jcache(gridCount() > 1 ? 1 : 0).withAsync(); + if (oldAsync) { + IgniteCache asyncCache0 = jcache(gridCount() > 1 ? 1 : 0).withAsync(); - asyncCache0.removeAll(); + asyncCache0.removeAll(); - asyncCache0.future().get(); + asyncCache0.future().get(); + } + else + jcache(gridCount() > 1 ? 1 : 0).removeAllAsync().get(); } else jcache(gridCount() > 1 ? 1 : 0).removeAll(); @@@ -3456,16 -2734,10 +3452,14 @@@ for (int i = 0; i < entryCnt; i++) assertEquals(Integer.valueOf(i), cache.get(String.valueOf(i))); - atomicClockModeDelay(cache); - if (async) { - asyncCache.removeAll(); + if (oldAsync) { + asyncCache.removeAll(); - asyncCache.future().get(); + asyncCache.future().get(); + } + else + cache.removeAllAsync().get(); } else cache.removeAll(); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheReadThroughStoreCallTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreValueAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultithreadedFailoverAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTransformEventSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java index a44e49e,3321a2c..f904d3c --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientNodeChangingTopologyTest.java @@@ -1690,14 -1643,9 +1640,7 @@@ public class IgniteCacheClientNodeChang * @throws Exception If failed. */ public void testAtomicPrimaryPutAllMultinode() throws Exception { - multinode(PRIMARY, TestType.PUT_ALL); - } - fail("https://issues.apache.org/jira/browse/IGNITE-1685";); -- - /** - * @throws Exception If failed. - */ - public void testAtomicClockPutAllMultinode() throws Exception { - multinode(CLOCK, TestType.PUT_ALL); + multinode(ATOMIC, TestType.PUT_ALL); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractPartitionedOnlyByteArrayValuesSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java index 2600e7b,a1f7429..8fc9505 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java @@@ -323,9 -291,7 +293,7 @@@ public class GridCacheAtomicNearCacheSe for (int i = 0; i < GRID_CNT; i++) { IgniteCache<Integer, Integer> cache = grid(i).cache(null); - atomicClockModeDelay(cache); - - log.info("Transform [grid=" + grid(i).name() + ", val=" + val + ']'); + log.info("Transform [igniteInstanceName=" + grid(i).name() + ", val=" + val + ']'); cache.invoke(nearKey, new Processor(val)); @@@ -537,9 -501,7 +503,7 @@@ for (int i = 0; i < GRID_CNT; i++) { IgniteCache<Integer, Integer> cache = grid(i).cache(null); - atomicClockModeDelay(cache); - - log.info("Put [grid=" + grid(i).name() + ", val=" + val + ']'); + log.info("Put [igniteInstanceName=" + grid(i).name() + ", val=" + val + ']'); cache.put(nearKey, val); @@@ -638,10 -600,8 +602,8 @@@ } IgniteCache<Integer, Integer> primaryCache = G.ignite( - (String) aff.mapKeyToNode(nearKey).attribute(ATTR_GRID_NAME)).cache(null); + (String) aff.mapKeyToNode(nearKey).attribute(ATTR_IGNITE_INSTANCE_NAME)).cache(null); - atomicClockModeDelay(cache0); - primaryCache.put(nearKey, 2); // This put should see that near entry evicted on grid0 and remove reader. for (int i = 0; i < GRID_CNT; i++) http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheConcurrentPutGetRemove.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePartitionedBackupNodeFailureRecoveryTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java index e7b9fce,f2b87e9..741dba3 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicFailoverSelfTest.java @@@ -32,11 -31,9 +31,9 @@@ import static org.apache.ignite.cache.C */ public class GridCacheAtomicFailoverSelfTest extends GridCacheAbstractFailoverSelfTest { /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName); - ccfg.setAtomicWriteOrderMode(CLOCK); - assertEquals(CacheWriteSynchronizationMode.FULL_SYNC, ccfg.getWriteSynchronizationMode()); return ccfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java index 82b6247,0000000..e69de29 mode 100644,000000..100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.java http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java index 0000000,100f87c..267de66 mode 000000,100644..100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest.java @@@ -1,0 -1,35 +1,35 @@@ + /* + * 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.IgniteConfiguration; + + /** + * + */ + public class GridCacheAtomicLateAffDisabledMultiNodeFullApiSelfTest extends + GridCacheAtomicMultiNodeFullApiSelfTest { + /** {@inheritDoc} */ - @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - IgniteConfiguration cfg = super.getConfiguration(gridName); ++ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { ++ IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + cfg.setLateAffinityAssignment(false); + + return cfg; + } + } http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java index 5458d01,d5e0481..6596d2f --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicMultiNodeP2PDisabledFullApiSelfTest.java @@@ -17,12 -17,10 +17,9 @@@ package org.apache.ignite.internal.processors.cache.distributed.near; - import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; --import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; - import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java index 0c6d2b9,c194eb0..5500da8 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapFullApiSelfTest.java @@@ -57,11 -48,9 +48,9 @@@ public class GridCacheAtomicOffHeapFull } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName); - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - return ccfg; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java index e45b30c,d973144..90eb372 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicOffHeapMultiNodeFullApiSelfTest.java @@@ -58,11 -49,9 +49,9 @@@ public class GridCacheAtomicOffHeapMult } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration ccfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration ccfg = super.cacheConfiguration(igniteInstanceName); - ccfg.setAtomicWriteOrderMode(atomicWriteOrderMode()); - return ccfg; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPartitionedMetricsSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java index 28080b7,0000000..e69de29 mode 100644,000000..100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicPrimaryWriteOrderFairAffinityMultiNodeFullApiSelfTest.java http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java index 5d2ec39,3789873..fcf373b --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearOnlyMultiNodeFullApiSelfTest.java @@@ -106,11 -105,10 +105,10 @@@ public class GridCacheNearOnlyMultiNode } /** {@inheritDoc} */ - @Override protected CacheConfiguration cacheConfiguration(String gridName) throws Exception { - CacheConfiguration cfg = super.cacheConfiguration(gridName); + @Override protected CacheConfiguration cacheConfiguration(String igniteInstanceName) throws Exception { + CacheConfiguration cfg = super.cacheConfiguration(igniteInstanceName); cfg.setWriteSynchronizationMode(FULL_SYNC); - cfg.setAtomicWriteOrderMode(PRIMARY); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheSyncUpdateTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheAtomicReplicatedMetricsSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java index 7f31979,e828a8b..52a8996 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.java @@@ -17,11 -17,9 +17,8 @@@ package org.apache.ignite.internal.processors.cache.distributed.replicated; - import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; --import org.apache.ignite.configuration.CacheConfiguration; - import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/expiry/IgniteCacheExpiryPolicyAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheAtomicLocalMetricsSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java index 2d00d21,0000000..e69de29 mode 100644,000000..100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/clock/GridTimeSyncProcessorSelfTest.java http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java index 96a8a33,11dd423..62582df --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFullApiSelfTestSuite.java @@@ -228,6 -206,10 +205,9 @@@ public class IgniteCacheFullApiSelfTest suite.addTestSuite(GridCacheReplicatedFullApiMultithreadedSelfTest.class); suite.addTestSuite(GridCachePartitionedFullApiMultithreadedSelfTest.class); + // Disabled striped pool. + suite.addTestSuite(GridCacheAtomicNoStripedPoolMultiNodeFullApiSelfTest.class); - suite.addTestSuite(GridCachePartitionedNoStripedPoolMultiNodeFullApiSelfTest.class); + // Other. suite.addTestSuite(GridCacheClearSelfTest.class); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/cpp/core-test/config/cache-test.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Cache/CacheConfigurationTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core.Tests/IgniteConfigurationSerializerTest.cs ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs index 4f48ea5,78de9c9..944e858 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Cache/Configuration/CacheConfiguration.cs @@@ -235,11 -234,7 +235,10 @@@ namespace Apache.Ignite.Core.Cache.Conf /// <param name="reader">The reader.</param> internal CacheConfiguration(IBinaryRawReader reader) { + // Make sure system marshaller is used. + Debug.Assert(((BinaryReader) reader).Marshaller == BinaryUtils.Marshaller); + AtomicityMode = (CacheAtomicityMode) reader.ReadInt(); - AtomicWriteOrderMode = (CacheAtomicWriteOrderMode) reader.ReadInt(); Backups = reader.ReadInt(); CacheMode = (CacheMode) reader.ReadInt(); CopyOnRead = reader.ReadBoolean(); @@@ -300,11 -290,7 +299,10 @@@ /// <param name="writer">The writer.</param> internal void Write(IBinaryRawWriter writer) { + // Make sure system marshaller is used. + Debug.Assert(((BinaryWriter) writer).Marshaller == BinaryUtils.Marshaller); + writer.WriteInt((int) AtomicityMode); - writer.WriteInt((int) AtomicWriteOrderMode); writer.WriteInt(Backups); writer.WriteInt((int) CacheMode); writer.WriteBoolean(CopyOnRead); http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/platforms/dotnet/Apache.Ignite.Core/IgniteConfigurationSection.xsd ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0bfb5851/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ----------------------------------------------------------------------
