Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-443
Conflicts:
modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/163297ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/163297ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/163297ea
Branch: refs/heads/ignite-443
Commit: 163297ea7724989fc31a22ff6684b8e75f26a264
Parents: 2f17a25 077c9cc
Author: nikolay_tikhonov <ntikho...@gridgain.com>
Authored: Wed Mar 11 17:36:48 2015 +0300
Committer: nikolay_tikhonov <ntikho...@gridgain.com>
Committed: Wed Mar 11 17:36:48 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 7 +
examples/pom-standalone.xml | 2 +-
.../apache/ignite/gridify/AbstractAopTest.java | 4 +-
.../spi/checkpoint/s3/S3CheckpointData.java | 62 +-
.../spi/checkpoint/s3/S3CheckpointSpi.java | 8 +-
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +-
.../s3/S3CheckpointSpiStartStopSelfTest.java | 2 +-
.../ClientAbstractMultiNodeSelfTest.java | 12 +-
.../rest/protocols/tcp/MockNioSession.java | 7 +-
.../ignite/codegen/MessageCodeGenerator.java | 6 +-
modules/core/pom.xml | 56 +-
.../org/apache/ignite/IgniteTransactions.java | 2 +-
.../apache/ignite/cache/CacheInterceptor.java | 34 +-
.../ignite/cache/CacheInterceptorAdapter.java | 12 +-
.../org/apache/ignite/cache/CacheManager.java | 1 -
.../cache/CachePartialUpdateException.java | 3 +
.../java/org/apache/ignite/cache/GridCache.java | 2 -
.../apache/ignite/cache/IgniteImmutable.java | 45 +
.../CacheRendezvousAffinityFunction.java | 13 +-
.../eviction/fifo/CacheFifoEvictionPolicy.java | 3 -
.../eviction/lru/CacheLruEvictionPolicy.java | 1 -
.../ignite/compute/ComputeJobContext.java | 1 -
.../configuration/CacheConfiguration.java | 62 +-
.../configuration/IgniteConfiguration.java | 10 +-
.../org/apache/ignite/events/EventType.java | 2 -
.../IgfsConcurrentModificationException.java | 29 +-
.../ignite/igfs/IgfsCorruptedFileException.java | 16 +-
.../igfs/IgfsDirectoryNotEmptyException.java | 20 +-
.../org/apache/ignite/igfs/IgfsException.java | 16 +-
.../org/apache/ignite/igfs/IgfsInputStream.java | 2 -
.../igfs/IgfsInvalidHdfsVersionException.java | 23 +-
.../ignite/igfs/IgfsInvalidPathException.java | 16 +-
.../ignite/igfs/IgfsOutOfSpaceException.java | 16 +-
.../igfs/IgfsParentNotDirectoryException.java | 20 +-
.../igfs/IgfsPathAlreadyExistsException.java | 19 +-
.../igfs/IgfsPathIsDirectoryException.java | 56 +
.../igfs/IgfsPathIsNotDirectoryException.java | 56 +
.../ignite/igfs/IgfsPathNotFoundException.java | 22 +-
.../ignite/internal/AsyncSupportAdapter.java | 16 +-
.../ignite/internal/ClusterMetricsSnapshot.java | 1 -
.../internal/ComputeTaskInternalFuture.java | 3 +
.../internal/GridEventConsumeHandler.java | 13 +-
.../ignite/internal/GridKernalContext.java | 24 +-
.../ignite/internal/GridKernalContextImpl.java | 65 +-
.../internal/GridMessageListenHandler.java | 11 +-
.../org/apache/ignite/internal/GridTopic.java | 89 +-
.../ignite/internal/GridUpdateNotifier.java | 15 -
.../internal/IgniteCodeGeneratingFail.java | 29 +
.../apache/ignite/internal/IgniteKernal.java | 11 +-
.../ignite/internal/IgniteTransactionsEx.java | 16 -
.../org/apache/ignite/internal/IgnitionEx.java | 74 +-
.../internal/MarshallerContextAdapter.java | 130 ++
.../ignite/internal/MarshallerContextImpl.java | 81 +
.../balancer/GridClientBalancerAdapter.java | 2 +-
.../client/impl/GridClientComputeImpl.java | 2 +-
.../client/impl/GridClientFutureAdapter.java | 3 +
.../GridClientConnectionManagerAdapter.java | 2 +-
.../GridClientOptimizedMarshaller.java | 42 +-
.../impl/GridRouterCommandLineStartup.java | 2 +-
.../internal/direct/DirectByteBufferStream.java | 62 +-
.../internal/direct/DirectMessageWriter.java | 7 +
.../direct/DirectMessageWriterState.java | 3 +
.../internal/igfs/common/IgfsMarshaller.java | 1 -
.../internal/managers/GridManagerAdapter.java | 35 +-
.../managers/communication/GridIoManager.java | 102 +-
.../communication/GridIoMessageFactory.java | 89 +-
.../managers/communication/GridIoPolicy.java | 5 +-
.../loadbalancer/GridLoadBalancerManager.java | 3 -
.../affinity/GridAffinityAssignmentCache.java | 20 +-
.../affinity/GridAffinityMessage.java | 13 +-
.../affinity/GridAffinityProcessor.java | 35 +-
.../cache/CacheEntryInfoCollection.java | 111 ++
.../processors/cache/CacheEntryPredicate.java | 45 +
.../cache/CacheEntryPredicateAdapter.java | 88 +
.../cache/CacheEntryPredicateContainsValue.java | 132 ++
.../cache/CacheEntryPredicateHasValue.java | 31 +
.../cache/CacheEntryPredicateNoValue.java | 31 +
.../cache/CacheEntrySerializablePredicate.java | 152 ++
.../processors/cache/CacheEvictionEntry.java | 182 ++
.../cache/CacheInvokeDirectResult.java | 213 +++
.../processors/cache/CacheInvokeEntry.java | 79 +-
.../processors/cache/CacheInvokeResult.java | 12 +-
.../processors/cache/CacheLazyEntry.java | 133 ++
.../internal/processors/cache/CacheObject.java | 73 +
.../processors/cache/CacheObjectAdapter.java | 118 ++
.../cache/CacheObjectByteArrayImpl.java | 156 ++
.../processors/cache/CacheObjectContext.java | 130 ++
.../processors/cache/CacheObjectImpl.java | 120 ++
.../processors/cache/CachePeekModes.java | 28 +
.../processors/cache/CacheProjection.java | 140 +-
.../cache/CacheStoreBalancingWrapper.java | 2 +
.../processors/cache/EvictableEntryImpl.java | 33 +-
.../processors/cache/GridCacheAdapter.java | 1546 +++++++----------
.../cache/GridCacheAffinityManager.java | 20 +-
.../processors/cache/GridCacheAtomicFuture.java | 4 +-
.../processors/cache/GridCacheAttributes.java | 15 +-
.../cache/GridCacheBatchSwapEntry.java | 27 +-
.../cache/GridCacheClearAllRunnable.java | 28 +-
.../cache/GridCacheConcurrentMap.java | 355 ++--
.../processors/cache/GridCacheContext.java | 482 +++---
.../GridCacheDefaultAffinityKeyMapper.java | 47 +-
.../cache/GridCacheDeploymentManager.java | 124 +-
.../processors/cache/GridCacheEntryEx.java | 201 +--
.../processors/cache/GridCacheEntryInfo.java | 337 ++--
.../GridCacheEntryInfoCollectSwapListener.java | 56 +-
.../processors/cache/GridCacheEventManager.java | 121 +-
.../cache/GridCacheEvictionManager.java | 234 +--
.../cache/GridCacheEvictionRequest.java | 46 +-
.../cache/GridCacheEvictionResponse.java | 27 +-
.../cache/GridCacheExplicitLockSpan.java | 40 +-
.../cache/GridCacheFilterFailedException.java | 8 +-
.../processors/cache/GridCacheIoManager.java | 48 +-
.../processors/cache/GridCacheKeySet.java | 4 +-
.../cache/GridCacheManagerAdapter.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 1524 ++++++++---------
.../cache/GridCacheMapEntryFactory.java | 12 +-
.../processors/cache/GridCacheMessage.java | 235 ++-
.../cache/GridCacheMultiTxFuture.java | 9 +-
.../processors/cache/GridCacheMvcc.java | 214 +--
.../processors/cache/GridCacheMvccCallback.java | 12 +-
.../cache/GridCacheMvccCandidate.java | 50 +-
.../processors/cache/GridCacheMvccFuture.java | 4 +-
.../processors/cache/GridCacheMvccManager.java | 201 +--
.../cache/GridCacheOffheapSwapEntry.java | 20 +-
.../GridCachePartitionExchangeManager.java | 104 +-
.../processors/cache/GridCachePreloader.java | 10 +-
.../cache/GridCachePreloaderAdapter.java | 12 +-
.../processors/cache/GridCacheProcessor.java | 63 +-
.../processors/cache/GridCacheProjectionEx.java | 59 +-
.../cache/GridCacheProjectionImpl.java | 606 ++-----
.../processors/cache/GridCacheProxyImpl.java | 203 +--
.../processors/cache/GridCacheReturn.java | 317 +++-
.../cache/GridCacheSharedContext.java | 42 +-
.../processors/cache/GridCacheStoreManager.java | 210 +--
.../processors/cache/GridCacheSwapEntry.java | 16 +-
.../cache/GridCacheSwapEntryImpl.java | 60 +-
.../processors/cache/GridCacheSwapListener.java | 5 +-
.../processors/cache/GridCacheSwapManager.java | 733 +++++---
.../processors/cache/GridCacheTtlManager.java | 26 +-
.../cache/GridCacheUpdateAtomicResult.java | 27 +-
.../cache/GridCacheUpdateTxResult.java | 8 +-
.../processors/cache/GridCacheUtils.java | 218 ++-
.../processors/cache/GridCacheValueBytes.java | 194 ---
.../cache/GridCacheValueCollection.java | 4 +-
.../cache/IgniteCacheExpiryPolicy.java | 8 +-
.../IgniteCacheOsSerializationManager.java | 48 -
.../processors/cache/IgniteCacheProxy.java | 4 +-
.../processors/cache/KeyCacheObject.java | 33 +
.../processors/cache/KeyCacheObjectImpl.java | 132 ++
.../cache/affinity/GridCacheAffinityImpl.java | 10 +-
.../CacheDataStructuresManager.java | 14 +-
.../distributed/GridCacheCommittedTxInfo.java | 10 +-
...ridCacheOptimisticCheckPreparedTxFuture.java | 23 +-
...idCacheOptimisticCheckPreparedTxRequest.java | 4 +-
...dCacheOptimisticCheckPreparedTxResponse.java | 2 +-
.../distributed/GridCacheTtlUpdateRequest.java | 75 +-
.../distributed/GridDistributedBaseMessage.java | 28 +-
.../GridDistributedCacheAdapter.java | 52 +-
.../distributed/GridDistributedCacheEntry.java | 154 +-
.../distributed/GridDistributedLockRequest.java | 73 +-
.../GridDistributedLockResponse.java | 93 +-
.../GridDistributedTxFinishRequest.java | 83 +-
.../GridDistributedTxFinishResponse.java | 2 +-
.../distributed/GridDistributedTxMapping.java | 38 +-
.../GridDistributedTxPrepareRequest.java | 273 ++-
.../GridDistributedTxPrepareResponse.java | 14 +-
.../GridDistributedTxRemoteAdapter.java | 162 +-
.../GridDistributedUnlockRequest.java | 52 +-
.../IgniteExternalizableExpiryPolicy.java | 12 +-
.../dht/GridClientPartitionTopology.java | 24 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 2 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 6 +-
.../dht/GridDhtAssignmentFetchFuture.java | 17 +-
.../cache/distributed/dht/GridDhtCache.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 184 +-
.../distributed/dht/GridDhtCacheEntry.java | 120 +-
.../distributed/dht/GridDhtEmbeddedFuture.java | 3 +
.../cache/distributed/dht/GridDhtGetFuture.java | 96 +-
.../distributed/dht/GridDhtLocalPartition.java | 52 +-
.../distributed/dht/GridDhtLockFuture.java | 104 +-
.../distributed/dht/GridDhtLockRequest.java | 69 +-
.../distributed/dht/GridDhtLockResponse.java | 77 +-
.../dht/GridDhtPartitionTopology.java | 20 +-
.../dht/GridDhtPartitionTopologyImpl.java | 48 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 274 ++-
.../distributed/dht/GridDhtTxFinishFuture.java | 40 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 48 +-
.../dht/GridDhtTxFinishResponse.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 67 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 187 +-
.../cache/distributed/dht/GridDhtTxMapping.java | 4 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 265 ++-
.../dht/GridDhtTxPrepareRequest.java | 152 +-
.../dht/GridDhtTxPrepareResponse.java | 84 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 53 +-
.../distributed/dht/GridDhtUnlockRequest.java | 46 +-
.../distributed/dht/GridNoStorageCacheMap.java | 28 +-
.../dht/GridPartitionedGetFuture.java | 128 +-
.../dht/atomic/GridDhtAtomicCache.java | 687 ++++----
.../dht/atomic/GridDhtAtomicCacheEntry.java | 13 +-
.../GridDhtAtomicDeferredUpdateResponse.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 74 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 222 +--
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 66 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 170 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 238 +--
.../atomic/GridNearAtomicUpdateResponse.java | 142 +-
.../dht/colocated/GridDhtColocatedCache.java | 179 +-
.../colocated/GridDhtColocatedCacheEntry.java | 13 +-
.../colocated/GridDhtColocatedLockFuture.java | 141 +-
.../colocated/GridDhtDetachedCacheEntry.java | 30 +-
.../dht/preloader/GridDhtForceKeysFuture.java | 54 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 43 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 63 +-
.../GridDhtPartitionDemandMessage.java | 8 +-
.../preloader/GridDhtPartitionDemandPool.java | 103 +-
.../GridDhtPartitionSupplyMessage.java | 93 +-
.../preloader/GridDhtPartitionSupplyPool.java | 81 +-
.../GridDhtPartitionsAbstractMessage.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 80 +-
.../preloader/GridDhtPartitionsFullMessage.java | 6 +-
.../GridDhtPartitionsSingleMessage.java | 6 +-
.../GridDhtPartitionsSingleRequest.java | 2 +-
.../dht/preloader/GridDhtPreloader.java | 62 +-
.../preloader/GridDhtPreloaderAssignments.java | 8 +-
.../distributed/near/CacheVersionedValue.java | 169 ++
.../distributed/near/GridNearAtomicCache.java | 149 +-
.../distributed/near/GridNearCacheAdapter.java | 176 +-
.../distributed/near/GridNearCacheEntry.java | 143 +-
.../distributed/near/GridNearGetFuture.java | 134 +-
.../distributed/near/GridNearGetRequest.java | 106 +-
.../distributed/near/GridNearGetResponse.java | 37 +-
.../distributed/near/GridNearLockFuture.java | 165 +-
.../distributed/near/GridNearLockMapping.java | 23 +-
.../distributed/near/GridNearLockRequest.java | 50 +-
.../distributed/near/GridNearLockResponse.java | 12 +-
.../near/GridNearTransactionalCache.java | 139 +-
.../near/GridNearTxFinishFuture.java | 39 +-
.../near/GridNearTxFinishRequest.java | 34 +-
.../near/GridNearTxFinishResponse.java | 6 +-
.../cache/distributed/near/GridNearTxLocal.java | 212 +--
.../near/GridNearTxPrepareFuture.java | 163 +-
.../near/GridNearTxPrepareRequest.java | 58 +-
.../near/GridNearTxPrepareResponse.java | 177 +-
.../distributed/near/GridNearTxRemote.java | 66 +-
.../distributed/near/GridNearUnlockRequest.java | 2 +-
.../cache/dr/GridCacheDrExpirationInfo.java | 23 +-
.../processors/cache/dr/GridCacheDrInfo.java | 28 +-
.../processors/cache/dr/GridCacheDrManager.java | 10 +-
.../cache/dr/os/GridOsCacheDrManager.java | 10 +-
.../extras/GridCacheAttributesEntryExtras.java | 24 +-
.../GridCacheAttributesMvccEntryExtras.java | 30 +-
...dCacheAttributesMvccObsoleteEntryExtras.java | 30 +-
...cheAttributesMvccObsoleteTtlEntryExtras.java | 30 +-
.../GridCacheAttributesMvccTtlEntryExtras.java | 30 +-
.../GridCacheAttributesObsoleteEntryExtras.java | 26 +-
...idCacheAttributesObsoleteTtlEntryExtras.java | 26 +-
.../GridCacheAttributesTtlEntryExtras.java | 26 +-
.../cache/extras/GridCacheEntryExtras.java | 16 +-
.../extras/GridCacheEntryExtrasAdapter.java | 8 +-
.../cache/extras/GridCacheMvccEntryExtras.java | 24 +-
.../GridCacheMvccObsoleteEntryExtras.java | 26 +-
.../GridCacheMvccObsoleteTtlEntryExtras.java | 26 +-
.../extras/GridCacheMvccTtlEntryExtras.java | 26 +-
.../extras/GridCacheObsoleteEntryExtras.java | 18 +-
.../extras/GridCacheObsoleteTtlEntryExtras.java | 20 +-
.../cache/extras/GridCacheTtlEntryExtras.java | 18 +-
.../cache/jta/CacheJtaManagerAdapter.java | 2 +-
.../cache/jta/CacheNoopJtaManager.java | 2 +-
.../processors/cache/local/GridLocalCache.java | 55 +-
.../cache/local/GridLocalCacheEntry.java | 85 +-
.../cache/local/GridLocalLockCallback.java | 9 +-
.../cache/local/GridLocalLockFuture.java | 40 +-
.../processors/cache/local/GridLocalTx.java | 206 ---
.../cache/local/GridLocalTxFuture.java | 302 ----
.../local/atomic/GridLocalAtomicCache.java | 342 ++--
.../GridCacheDistributedFieldsQueryFuture.java | 3 +
.../query/GridCacheDistributedQueryFuture.java | 5 +-
.../query/GridCacheDistributedQueryManager.java | 38 +-
.../query/GridCacheLocalFieldsQueryFuture.java | 3 +
.../cache/query/GridCacheLocalQueryFuture.java | 9 +-
.../cache/query/GridCacheQueriesImpl.java | 17 -
.../cache/query/GridCacheQueryAdapter.java | 16 -
.../cache/query/GridCacheQueryInfo.java | 14 -
.../cache/query/GridCacheQueryManager.java | 134 +-
.../cache/query/GridCacheQueryRequest.java | 66 +-
.../cache/query/GridCacheQueryResponse.java | 6 +-
.../continuous/CacheContinuousQueryEntry.java | 273 +--
.../continuous/CacheContinuousQueryEvent.java | 41 +-
.../continuous/CacheContinuousQueryHandler.java | 77 +-
.../continuous/CacheContinuousQueryManager.java | 158 +-
.../jdbc/GridCacheQueryJdbcMetadataTask.java | 12 +-
.../query/jdbc/GridCacheQueryJdbcTask.java | 12 +-
.../IgniteCacheSerializationManager.java | 51 -
.../cache/transactions/IgniteInternalTx.java | 56 +-
.../transactions/IgniteTransactionsImpl.java | 36 +-
.../cache/transactions/IgniteTxAdapter.java | 158 +-
.../cache/transactions/IgniteTxEntry.java | 700 +++-----
.../cache/transactions/IgniteTxHandler.java | 242 +--
.../cache/transactions/IgniteTxKey.java | 99 +-
.../transactions/IgniteTxLocalAdapter.java | 859 +++++-----
.../cache/transactions/IgniteTxLocalEx.java | 56 +-
.../cache/transactions/IgniteTxManager.java | 372 ++--
.../cache/transactions/IgniteTxMap.java | 40 +-
.../cache/transactions/IgniteTxRemoteEx.java | 4 +-
.../transactions/TransactionProxyImpl.java | 14 +-
.../cache/transactions/TxEntryValueHolder.java | 237 +++
.../version/GridCacheRawVersionedEntry.java | 245 ++-
.../cache/version/GridCacheVersion.java | 12 +-
.../cache/version/GridCacheVersionEx.java | 66 +-
.../cache/version/GridCacheVersionManager.java | 2 +-
.../cacheobject/IgniteCacheObjectProcessor.java | 160 ++
.../IgniteCacheObjectProcessorImpl.java | 347 ++++
.../processors/cacheobject/package.html | 24 +
.../processors/clock/GridClockMessage.java | 1 -
.../clock/GridClockSyncProcessor.java | 2 +-
.../closure/GridClosureProcessor.java | 128 +-
.../continuous/GridContinuousHandler.java | 9 +-
.../continuous/GridContinuousMessage.java | 43 +-
.../continuous/GridContinuousProcessor.java | 54 +-
.../dataload/GridDataLoadCacheUpdaters.java | 13 +-
.../dataload/GridDataLoadRequest.java | 33 +-
.../dataload/GridDataLoadUpdateJob.java | 47 +-
.../dataload/GridDataLoaderFuture.java | 3 +
.../dataload/GridDataLoaderProcessor.java | 19 +-
.../dataload/IgniteDataLoaderEntry.java | 170 ++
.../dataload/IgniteDataLoaderImpl.java | 339 ++--
.../datastructures/DataStructuresProcessor.java | 43 +-
.../datastructures/GridCacheSetImpl.java | 4 +-
.../dr/GridDrDataLoadCacheUpdater.java | 27 +-
.../processors/igfs/IgfsDataManager.java | 3 +
.../internal/processors/igfs/IgfsFileImpl.java | 7 +
.../internal/processors/igfs/IgfsFileInfo.java | 3 +-
.../internal/processors/igfs/IgfsImpl.java | 585 +++----
.../processors/igfs/IgfsMetaManager.java | 25 +-
.../internal/processors/igfs/IgfsServer.java | 3 +-
.../internal/processors/igfs/IgfsUtils.java | 86 +
.../offheap/GridOffHeapProcessor.java | 9 +-
.../portable/GridPortableProcessor.java | 142 --
.../portable/os/GridOsPortableProcessor.java | 120 --
.../processors/portable/os/package.html | 24 -
.../processors/query/GridQueryProcessor.java | 24 +-
.../resource/GridResourceProcessor.java | 2 +-
.../resource/GridResourceServiceInjector.java | 2 +-
.../processors/rest/GridRestResponse.java | 1 -
.../message/GridClientAbstractMessage.java | 1 -
.../message/GridClientHandshakeRequest.java | 1 -
.../handlers/cache/GridCacheCommandHandler.java | 46 +-
.../handlers/task/GridTaskCommandHandler.java | 3 +-
.../protocols/tcp/GridMemcachedMessage.java | 1 -
.../protocols/tcp/GridTcpRestNioListener.java | 3 -
.../rest/protocols/tcp/GridTcpRestParser.java | 6 +-
.../rest/protocols/tcp/GridTcpRestProtocol.java | 9 -
.../rest/request/GridRestRequest.java | 17 -
.../rest/request/GridRestTaskRequest.java | 17 -
.../service/GridServiceDeploymentFuture.java | 3 +
.../processors/service/GridServiceProxy.java | 2 +-
.../streamer/GridStreamerExecutionBatch.java | 12 +-
.../GridStreamerStageExecutionFuture.java | 3 +
.../processors/task/GridTaskProcessor.java | 31 +-
.../org/apache/ignite/internal/util/F0.java | 147 ++
.../ignite/internal/util/IgniteUtils.java | 55 +-
.../util/future/GridCompoundFuture.java | 3 +
.../util/future/GridCompoundIdentityFuture.java | 3 +
.../util/future/GridEmbeddedFuture.java | 3 +
.../internal/util/future/GridFutureAdapter.java | 9 +
.../internal/util/lang/GridAbsClosure.java | 2 -
.../ignite/internal/util/lang/GridFunc.java | 52 -
.../ignite/internal/util/lang/GridMapEntry.java | 2 +-
.../util/lang/GridMetadataAwareAdapter.java | 71 +-
.../nio/GridConnectionBytesVerifyFilter.java | 1 -
.../util/nio/GridNioEmbeddedFuture.java | 3 +
.../internal/util/nio/GridNioFutureImpl.java | 3 +
.../ignite/internal/util/nio/GridNioServer.java | 3 +
.../util/nio/GridTcpCommunicationClient.java | 1 -
.../util/offheap/unsafe/GridUnsafeMemory.java | 26 +-
.../internal/util/worker/GridWorkerFuture.java | 3 +
.../visor/cache/VisorCacheClearTask.java | 6 +
.../visor/cache/VisorCacheCompactTask.java | 29 +-
.../visor/cache/VisorCacheConfiguration.java | 11 -
.../visor/node/VisorIgfsConfiguration.java | 2 +-
.../lang/IgniteFutureCancelledException.java | 3 +
.../lang/IgniteFutureTimeoutException.java | 3 +
.../ignite/lang/IgniteProductVersion.java | 1 -
.../java/org/apache/ignite/lang/IgniteUuid.java | 13 +-
.../ignite/marshaller/AbstractMarshaller.java | 8 +
.../apache/ignite/marshaller/Marshaller.java | 7 +
.../ignite/marshaller/MarshallerContext.java | 42 +
.../optimized/OptimizedClassDescriptor.java | 463 ++---
.../optimized/OptimizedClassResolver.java | 477 ------
.../optimized/OptimizedMarshallable.java | 65 -
.../optimized/OptimizedMarshaller.java | 148 +-
.../optimized/OptimizedMarshallerIdMapper.java | 33 +
.../optimized/OptimizedMarshallerUtils.java | 298 ++--
.../optimized/OptimizedObjectInputStream.java | 152 +-
.../optimized/OptimizedObjectOutputStream.java | 99 +-
.../optimized-classnames.previous.properties | 15 -
.../optimized/optimized-classnames.properties | 116 --
.../extensions/communication/MessageWriter.java | 11 +
.../security/GridSecurityCredentials.java | 1 -
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 18 -
.../org/apache/ignite/spi/IgniteSpiContext.java | 43 -
.../communication/tcp/TcpCommunicationSpi.java | 3 +
.../tcp/internal/TcpDiscoveryNode.java | 1 -
.../TcpDiscoveryMulticastIpFinder.java | 1 -
.../messages/TcpDiscoveryAuthFailedMessage.java | 1 -
.../messages/TcpDiscoveryHeartbeatMessage.java | 1 -
.../apache/ignite/transactions/Transaction.java | 6 +-
.../META-INF/classnames-jdk.properties | 371 ++++
.../resources/META-INF/classnames.properties | 1619 ++++++++++++++++++
.../src/test/config/io-manager-benchmark.xml | 12 -
modules/core/src/test/config/jobs-load-base.xml | 11 -
.../core/src/test/config/load/dsi-load-base.xml | 16 -
.../IgniteExternalizableAbstractTest.java | 9 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../ignite/internal/GridAffinitySelfTest.java | 3 +-
.../internal/GridUpdateNotifierSelfTest.java | 16 +
.../GridCommunicationSendMessageSelfTest.java | 2 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 62 +-
.../cache/GridCacheAbstractMetricsSelfTest.java | 8 +-
.../cache/GridCacheAffinityRoutingSelfTest.java | 6 -
.../GridCacheConcurrentTxMultiNodeTest.java | 8 +-
.../cache/GridCacheDeploymentSelfTest.java | 5 +-
.../cache/GridCacheEntryMemorySizeSelfTest.java | 12 +-
.../cache/GridCacheEntryVersionSelfTest.java | 4 +-
.../GridCacheExAbstractFullApiSelfTest.java | 2 +-
.../GridCacheFinishPartitionsSelfTest.java | 7 +-
.../GridCacheInterceptorAbstractSelfTest.java | 186 +-
.../processors/cache/GridCacheLeakTest.java | 2 +-
.../cache/GridCacheLifecycleAwareSelfTest.java | 10 +-
.../cache/GridCacheMemoryModeSelfTest.java | 8 +-
.../cache/GridCacheMvccFlagsTest.java | 8 +-
.../cache/GridCacheMvccPartitionedSelfTest.java | 128 +-
.../processors/cache/GridCacheMvccSelfTest.java | 232 +--
.../cache/GridCacheObjectToStringSelfTest.java | 2 +-
.../cache/GridCacheOffHeapSelfTest.java | 6 +-
.../GridCacheOnCopyFlagAbstractSelfTest.java | 688 ++++++++
.../GridCacheOnCopyFlagAtomicSelfTest.java | 38 +
.../cache/GridCacheOnCopyFlagLocalSelfTest.java | 38 +
.../GridCacheOnCopyFlagReplicatedSelfTest.java | 38 +
...ridCacheOnCopyFlagTxPartitionedSelfTest.java | 38 +
.../cache/GridCachePutAllFailoverSelfTest.java | 1 -
.../GridCacheReturnValueTransferSelfTest.java | 1 +
.../cache/GridCacheStoreValueBytesSelfTest.java | 24 +-
.../cache/GridCacheSwapPreloadSelfTest.java | 6 +-
.../processors/cache/GridCacheTestEntryEx.java | 276 +--
.../cache/GridCacheTtlManagerLoadTest.java | 2 +-
.../GridCacheValueBytesPreloadingSelfTest.java | 2 +-
.../cache/GridCacheVersionMultinodeTest.java | 2 +-
.../cache/GridCacheVersionSelfTest.java | 3 +
...IgniteCacheAtomicCopyOnReadDisabledTest.java | 32 +
.../IgniteCacheContainsKeyAbstractSelfTest.java | 4 +-
...niteCacheCopyOnReadDisabledAbstractTest.java | 123 ++
.../IgniteCacheInterceptorSelfTestSuite.java | 5 +
.../IgniteCacheTxCopyOnReadDisabledTest.java | 32 +
.../cache/IgnitePutAllLargeBatchSelfTest.java | 6 +-
...tAllUpdateNonPreloadedPartitionSelfTest.java | 6 +-
.../IgniteTxConcurrentGetAbstractTest.java | 4 +-
.../cache/IgniteTxMultiNodeAbstractTest.java | 4 +-
...actQueueFailoverDataConsistencySelfTest.java | 2 +-
.../GridCacheQueueCleanupSelfTest.java | 2 +-
.../GridCacheSetAbstractSelfTest.java | 4 +-
.../GridCacheSetFailoverAbstractSelfTest.java | 4 +-
.../IgnitePartitionedSetNoBackupsSelfTest.java | 2 +-
.../GridCacheAbstractJobExecutionTest.java | 2 +-
.../distributed/GridCacheEventAbstractTest.java | 12 +-
...chePartitionedReloadAllAbstractSelfTest.java | 61 +-
.../IgniteCacheSystemTransactionsSelfTest.java | 188 ++
.../dht/GridCacheAtomicNearCacheSelfTest.java | 12 +-
.../dht/GridCacheColocatedDebugTest.java | 6 +-
.../dht/GridCacheDhtEntrySelfTest.java | 12 +-
...GridCacheDhtEvictionNearReadersSelfTest.java | 12 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 20 +-
.../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadDelayedSelfTest.java | 4 +-
.../GridCacheDhtPreloadDisabledSelfTest.java | 4 +-
.../dht/GridCacheDhtPreloadSelfTest.java | 8 +-
.../GridCacheDhtPreloadStartStopSelfTest.java | 4 +-
.../distributed/dht/GridCacheDhtTestUtils.java | 25 +-
...ridCachePartitionedUnloadEventsSelfTest.java | 6 +-
...eAtomicInvalidPartitionHandlingSelfTest.java | 7 +-
.../atomic/GridCacheAtomicPreloadSelfTest.java | 2 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 36 +
.../near/GridCacheNearMultiNodeSelfTest.java | 12 +-
.../near/GridCacheNearOneNodeSelfTest.java | 2 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 14 +-
.../near/GridCacheNearReadersSelfTest.java | 21 +-
...yOnReadDisabledMultiNodeFullApiSelfTest.java | 37 +
...achePartitionedMultiNodeCounterSelfTest.java | 18 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 15 +-
.../GridCachePartitionedTxSalvageSelfTest.java | 2 +-
.../GridCacheReplicatedFullApiSelfTest.java | 1 +
.../GridCacheReplicatedPreloadSelfTest.java | 4 +-
.../cache/eviction/GridCacheMockEntry.java | 5 +-
.../IgniteCacheExpiryPolicyAbstractTest.java | 4 +-
...eCacheExpiryPolicyWithStoreAbstractTest.java | 2 +-
.../query/GridCacheSwapScanQuerySelfTest.java | 1 +
...dCacheAbstractReduceFieldsQuerySelfTest.java | 21 +-
.../continuous/GridEventConsumeSelfTest.java | 3 +-
.../dataload/GridDataLoaderImplSelfTest.java | 7 -
.../dataload/GridDataLoaderPerformanceTest.java | 2 -
.../GridDataLoaderProcessorSelfTest.java | 52 +-
.../processors/igfs/IgfsAbstractSelfTest.java | 31 +-
.../igfs/IgfsDataManagerSelfTest.java | 6 +-
.../processors/igfs/IgfsFileInfoSelfTest.java | 2 +
.../processors/igfs/IgfsSizeSelfTest.java | 17 -
.../streamer/GridStreamerEvictionSelfTest.java | 1 -
.../streamer/GridStreamerFailoverSelfTest.java | 2 +-
.../internal/util/nio/GridNioSelfTest.java | 18 +-
.../nio/impl/GridNioFilterChainSelfTest.java | 7 +-
.../lang/GridMetadataAwareAdapterSelfTest.java | 80 +-
.../loadtests/hashmap/GridCacheTestContext.java | 32 +-
.../loadtests/hashmap/GridHashMapLoadTest.java | 10 +-
.../marshaller/GridMarshallerAbstractTest.java | 15 +-
.../GridMarshallerPerformanceTest.java | 2 -
.../marshaller/MarshallerContextTestImpl.java | 43 +
.../jdk/GridJdkMarshallerSelfTest.java | 2 +-
.../OptimizedMarshallerEnumSelfTest.java | 4 +-
.../optimized/OptimizedMarshallerSelfTest.java | 186 +-
.../optimized/OptimizedMarshallerTest.java | 102 +-
.../OptimizedObjectStreamSelfTest.java | 43 +-
.../ignite/messaging/GridMessagingSelfTest.java | 3 +
.../communication/GridCacheMessageSelfTest.java | 546 ++++++
.../discovery/AbstractDiscoverySelfTest.java | 1 -
.../GridCacheStoreValueBytesNode.java | 2 -
.../testframework/GridSpiTestContext.java | 18 -
.../ignite/testframework/GridTestUtils.java | 6 +-
.../testframework/junits/GridAbstractTest.java | 7 +-
.../junits/GridTestKernalContext.java | 14 +-
.../junits/IgniteTestResources.java | 46 +-
.../junits/common/GridCommonAbstractTest.java | 2 +-
.../IgniteCacheFullApiSelfTestSuite.java | 2 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 10 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 5 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 16 +-
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 8 +-
.../IgniteHadoopClientProtocolProvider.java | 7 +-
.../internal/processors/hadoop/HadoopSetup.java | 2 +-
.../hadoop/igfs/HadoopIgfsFuture.java | 3 +
.../hadoop/proto/HadoopClientProtocol.java | 3 -
.../external/HadoopExternalTaskExecutor.java | 3 +
.../child/HadoopExternalProcessStarter.java | 4 +-
.../hadoop/HadoopClientProtocolSelfTest.java | 2 +-
.../hadoop/HadoopSortingExternalTest.java | 10 +
.../hadoop/HadoopTaskExecutionSelfTest.java | 2 +-
.../HadoopExternalTaskExecutionSelfTest.java | 10 +
.../HadoopExternalCommunicationSelfTest.java | 4 +-
.../processors/query/h2/IgniteH2Indexing.java | 8 +-
.../GridCacheAbstractFieldsQuerySelfTest.java | 34 -
.../cache/GridCacheAbstractQuerySelfTest.java | 46 +-
.../cache/GridCacheCrossCacheQuerySelfTest.java | 17 -
.../cache/GridCacheOffHeapAndSwapSelfTest.java | 10 +-
.../cache/GridCacheQueryLoadSelfTest.java | 54 +-
.../processors/cache/GridCacheSwapSelfTest.java | 7 +-
.../processors/cache/jta/CacheJtaManager.java | 6 +-
modules/scalar/pom.xml | 8 +
.../scalar/testsuites/ScalarSelfTestSuite.scala | 6 +
.../cache/spring/SpringDynamicCacheManager.java | 36 +-
.../GridSpringBeanSerializationSelfTest.java | 2 +
.../ignite/spring/GridSpringCacheTestKey.java | 4 +-
...gniteProjectionStartStopRestartSelfTest.java | 42 +-
.../ignite/tools/classgen/ClassesGenerator.java | 214 +++
.../optimized/OptimizedClassNamesGenerator.java | 325 ----
.../commands/cache/VisorCacheCommand.scala | 1 -
.../commands/tasks/VisorTasksCommandSpec.scala | 5 +-
.../IgniteWebSessionSelfTestSuite.java | 6 +
modules/yardstick/config/ignite-base-config.xml | 17 -
.../yardstick/config/ignite-store-config.xml | 18 -
pom.xml | 4 +-
571 files changed, 21882 insertions(+), 16808 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/163297ea/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 89496e2,7292b5a..d2a3e7b
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -324,12 -319,9 +324,15 @@@ public class CacheConfiguration<K, V> e
/** Collection of type metadata. */
private Collection<CacheTypeMetadata> typeMeta;
+ /** Copy on read flag. */
+ private boolean cpOnRead = DFLT_COPY_ON_READ;
+
+ /** Receiver cache conflict resolver mode. */
+ private CacheConflictResolverMode conflictRslvrMode =
DFLT_CONFLICT_RSLVR_MODE;
+
+ /** Receiver cache conflict resolver. */
+ private CacheConflictResolver conflictRslvr;
+
/** Empty constructor (all values are initialized to their defaults). */
public CacheConfiguration() {
/* No-op. */
@@@ -360,8 -352,7 +363,9 @@@
cacheLoaderFactory = cc.getCacheLoaderFactory();
cacheMode = cc.getCacheMode();
cacheWriterFactory = cc.getCacheWriterFactory();
+ conflictRslvr = cc.getConflictResolver();
+ conflictRslvrMode = cc.getConflictResolverMode();
+ cpOnRead = cc.isCopyOnRead();
dfltLockTimeout = cc.getDefaultLockTimeout();
dfltQryTimeout = cc.getDefaultQueryTimeout();
distro = cc.getDistributionMode();
@@@ -1634,54 -1603,29 +1616,78 @@@
}
/**
+ * Gets flag indicating whether copy of of the value stored in cache
should be created
+ * for cache operation implying return value. Also if this flag is set
copies are created for values
+ * passed to {@link CacheInterceptor} and to {@link
org.apache.ignite.cache.IgniteEntryProcessor}.
+ * <p>
+ * Copies are not created for immutable types, see {@link
IgniteImmutable}.
+ *
+ * @return Copy on get flag.
+ * @see IgniteImmutable
+ */
+ public boolean isCopyOnRead() {
+ return cpOnRead;
+ }
+
+ /**
+ * Set copy on get flag.
+ *
+ * @param cpOnGet Copy on get flag.
+ * @see #isCopyOnRead
+ */
+ public void setCopyOnRead(boolean cpOnGet) {
+ this.cpOnRead = cpOnGet;
+ }
+
++ /**
+ * Gets conflict resolver mode. See {@link CacheConflictResolverMode} for
more information.
+ * <p>
+ * Defaults to {@link #DFLT_CONFLICT_RSLVR_MODE}.
+ *
+ * @return Conflict resolution mode.
+ */
+ public CacheConflictResolverMode getConflictResolverMode() {
+ return conflictRslvrMode;
+ }
+
+ /**
+ * Sets conflict resolver mode. See {@link #getConflictResolverMode()} for
+ * more information.
+ *
+ * @param conflictRslvrMode Conflict resolver mode.
+ */
+ public void setConflictResolverMode(CacheConflictResolverMode
conflictRslvrMode) {
+ this.conflictRslvrMode = conflictRslvrMode;
+ }
+
+ /**
+ * Gets conflict resolver.
+ * <p>
+ * For {@link CacheConflictResolverMode#AUTO} mode this parameter can be
{@code null} and in
+ * this case new entry will always overwrite the old one.
+ * <p>
+ * For {@link CacheConflictResolverMode#ALWAYS} mode this parameter is
mandatory.
+ * <p>
+ * Default value is {@code null}.
+ *
+ * @return Conflict resolver.
+ */
+ @Nullable public CacheConflictResolver getConflictResolver() {
+ return conflictRslvr;
+ }
+
+ /**
+ * Sets conflict resolver. See {@link #getConflictResolver()} for more
+ * information.
+ * <p>
+ * Defaults to {@code null}.
+ *
+ * @param conflictRslvr Conflict resolver.
+ */
+ public void setConflictResolver(CacheConflictResolver conflictRslvr) {
+ this.conflictRslvr = conflictRslvr;
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(CacheConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/163297ea/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 455819c,1da4b1f..99c6d21
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@@ -786,12 -798,8 +799,10 @@@ public class GridKernalContextImpl impl
if (cls.equals(GridCacheDrManager.class))
return (T)new GridOsCacheDrManager();
- else if (cls.equals(GridPortableProcessor.class))
- return (T)new GridOsPortableProcessor(this);
- else if (cls.equals(IgniteCacheSerializationManager.class))
- return (T)new IgniteCacheOsSerializationManager();
+ else if (cls.equals(IgniteCacheObjectProcessor.class))
+ return (T)new IgniteCacheObjectProcessorImpl(this);
+ else if (cls.equals(CacheConflictResolver.class))
+ return (T)new IgniteCacheConflictResolverManager();
throw new IgniteException("Unsupported component type: " + cls);
}
@@@ -809,7 -817,7 +820,8 @@@
}
/** {@inheritDoc} */
-- @Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
++ @Override
++ public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
stash.set(U.readString(in));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/163297ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 0493085,1d30d81..df0c066
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@@ -112,35 -111,29 +111,32 @@@ public class GridCacheContext<K, V> imp
private GridCacheQueryManager<K, V> qryMgr;
/** Continuous query manager. */
- private CacheContinuousQueryManager<K, V> contQryMgr;
+ private CacheContinuousQueryManager contQryMgr;
/** Swap manager. */
- private GridCacheSwapManager<K, V> swapMgr;
+ private GridCacheSwapManager swapMgr;
/** Evictions manager. */
- private GridCacheEvictionManager<K, V> evictMgr;
+ private GridCacheEvictionManager evictMgr;
/** Data structures manager. */
- private CacheDataStructuresManager<K, V> dataStructuresMgr;
+ private CacheDataStructuresManager dataStructuresMgr;
/** Eager TTL manager. */
- private GridCacheTtlManager<K, V> ttlMgr;
+ private GridCacheTtlManager ttlMgr;
/** Store manager. */
- private GridCacheStoreManager<K, V> storeMgr;
+ private GridCacheStoreManager storeMgr;
/** Replication manager. */
- private GridCacheDrManager<K, V> drMgr;
-
- /** Serialization manager. */
- private IgniteCacheSerializationManager<K, V> serMgr;
+ private GridCacheDrManager drMgr;
/** JTA manager. */
- private CacheJtaManagerAdapter<K, V> jtaMgr;
+ private CacheJtaManagerAdapter jtaMgr;
+ /** Conflict resolver manager. */
+ private CacheConflictResolverManager rslvrMgr;
+
/** Managers. */
private List<GridCacheManager<K, V>> mgrs = new LinkedList<>();
@@@ -205,8 -186,11 +189,11 @@@
private CacheWeakQueryIteratorsHolder<Map.Entry<K, V>> itHolder;
/** Conflict resolver. */
- private GridCacheVersionAbstractConflictResolver conflictRslvr;
+ private GridCacheEntryAbstractConflictResolver conflictRslvr;
+ /** */
+ private CacheObjectContext cacheObjCtx;
+
/**
* Empty constructor required for {@link Externalizable}.
*/
@@@ -241,19 -225,17 +228,18 @@@
* ===========================
*/
- GridCacheEventManager<K, V> evtMgr,
- GridCacheSwapManager<K, V> swapMgr,
- IgniteCacheSerializationManager<K, V> serMgr,
- GridCacheStoreManager<K, V> storeMgr,
- GridCacheEvictionManager<K, V> evictMgr,
+ GridCacheEventManager evtMgr,
+ GridCacheSwapManager swapMgr,
+ GridCacheStoreManager storeMgr,
+ GridCacheEvictionManager evictMgr,
GridCacheQueryManager<K, V> qryMgr,
- CacheContinuousQueryManager<K, V> contQryMgr,
- GridCacheAffinityManager<K, V> affMgr,
- CacheDataStructuresManager<K, V> dataStructuresMgr,
- GridCacheTtlManager<K, V> ttlMgr,
- GridCacheDrManager<K, V> drMgr,
- CacheJtaManagerAdapter<K, V> jtaMgr,
+ CacheContinuousQueryManager contQryMgr,
+ GridCacheAffinityManager affMgr,
+ CacheDataStructuresManager dataStructuresMgr,
+ GridCacheTtlManager ttlMgr,
+ GridCacheDrManager drMgr,
- CacheJtaManagerAdapter jtaMgr) {
++ CacheJtaManagerAdapter jtaMgr,
+ CacheConflictResolverManager<K, V> rslvrMgr) {
assert ctx != null;
assert sharedCtx != null;
assert cacheCfg != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/163297ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 70e6328,4c50546..2a05214
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -62,9 -59,10 +61,9 @@@ import static org.apache.ignite.cache.C
import static org.apache.ignite.cache.CacheMode.*;
import static org.apache.ignite.cache.CachePreloadMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.configuration.DeploymentMode.*;
- import static org.apache.ignite.internal.IgniteNodeAttributes.*;
import static org.apache.ignite.internal.IgniteComponentType.*;
+ import static org.apache.ignite.internal.IgniteNodeAttributes.*;
import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
import static org.apache.ignite.transactions.TransactionIsolation.*;
@@@ -275,7 -273,7 +274,7 @@@ public class GridCacheProcessor extend
// Suppress warning if at least one ATOMIC cache found.
perf.add("Enable ATOMIC mode if not using transactions (set
'atomicityMode' to ATOMIC)",
-- cfg.getAtomicityMode() == ATOMIC);
++ cfg.getAtomicityMode() == ATOMIC);
// Suppress warning if at least one non-FULL_SYNC mode found.
perf.add("Disable fully synchronous writes (set
'writeSynchronizationMode' to PRIMARY_SYNC or FULL_ASYNC)",
@@@ -333,8 -331,8 +332,8 @@@
if (cc.getCacheMode() == PARTITIONED || cc.getCacheMode() ==
REPLICATED) {
if (cc.getAtomicityMode() == ATOMIC &&
cc.getWriteSynchronizationMode() == FULL_ASYNC)
U.warn(log, "Cache write synchronization mode is set to
FULL_ASYNC. All single-key 'put' and " +
-- "'remove' operations will return 'null', all 'putx' and
'removex' operations will return" +
-- " 'true' [cacheName=" + cc.getName() + ']');
++ "'remove' operations will return 'null', all 'putx'
and 'removex' operations will return" +
++ " 'true' [cacheName=" + cc.getName() + ']');
}
DeploymentMode depMode = c.getDeploymentMode();
@@@ -639,8 -625,6 +633,7 @@@
CacheDataStructuresManager dataStructuresMgr = new
CacheDataStructuresManager();
GridCacheTtlManager ttlMgr = new GridCacheTtlManager();
GridCacheDrManager drMgr =
ctx.createComponent(GridCacheDrManager.class);
- IgniteCacheSerializationManager serMgr =
ctx.createComponent(IgniteCacheSerializationManager.class);
+ CacheConflictResolverManager rslvrMgr =
ctx.createComponent(CacheConflictResolverManager.class);
GridCacheStoreManager storeMgr = new GridCacheStoreManager(ctx,
sesHolders, cfgStore, cfg);
@@@ -664,10 -647,9 +656,10 @@@
dataStructuresMgr,
ttlMgr,
drMgr,
- jta);
+ jta,
+ rslvrMgr);
- cacheCtx.defaultAffMapper(dfltAffMapper);
+ cacheCtx.cacheObjectContext(cacheObjCtx);
GridCacheAdapter cache = null;
@@@ -805,10 -786,9 +796,10 @@@
dataStructuresMgr,
ttlMgr,
drMgr,
- jta);
+ jta,
+ rslvrMgr);
- cacheCtx.defaultAffMapper(dfltAffMapper);
+ cacheCtx.cacheObjectContext(cacheObjCtx);
GridDhtCacheAdapter dht = null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/163297ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/GridCacheDrManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/163297ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
index e3744fb,7cec4eb..2b02428
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/dr/os/GridOsCacheDrManager.java
@@@ -64,10 -64,13 +64,8 @@@ public class GridOsCacheDrManager imple
}
/** {@inheritDoc} */
- @Override public void replicate(K key,
- @Nullable byte[] keyBytes,
- @Nullable V val,
- @Nullable byte[] valBytes,
- @Override public GridCacheVersionAbstractConflictResolver
conflictResolver() {
- return null;
- }
-
- /** {@inheritDoc} */
+ @Override public void replicate(KeyCacheObject key,
+ @Nullable CacheObject val,
long ttl,
long expireTime,
GridCacheVersion ver,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/163297ea/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
index 44ac6a1,459043e..bd048f0
---
a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
+++
b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridCacheTestContext.java
@@@ -62,15 -61,13 +61,14 @@@ public class GridCacheTestContext<K, V
new IdentityHashMap<CacheStore, ThreadLocal>(),
null,
new CacheConfiguration()),
- new GridCacheEvictionManager<K, V>(),
+ new GridCacheEvictionManager(),
new GridCacheLocalQueryManager<K, V>(),
- new CacheContinuousQueryManager<K, V>(),
- new GridCacheAffinityManager<K, V>(),
- new CacheDataStructuresManager<K, V>(),
- new GridCacheTtlManager<K, V>(),
- new GridOsCacheDrManager<K, V>(),
- new CacheNoopJtaManager<K, V>(),
- new IgniteCacheConflictResolverManager<K, V>()
- );
+ new CacheContinuousQueryManager(),
+ new GridCacheAffinityManager(),
+ new CacheDataStructuresManager(),
+ new GridCacheTtlManager(),
+ new GridOsCacheDrManager(),
- new CacheNoopJtaManager());
++ new CacheNoopJtaManager(),
++ new IgniteCacheConflictResolverManager<K, V>());
}
}
