You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/25 13:31:30 UTC
[31/51] [abbrv] ignite git commit: ignite-2523: Merge.
ignite-2523: Merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/daf501cb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/daf501cb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/daf501cb
Branch: refs/heads/ignite-2523
Commit: daf501cb46e5d7076a267133bcd7f75aa09243c7
Parents: 1256485 bcaa0a8
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri Feb 19 16:25:32 2016 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri Feb 19 16:25:32 2016 +0300
----------------------------------------------------------------------
.gitignore | 3 +
DEVNOTES.txt | 4 +-
.../apache/ignite/IgniteSystemProperties.java | 12 +-
.../ignite/binary/BinaryBasicNameMapper.java | 2 +-
.../apache/ignite/cache/CacheMemoryMode.java | 2 +
.../cache/query/CacheQueryEntryEvent.java | 48 +
.../ignite/internal/GridJobCancelRequest.java | 5 +
.../ignite/internal/GridJobExecuteRequest.java | 5 +
.../ignite/internal/GridJobExecuteResponse.java | 5 +
.../ignite/internal/GridJobSiblingsRequest.java | 5 +
.../internal/GridJobSiblingsResponse.java | 5 +
.../internal/GridMessageListenHandler.java | 16 +
.../ignite/internal/GridTaskCancelRequest.java | 5 +
.../ignite/internal/GridTaskSessionRequest.java | 5 +
.../apache/ignite/internal/IgniteKernal.java | 14 +-
.../ignite/internal/MarshallerContextImpl.java | 3 +-
.../internal/binary/BinaryClassDescriptor.java | 22 +
.../ignite/internal/binary/BinaryContext.java | 1 +
.../internal/binary/BinaryEnumObjectImpl.java | 5 +
.../internal/binary/BinaryObjectImpl.java | 5 +
.../binary/BinaryObjectOffheapImpl.java | 5 +
.../internal/binary/BinaryReaderExImpl.java | 8 +-
.../ignite/internal/binary/BinaryUtils.java | 57 +-
.../ignite/internal/binary/BinaryWriteMode.java | 3 +
.../internal/binary/BinaryWriterExImpl.java | 34 +
.../internal/binary/GridBinaryMarshaller.java | 3 +
.../binary/builder/BinaryBuilderSerializer.java | 16 +-
.../binary/builder/BinaryObjectBuilderImpl.java | 12 +-
.../binary/builder/BinaryValueWithType.java | 3 +-
.../checkpoint/GridCheckpointRequest.java | 5 +
.../managers/communication/GridIoMessage.java | 5 +
.../communication/GridIoUserMessage.java | 5 +
.../deployment/GridDeploymentInfoBean.java | 5 +
.../deployment/GridDeploymentRequest.java | 5 +
.../deployment/GridDeploymentResponse.java | 5 +
.../eventstorage/GridEventStorageMessage.java | 5 +
.../affinity/AffinityTopologyVersion.java | 5 +
.../affinity/GridAffinityAssignment.java | 36 +-
.../affinity/GridAffinityAssignmentCache.java | 2 +-
.../cache/CacheEntryInfoCollection.java | 5 +
.../cache/CacheEntryPredicateAdapter.java | 5 +
.../cache/CacheEntryPredicateContainsValue.java | 8 +-
.../cache/CacheEntrySerializablePredicate.java | 5 +
.../cache/CacheEvictableEntryImpl.java | 6 +-
.../processors/cache/CacheEvictionEntry.java | 5 +
.../cache/CacheInvokeDirectResult.java | 5 +
.../processors/cache/CacheLazyEntry.java | 3 +
.../cache/CacheObjectByteArrayImpl.java | 5 +
.../processors/cache/CacheObjectImpl.java | 5 +
.../processors/cache/GridCacheAdapter.java | 58 +-
.../cache/GridCacheAffinityManager.java | 30 +-
.../cache/GridCacheClearAllRunnable.java | 2 +-
.../processors/cache/GridCacheContext.java | 4 +-
.../cache/GridCacheDeploymentManager.java | 8 +-
.../processors/cache/GridCacheEntryEx.java | 13 +-
.../processors/cache/GridCacheEntryInfo.java | 5 +
.../cache/GridCacheEvictionManager.java | 6 +-
.../processors/cache/GridCacheMapEntry.java | 325 +++--
.../processors/cache/GridCacheMessage.java | 5 +
.../processors/cache/GridCacheMvccManager.java | 42 +-
.../processors/cache/GridCachePreloader.java | 6 +
.../cache/GridCachePreloaderAdapter.java | 5 +
.../processors/cache/GridCacheProcessor.java | 22 +-
.../processors/cache/GridCacheReturn.java | 5 +
.../processors/cache/GridCacheSwapManager.java | 46 +-
.../processors/cache/GridCacheTtlManager.java | 75 +-
.../processors/cache/GridCacheUtils.java | 21 +-
.../processors/cache/KeyCacheObjectImpl.java | 5 +
.../binary/CacheObjectBinaryProcessorImpl.java | 21 +-
.../CacheDataStructuresManager.java | 4 +-
.../dht/GridClientPartitionTopology.java | 5 +
.../distributed/dht/GridDhtCacheAdapter.java | 101 +-
.../distributed/dht/GridDhtCacheEntry.java | 2 +-
.../distributed/dht/GridDhtEmbeddedFuture.java | 13 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 176 ++-
.../distributed/dht/GridDhtGetSingleFuture.java | 476 +++++++
.../distributed/dht/GridDhtLocalPartition.java | 76 +-
.../distributed/dht/GridDhtPartitionState.java | 2 +-
.../dht/GridDhtPartitionTopology.java | 5 +
.../dht/GridDhtPartitionTopologyImpl.java | 25 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 40 +-
.../dht/atomic/GridDhtAtomicCache.java | 86 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 85 +-
.../dht/colocated/GridDhtColocatedCache.java | 40 +-
.../dht/preloader/GridDhtPartitionDemander.java | 3 +-
.../preloader/GridDhtPartitionExchangeId.java | 5 +
.../GridDhtPartitionsExchangeFuture.java | 6 +
.../dht/preloader/GridDhtPreloader.java | 16 +
.../distributed/near/CacheVersionedValue.java | 5 +
.../distributed/near/GridNearCacheEntry.java | 4 +-
...arOptimisticSerializableTxPrepareFuture.java | 4 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 20 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 67 +-
.../cache/query/GridCacheQueryManager.java | 454 ++++--
.../cache/query/GridCacheSqlQuery.java | 5 +
.../continuous/CacheContinuousQueryEntry.java | 5 +
.../continuous/CacheContinuousQueryEvent.java | 17 +-
.../continuous/CacheContinuousQueryHandler.java | 121 +-
.../CacheContinuousQueryListener.java | 5 +-
.../continuous/CacheContinuousQueryManager.java | 179 ++-
.../cache/transactions/IgniteTxEntry.java | 5 +
.../cache/transactions/IgniteTxKey.java | 5 +
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/transactions/TxEntryValueHolder.java | 5 +
.../cache/version/GridCacheVersion.java | 5 +
.../IgniteCacheObjectProcessorImpl.java | 2 +-
.../clock/GridClockDeltaSnapshotMessage.java | 5 +
.../processors/clock/GridClockDeltaVersion.java | 5 +
.../continuous/GridContinuousMessage.java | 5 +
.../continuous/GridContinuousProcessor.java | 60 +-
.../datastreamer/DataStreamerEntry.java | 5 +
.../datastreamer/DataStreamerImpl.java | 6 +-
.../datastreamer/DataStreamerRequest.java | 5 +
.../datastreamer/DataStreamerResponse.java | 5 +
.../datastructures/DataStructuresProcessor.java | 1 +
.../GridCacheAtomicReferenceImpl.java | 68 +-
.../processors/igfs/IgfsAckMessage.java | 5 +
.../internal/processors/igfs/IgfsBlockKey.java | 5 +
.../processors/igfs/IgfsBlocksMessage.java | 5 +
.../processors/igfs/IgfsDeleteMessage.java | 5 +
.../processors/igfs/IgfsFileAffinityRange.java | 5 +
.../igfs/IgfsFragmentizerRequest.java | 5 +
.../igfs/IgfsFragmentizerResponse.java | 5 +
.../internal/processors/igfs/IgfsProcessor.java | 14 +
.../processors/igfs/IgfsSyncMessage.java | 5 +
.../platform/PlatformNoopProcessor.java | 10 +
.../processors/platform/PlatformProcessor.java | 20 +
.../platform/PlatformProcessorImpl.java | 35 +-
.../callback/PlatformCallbackGateway.java | 30 +
.../callback/PlatformCallbackUtils.java | 16 +-
.../datastructures/PlatformAtomicReference.java | 141 ++
.../datastructures/PlatformAtomicSequence.java | 122 ++
.../messages/GridQueryCancelRequest.java | 5 +
.../twostep/messages/GridQueryFailResponse.java | 5 +
.../messages/GridQueryNextPageRequest.java | 5 +
.../messages/GridQueryNextPageResponse.java | 5 +
.../h2/twostep/messages/GridQueryRequest.java | 5 +
.../handlers/task/GridTaskResultRequest.java | 5 +
.../handlers/task/GridTaskResultResponse.java | 5 +
.../service/GridServiceProcessor.java | 101 +-
.../processors/service/GridServiceProxy.java | 22 +-
.../ignite/internal/util/GridByteArrayList.java | 5 +
.../ignite/internal/util/GridLongList.java | 5 +
.../internal/util/GridMessageCollection.java | 5 +
.../internal/util/UUIDCollectionMessage.java | 5 +
.../util/future/GridCompoundFuture.java | 2 +-
.../util/nio/GridNioFinishedFuture.java | 5 +
.../ignite/internal/util/nio/GridNioFuture.java | 7 +-
.../internal/util/nio/GridNioFutureImpl.java | 5 +
.../util/nio/GridNioRecoveryDescriptor.java | 2 +
.../ignite/internal/util/nio/GridNioServer.java | 150 +-
.../util/nio/GridSelectorNioSessionImpl.java | 2 +-
.../util/nio/SelectedSelectionKeySet.java | 132 ++
.../org/apache/ignite/lang/IgniteBiTuple.java | 6 +-
.../optimized/OptimizedClassDescriptor.java | 37 +-
.../optimized/OptimizedMarshallerUtils.java | 3 +
.../optimized/OptimizedObjectInputStream.java | 15 +-
.../optimized/OptimizedObjectOutputStream.java | 4 +-
.../extensions/communication/Message.java | 5 +
.../jobstealing/JobStealingRequest.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java | 15 +
.../ignite/spi/discovery/tcp/ServerImpl.java | 5 +
.../TcpDiscoveryCustomEventMessage.java | 10 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 4 +-
.../internal/GridAffinityNoCacheSelfTest.java | 13 +-
.../GridMultithreadedJobStealingSelfTest.java | 3 +-
.../internal/GridNodeMetricsLogSelfTest.java | 98 ++
...eClientReconnectContinuousProcessorTest.java | 32 +-
.../BinaryObjectBuilderAdditionalSelfTest.java | 91 +-
...naryObjectBuilderDefaultMappersSelfTest.java | 30 +-
.../GridCommunicationSendMessageSelfTest.java | 5 +
.../communication/GridIoManagerSelfTest.java | 5 +
.../cache/CacheConfigurationLeakTest.java | 62 +
.../cache/CacheEnumOperationsAbstractTest.java | 307 ++++
.../CacheEnumOperationsSingleNodeTest.java | 28 +
.../cache/CacheEnumOperationsTest.java | 28 +
.../cache/GridCacheDeploymentSelfTest.java | 78 +-
.../GridCacheOffHeapValuesEvictionSelfTest.java | 210 +++
.../processors/cache/GridCacheTestEntryEx.java | 5 +-
.../IgniteCacheEntryListenerAbstractTest.java | 454 ++++--
...cheEntryListenerAtomicOffheapTieredTest.java | 32 +
...cheEntryListenerAtomicOffheapValuesTest.java | 32 +
...niteCacheEntryListenerExpiredEventsTest.java | 202 +++
...teCacheEntryListenerTxOffheapTieredTest.java | 32 +
...teCacheEntryListenerTxOffheapValuesTest.java | 32 +
.../cache/IgniteCacheEntryListenerTxTest.java | 1 +
.../GridDataStreamerImplSelfTest.java | 49 +-
.../IgniteCacheNearRestartRollbackSelfTest.java | 278 ++++
.../IgniteTxPreloadAbstractTest.java | 2 +-
.../near/GridCacheNearReadersSelfTest.java | 19 +-
.../GridCacheReplicatedPreloadSelfTest.java | 211 ++-
.../GridCacheEvictableEntryEqualsSelfTest.java | 85 ++
...CacheAtomicLocalOffheapExpiryPolicyTest.java | 30 +
...gniteCacheAtomicOffheapExpiryPolicyTest.java | 30 +
...rimaryWriteOrderOffheapExpiryPolicyTest.java | 31 +
...teOrderWithStoreOffheapExpiryPolicyTest.java | 31 +
...AtomicReplicatedOffheapExpiryPolicyTest.java | 30 +
...eAtomicWithStoreOffheapExpiryPolicyTest.java | 30 +
.../IgniteCacheExpiryPolicyAbstractTest.java | 169 ++-
.../IgniteCacheExpiryPolicyTestSuite.java | 13 +
...niteCacheTxLocalOffheapExpiryPolicyTest.java | 30 +
.../IgniteCacheTxOffheapExpiryPolicyTest.java | 30 +
...acheTxReplicatedOffheapExpiryPolicyTest.java | 30 +
...CacheTxWithStoreOffheapExpiryPolicyTest.java | 30 +
.../continuous/CacheContinuousBatchAckTest.java | 355 +++++
...heContinuousBatchForceServerModeAckTest.java | 80 ++
...CacheContinuousQueryCounterAbstractTest.java | 612 ++++++++
...inuousQueryCounterPartitionedAtomicTest.java | 41 +
...ContinuousQueryCounterPartitionedTxTest.java | 41 +
...tinuousQueryCounterReplicatedAtomicTest.java | 41 +
...eContinuousQueryCounterReplicatedTxTest.java | 41 +
...ContinuousQueryFailoverAbstractSelfTest.java | 10 +
...tomicPrimaryWriteOrderOffheapTieredTest.java | 33 +
...tinuousQueryFailoverTxOffheapTieredTest.java | 32 +
.../CacheContinuousQueryLostPartitionTest.java | 4 +-
...acheContinuousQueryRandomOperationsTest.java | 1308 ++++++++++++++++++
...ridCacheContinuousQueryAbstractSelfTest.java | 19 +-
...eContinuousQueryAtomicOffheapTieredTest.java | 32 +
...eContinuousQueryAtomicOffheapValuesTest.java | 32 +
...CacheContinuousQueryTxOffheapTieredTest.java | 32 +
...CacheContinuousQueryTxOffheapValuesTest.java | 32 +
...IgniteCacheContinuousQueryReconnectTest.java | 192 +++
.../igfs/IgfsProcessorValidationSelfTest.java | 27 +
.../GridServiceSerializationSelfTest.java | 149 ++
.../apache/ignite/lang/GridTupleSelfTest.java | 42 +-
.../communication/GridTestMessage.java | 5 +
...namicProxySerializationMultiJvmSelfTest.java | 131 ++
.../GridSessionCheckpointAbstractSelfTest.java | 6 +-
.../spi/communication/GridTestMessage.java | 5 +
.../tcp/TcpClientDiscoverySpiSelfTest.java | 2 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 2 +-
.../junits/common/GridCommonAbstractTest.java | 2 +-
.../junits/multijvm/IgniteNodeRunner.java | 16 +-
.../junits/multijvm/IgniteProcessProxy.java | 19 +-
.../ignite/testsuites/IgniteBasicTestSuite.java | 5 +
.../testsuites/IgniteBinaryBasicTestSuite.java | 2 +
.../testsuites/IgniteBinaryCacheTestSuite.java | 2 +
.../IgniteCacheEvictionSelfTestSuite.java | 4 +-
.../testsuites/IgniteCacheRestartTestSuite.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 10 +
.../testsuites/IgniteCacheTestSuite2.java | 6 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../p2p/CacheDeploymentAffinityKeyMapper.java | 35 +
.../CacheDeploymentAlwaysTruePredicate2.java | 30 +
...oymentCacheEntryEventSerializableFilter.java | 32 +
.../p2p/CacheDeploymentCacheEntryListener.java | 31 +
...CacheDeploymentCachePluginConfiguration.java | 74 +
...heDeploymentStoreSessionListenerFactory.java | 83 ++
.../hadoop/fs/BasicHadoopFileSystemFactory.java | 22 +-
.../fs/CachingHadoopFileSystemFactory.java | 2 +-
.../fs/KerberosHadoopFileSystemFactory.java | 217 +++
.../hadoop/jobtracker/HadoopJobTracker.java | 5 +-
...KerberosHadoopFileSystemFactorySelfTest.java | 121 ++
.../testsuites/IgniteHadoopTestSuite.java | 3 +
.../processors/query/h2/IgniteH2Indexing.java | 95 +-
.../query/h2/sql/GridSqlAggregateFunction.java | 12 +-
.../query/h2/sql/GridSqlQueryParser.java | 30 +-
.../query/h2/twostep/GridMergeIndex.java | 32 +-
.../h2/twostep/GridMergeIndexUnsorted.java | 19 +-
.../query/h2/twostep/GridMergeTable.java | 16 +-
.../h2/twostep/GridReduceQueryExecutor.java | 2 +-
.../h2/twostep/msg/GridH2ValueMessage.java | 5 +
.../cache/CacheQueryBuildValueTest.java | 144 ++
.../CacheQueryOffheapEvictDataLostTest.java | 138 ++
.../CacheRandomOperationsMultithreadedTest.java | 507 +++++++
.../cache/IgniteCacheAbstractQuerySelfTest.java | 10 +-
.../cache/IgniteClientReconnectQueriesTest.java | 9 +-
.../near/IgniteCacheQueryNodeFailTest.java | 148 ++
.../h2/GridIndexingSpiAbstractSelfTest.java | 43 +-
.../IgniteCacheQuerySelfTestSuite.java | 33 +
.../IgniteCacheWithIndexingTestSuite.java | 2 +
.../cpp/common/include/ignite/common/exports.h | 21 +-
.../cpp/common/include/ignite/common/java.h | 53 +-
.../platforms/cpp/common/project/vs/module.def | 15 +-
modules/platforms/cpp/common/src/exports.cpp | 58 +-
modules/platforms/cpp/common/src/java.cpp | 209 ++-
modules/platforms/cpp/core-test/Makefile.am | 1 +
.../cpp/core-test/project/vs/core-test.vcxproj | 1 +
.../project/vs/core-test.vcxproj.filters | 3 +
.../cpp/core-test/src/cache_query_test.cpp | 45 +
.../platforms/cpp/core-test/src/cache_test.cpp | 12 +
.../cpp/core-test/src/interop_memory_test.cpp | 95 ++
.../ignite/cache/query/query_fields_row.h | 2 +-
.../include/ignite/impl/ignite_environment.h | 19 +-
.../cpp/core/src/impl/cache/cache_impl.cpp | 2 +-
.../cpp/core/src/impl/ignite_environment.cpp | 30 +-
.../Apache.Ignite.Core.Tests.csproj | 8 +
.../Binary/BinarySelfTest.cs | 32 +
.../Binary/BinaryStructureTest.cs | 38 +-
.../Query/CacheQueriesCodeConfigurationTest.cs | 4 +-
.../DataStructures/AtomicReferenceTest.cs | 239 ++++
.../DataStructures/AtomicSequenceTest.cs | 131 ++
.../Apache.Ignite.Core.Tests/FutureTest.cs | 1 +
.../IgniteConfigurationSectionTest.cs | 69 +
.../IgniteConfigurationSerializerTest.cs | 554 ++++++++
.../Process/IgniteProcess.cs | 16 +
.../ProcessExtensions.cs | 78 ++
.../Apache.Ignite.Core.Tests/ReconnectTest.cs | 96 ++
.../dotnet/Apache.Ignite.Core.Tests/app.config | 54 +
.../Apache.Ignite.Core.csproj | 16 +
.../Binary/IBinarySerializer.cs | 6 +-
.../Cache/CachePartialUpdateException.cs | 1 -
.../Cache/Configuration/QueryEntity.cs | 4 +-
.../Cache/Store/CacheStoreAdapter.cs | 1 -
.../Apache.Ignite.Core/Cluster/ICluster.cs | 14 +
.../Common/ClientDisconnectedException.cs | 97 ++
.../Compute/ComputeTaskAdapter.cs | 1 -
.../Compute/ComputeTaskSplitAdapter.cs | 1 -
.../DataStructures/IAtomicReference.cs | 64 +
.../DataStructures/IAtomicSequence.cs | 69 +
.../Multicast/TcpDiscoveryMulticastIpFinder.cs | 4 +-
.../Tcp/Static/TcpDiscoveryStaticIpFinder.cs | 6 +-
.../Apache.Ignite.Core/Events/EventBase.cs | 1 -
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 28 +
.../IgniteConfigurationSection.cs | 80 ++
.../IgniteConfigurationSection.xsd | 281 ++++
.../dotnet/Apache.Ignite.Core/Ignition.cs | 39 +
.../Impl/Binary/BinaryReader.cs | 2 +-
.../Impl/Binary/BinaryUtils.cs | 168 ++-
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 2 +-
.../Impl/Common/BooleanLowerCaseConverter.cs | 60 +
.../Apache.Ignite.Core/Impl/Common/Future.cs | 14 +-
.../Impl/Common/FutureType.cs | 18 +-
.../Common/IgniteConfigurationXmlSerializer.cs | 407 ++++++
.../Impl/Common/TypeStringConverter.cs | 115 ++
.../Closure/ComputeAbstractClosureTask.cs | 1 -
.../Impl/Compute/ComputeTaskHolder.cs | 2 +-
.../Impl/DataStructures/AtomicReference.cs | 92 ++
.../Impl/DataStructures/AtomicSequence.cs | 90 ++
.../Impl/Events/EventTypeConverter.cs | 133 ++
.../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 110 +-
.../Apache.Ignite.Core/Impl/Handle/Handle.cs | 8 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 82 +-
.../Apache.Ignite.Core/Impl/IgniteProxy.cs | 19 +
.../Impl/Memory/PlatformMemoryStream.cs | 320 ++++-
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 37 +
.../Impl/Unmanaged/UnmanagedCallbackHandlers.cs | 3 +
.../Impl/Unmanaged/UnmanagedCallbacks.cs | 32 +-
.../Impl/Unmanaged/UnmanagedUtils.cs | 79 ++
.../commands/tasks/VisorTasksCommand.scala | 4 +-
.../scala/org/apache/ignite/visor/visor.scala | 4 +
modules/yardstick/.gitignore | 2 +
.../yardstick/cache/IgniteInvokeBenchmark.java | 65 +
.../cache/IgniteInvokeTxBenchmark.java | 30 +
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 2 +-
parent/pom.xml | 93 +-
pom.xml | 2 +-
348 files changed, 15613 insertions(+), 1578 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/daf501cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index cdf579d,b6f5adf..7e3887f
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@@ -614,25 -583,12 +614,30 @@@ public abstract class GridCacheMessage
}
}
+ /** {@inheritDoc} */
+ @Override public void onAckReceived() {
+ // No-op.
+ }
+
/**
+ * @param bytes Byte array to unmarshal.
+ * @param ctx Context.
+ * @param ldr Loader.
+ * @return Unmarshalled object.
+ * @throws IgniteCheckedException If failed.
+ */
+ @Nullable protected <T> T unmarshal(@Nullable byte[] bytes, GridCacheSharedContext ctx, ClassLoader ldr)
+ throws IgniteCheckedException {
+ assert ldr != null;
+ assert ctx != null;
+
+ if (bytes == null)
+ return null;
+
+ return ctx.marshaller().unmarshal(bytes, ldr);
+ }
+
+ /**
* @param byteCol Collection to unmarshal.
* @param ctx Context.
* @param ldr Loader.
http://git-wip-us.apache.org/repos/asf/ignite/blob/daf501cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/daf501cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index e19a11a,58d704d..6823d77
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@@ -35,9 -35,9 +35,10 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.GridCacheAtomicFuture;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
+import org.apache.ignite.internal.processors.cache.GridCacheMessage;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
+ import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryListener;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
@@@ -376,11 -374,10 +398,11 @@@ public class GridDhtAtomicUpdateFuture
cctx.mvcc().removeAtomicFuture(version());
if (err != null) {
- if (!mappings.isEmpty()) {
+ if (!mappings.isEmpty() && lsnrs != null) {
Collection<KeyCacheObject> hndKeys = new ArrayList<>(keys.size());
- exit: for (GridDhtAtomicUpdateRequest req : mappings.values()) {
+ exit:
+ for (GridDhtAtomicUpdateRequest req : mappings.values()) {
for (int i = 0; i < req.size(); i++) {
KeyCacheObject key = req.key(i);