Merge branch 'master' into ignite-2523-1 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa3bc450 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa3bc450 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa3bc450 Branch: refs/heads/ignite-2523-1-resp Commit: fa3bc450b2f0248f21f9831969b39a774187a42c Parents: 10387a7 ab1f194 Author: vozerov-gridgain <[email protected]> Authored: Thu Apr 28 14:26:59 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Apr 28 14:26:59 2016 +0300 ---------------------------------------------------------------------- .../datastructures/IgniteLockExample.java | 293 +++ .../ignite/examples/CacheExamplesSelfTest.java | 8 + .../internal/benchmarks/model/IntValue.java | 19 +- .../src/main/java/org/apache/ignite/Ignite.java | 17 + .../java/org/apache/ignite/IgniteCondition.java | 338 +++ .../main/java/org/apache/ignite/IgniteLock.java | 489 +++++ .../configuration/CacheConfiguration.java | 2 + .../ignite/internal/GridKernalContextImpl.java | 4 +- .../ignite/internal/IgniteEventsImpl.java | 11 +- .../apache/ignite/internal/IgniteKernal.java | 21 + .../ignite/internal/IgniteMessagingImpl.java | 7 +- .../org/apache/ignite/internal/IgnitionEx.java | 2 +- .../ignite/internal/binary/BinaryContext.java | 4 + .../internal/binary/BinaryObjectImpl.java | 14 + .../internal/binary/GridBinaryMarshaller.java | 3 + .../internal/direct/DirectMessageReader.java | 5 + .../processors/cache/GridCacheAdapter.java | 448 ++-- .../cache/GridCacheAffinityManager.java | 10 +- .../cache/GridCacheClearAllRunnable.java | 2 +- .../cache/GridCacheConcurrentMap.java | 1996 +----------------- .../cache/GridCacheConcurrentMapImpl.java | 344 +++ .../processors/cache/GridCacheContext.java | 52 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../processors/cache/GridCacheEntrySet.java | 113 - .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheKeySet.java | 104 - .../processors/cache/GridCacheMapEntry.java | 22 +- .../processors/cache/GridCacheProcessor.java | 1 - .../processors/cache/GridCacheProxyImpl.java | 2 +- .../processors/cache/GridCacheUtils.java | 1 - .../processors/cache/GridNoStorageCacheMap.java | 107 + .../processors/cache/IgniteInternalCache.java | 2 +- .../processors/cache/KeyCacheObject.java | 11 + .../processors/cache/KeyCacheObjectImpl.java | 32 +- .../binary/CacheObjectBinaryProcessorImpl.java | 24 +- .../GridDistributedCacheAdapter.java | 4 +- .../distributed/GridDistributedLockRequest.java | 19 +- .../GridDistributedTxRemoteAdapter.java | 1 - .../GridDistributedUnlockRequest.java | 16 +- .../dht/GridCachePartitionedConcurrentMap.java | 191 ++ .../dht/GridClientPartitionTopology.java | 7 - .../distributed/dht/GridDhtCacheAdapter.java | 77 +- .../distributed/dht/GridDhtCacheEntry.java | 25 +- .../distributed/dht/GridDhtLocalPartition.java | 152 +- .../distributed/dht/GridDhtLockRequest.java | 16 +- .../dht/GridDhtPartitionTopology.java | 7 - .../dht/GridDhtPartitionTopologyImpl.java | 281 ++- .../distributed/dht/GridDhtUnlockRequest.java | 15 +- .../distributed/dht/GridNoStorageCacheMap.java | 122 -- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/GridPartitionedSingleGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 75 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 22 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 31 +- .../dht/colocated/GridDhtColocatedCache.java | 13 +- .../dht/preloader/GridDhtPartitionDemander.java | 2 +- .../dht/preloader/GridDhtPartitionSupplier.java | 8 +- .../distributed/near/GridNearCacheAdapter.java | 94 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../distributed/near/GridNearGetRequest.java | 45 +- .../distributed/near/GridNearLockRequest.java | 16 +- .../near/GridNearSingleGetRequest.java | 24 +- .../distributed/near/GridNearUnlockRequest.java | 21 +- .../processors/cache/local/GridLocalCache.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 24 +- .../continuous/CacheContinuousQueryManager.java | 1 + .../cache/transactions/IgniteInternalTx.java | 1 - .../cache/transactions/IgniteTxAdapter.java | 1 - .../cache/transactions/IgniteTxEntry.java | 35 +- .../cacheobject/IgniteCacheObjectProcessor.java | 10 + .../IgniteCacheObjectProcessorImpl.java | 36 +- .../continuous/GridContinuousProcessor.java | 29 +- .../datastructures/DataStructuresProcessor.java | 158 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../datastructures/GridCacheLockEx.java | 52 + .../datastructures/GridCacheLockImpl.java | 1538 ++++++++++++++ .../datastructures/GridCacheLockState.java | 353 ++++ .../datastructures/GridCacheSemaphoreImpl.java | 33 + .../platform/PlatformAbstractBootstrap.java | 17 +- .../processors/platform/PlatformBootstrap.java | 6 +- .../platform/PlatformContextImpl.java | 1 - .../PlatformDefaultJavaObjectFactory.java | 62 + .../processors/platform/PlatformIgnition.java | 18 +- .../platform/PlatformJavaObjectFactoryEx.java | 36 + .../PlatformJavaObjectFactoryProxy.java | 192 ++ .../PlatformJavaObjectSingletonFactory.java | 48 + .../platform/PlatformNoopProcessor.java | 10 + .../processors/platform/PlatformProcessor.java | 19 + .../platform/PlatformProcessorImpl.java | 41 +- .../query/PlatformContinuousQueryImpl.java | 50 +- .../utils/PlatformConfigurationUtils.java | 98 +- .../platform/utils/PlatformUtils.java | 69 + .../ignite/internal/util/IgniteUtils.java | 5 +- .../internal/util/PartitionedReadOnlySet.java | 71 + .../util/StripedCompositeReadWriteLock.java | 10 + .../ignite/internal/util/lang/GridFunc.java | 3 +- .../ignite/internal/visor/cache/VisorCache.java | 6 +- .../platform/PlatformJavaObjectFactory.java | 36 + .../extensions/communication/MessageReader.java | 9 + .../ignite/spi/IgniteNodeValidationResult.java | 8 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 250 ++- .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../messages/TcpDiscoveryAbstractMessage.java | 4 +- .../TcpDiscoveryCustomEventMessage.java | 13 +- .../TcpDiscoveryJoinRequestMessage.java | 16 +- .../TcpDiscoveryStatusCheckMessage.java | 18 +- .../resources/META-INF/classnames.properties | 2 + .../IgniteClientReconnectAtomicsTest.java | 58 + .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../cache/GridCacheTtlManagerSelfTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 3 +- .../IgniteDynamicClientCacheStartSelfTest.java | 10 - .../IgniteTxStoreExceptionAbstractSelfTest.java | 8 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 2 +- ...eAbstractDataStructuresFailoverSelfTest.java | 208 +- ...actQueueFailoverDataConsistencySelfTest.java | 2 +- .../GridCacheQueueCleanupSelfTest.java | 4 +- .../GridCacheSequenceApiSelfAbstractTest.java | 37 - .../GridCacheSetAbstractSelfTest.java | 5 +- .../GridCacheSetFailoverAbstractSelfTest.java | 8 +- .../IgniteClientDataStructuresAbstractTest.java | 70 + .../IgniteDataStructureUniqueNameTest.java | 16 +- .../IgniteLockAbstractSelfTest.java | 1629 ++++++++++++++ .../IgniteSemaphoreAbstractSelfTest.java | 31 + .../local/IgniteLocalLockSelfTest.java | 110 + .../IgnitePartitionedLockSelfTest.java | 33 + .../IgnitePartitionedQueueNoBackupsTest.java | 6 +- .../IgnitePartitionedSetNoBackupsSelfTest.java | 6 +- .../IgniteReplicatedLockSelfTest.java | 33 + .../distributed/GridCacheLockAbstractTest.java | 2 +- .../distributed/dht/GridCacheDhtTestUtils.java | 9 +- .../near/GridCacheNearOneNodeSelfTest.java | 4 +- .../processors/igfs/IgfsAbstractSelfTest.java | 10 +- .../cache/GridCacheDataStructuresLoadTest.java | 53 + .../platform/PlatformCacheEntryEventFilter.java | 193 ++ .../PlatformCacheEntryEventFilterFactory.java | 59 + ...latformDefaultJavaObjectFactorySelfTest.java | 185 ++ .../PlatformJavaObjectFactoryProxySelfTest.java | 220 ++ .../platform/PlatformStartIgniteTask.java | 1 + .../ignite/platform/PlatformStopIgniteTask.java | 1 + .../platform/javaobject/TestJavaObject.java | 271 +++ .../javaobject/TestJavaObjectNoDefaultCtor.java | 49 + .../TestJavaObjectNoDefaultCtorFactory.java | 68 + .../ignite/testframework/junits/IgniteMock.java | 10 + .../junits/multijvm/IgniteProcessProxy.java | 7 + .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheDataStructuresSelfTestSuite.java | 6 + .../testsuites/IgnitePlatformsTestSuite.java | 41 + .../common/include/ignite/common/concurrent.h | 176 +- .../cpp/common/include/ignite/common/exports.h | 2 + .../cpp/common/include/ignite/common/java.h | 5 + .../platforms/cpp/common/project/vs/module.def | 2 + modules/platforms/cpp/common/src/concurrent.cpp | 13 +- modules/platforms/cpp/common/src/exports.cpp | 8 + modules/platforms/cpp/common/src/java.cpp | 30 + .../cpp/core-test/src/concurrent_test.cpp | 93 + .../Apache.Ignite.Core.Tests.csproj | 2 + .../Cache/CacheConfigurationTest.cs | 49 + .../Cache/CacheNearTest.cs | 188 ++ .../Cache/Query/CacheLinqTest.cs | 2 - .../Continuous/ContinuousQueryJavaFilterTest.cs | 323 +++ .../Apache.Ignite.Core.Tests/EventsTest.cs | 4 +- .../IgniteConfigurationSerializerTest.cs | 3 +- .../IgniteConfigurationTest.cs | 2 + .../dotnet/Apache.Ignite.Core.Tests/app.config | 4 + .../Apache.Ignite.Core.csproj | 16 +- .../Cache/Configuration/CacheConfiguration.cs | 15 + .../Configuration/NearCacheConfiguration.cs | 75 + .../Cache/Eviction/EvictionPolicyBase.cs | 126 ++ .../Cache/Eviction/FifoEvictionPolicy.cs | 39 + .../Cache/Eviction/IEvictionPolicy.cs | 32 + .../Cache/Eviction/LruEvictionPolicy.cs | 39 + .../Continuous/ContinuousQueryExtensions.cs | 42 + .../Apache.Ignite.Core/Events/CacheEvent.cs | 9 +- .../dotnet/Apache.Ignite.Core/IIgnite.cs | 42 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 34 + .../Impl/Binary/BinaryUtils.cs | 3 + .../Impl/Binary/Marshaller.cs | 2 + .../Cache/Event/JavaCacheEntryEventFilter.cs | 49 + .../Continuous/ContinuousQueryHandleImpl.cs | 17 +- .../Common/PlatformJavaObjectFactoryProxy.cs | 106 + .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 62 + .../Apache.Ignite.Core/Impl/IgniteProxy.cs | 25 + .../Impl/Unmanaged/IgniteJniNativeMethods.cs | 6 + .../Impl/Unmanaged/UnmanagedUtils.cs | 32 + .../Apache.Ignite.Core/Interop/JavaObject.cs | 80 + .../ignite/schema/generator/CodeGenerator.java | 30 +- .../ignite/schema/generator/XmlGenerator.java | 2 +- .../org/apache/ignite/IgniteSpringBean.java | 11 + 190 files changed, 11294 insertions(+), 3190 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa3bc450/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa3bc450/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 c48787c,ee909e6..4bbf47a --- 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 @@@ -190,11 -189,16 +189,16 @@@ public class GridDhtAtomicCache<K, V> e return new GridDhtAtomicCacheEntry(ctx, topVer, key, hash, val); } - }); + }; + } + + /** {@inheritDoc} */ + @Override protected void init() { + super.init(); - updateReplyClos = new CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse>() { + updateReplyClos = new CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicUpdateResponse>() { @SuppressWarnings("ThrowableResultOfMethodCallIgnored") - @Override public void apply(GridNearAtomicUpdateRequest req, GridNearAtomicUpdateResponse res) { + @Override public void apply(GridNearAtomicAbstractUpdateRequest req, GridNearAtomicUpdateResponse res) { if (ctx.config().getAtomicWriteOrderMode() == CLOCK) { assert req.writeSynchronizationMode() != FULL_ASYNC : req; http://git-wip-us.apache.org/repos/asf/ignite/blob/fa3bc450/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa3bc450/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ----------------------------------------------------------------------
