Merge branches 'ignite-383' and 'sprint-2' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-383
Conflicts:
modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.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/6bb9dbc4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6bb9dbc4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6bb9dbc4
Branch: refs/heads/ignite-gg-9828
Commit: 6bb9dbc4692b774bf5ba4d2e7d93d8496faff01f
Parents: c5a9141 5d460e0
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Wed Mar 11 18:29:05 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Wed Mar 11 18:29:05 2015 +0300
----------------------------------------------------------------------
DEVNOTES.txt | 7 +
bin/include/target-classpath.bat | 2 +-
bin/include/target-classpath.sh | 2 +-
examples/pom-standalone.xml | 2 +-
license/header-customisation.xml | 51 -
license/header.txt | 14 -
.../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 +-
modules/clients/src/test/keystore/generate.sh | 26 +-
.../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 +
.../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 | 64 +-
.../configuration/HadoopConfiguration.java | 17 +-
.../configuration/IgniteConfiguration.java | 10 +-
.../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 | 62 +-
.../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 | 10 +-
.../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 | 59 +-
.../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 | 66 +-
.../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 ++++++++++++++++++
.../core/src/main/resources/ignite.properties | 2 +-
.../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 | 16 -
.../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 | 29 +-
.../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 | 19 +-
.../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 +-
.../processors/hadoop/HadoopProcessor.java | 4 +-
.../internal/processors/hadoop/HadoopSetup.java | 2 +-
.../hadoop/igfs/HadoopIgfsFuture.java | 3 +
.../hadoop/proto/HadoopClientProtocol.java | 3 -
.../external/HadoopExternalTaskExecutor.java | 3 +
.../child/HadoopExternalProcessStarter.java | 4 +-
.../HadoopClientProtocolEmbeddedSelfTest.java | 3 +-
.../hadoop/HadoopClientProtocolSelfTest.java | 2 +-
.../processors/hadoop/HadoopGroupingTest.java | 3 +-
.../hadoop/HadoopJobTrackerSelfTest.java | 4 +-
.../hadoop/HadoopMapReduceEmbeddedSelfTest.java | 3 +-
.../hadoop/HadoopSortingExternalTest.java | 13 +-
.../processors/hadoop/HadoopSortingTest.java | 3 +-
.../hadoop/HadoopTaskExecutionSelfTest.java | 6 +-
.../HadoopExternalTaskExecutionSelfTest.java | 13 +-
.../HadoopExternalCommunicationSelfTest.java | 4 +-
.../testsuites/IgniteHadoopTestSuite.java | 6 +-
.../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 | 71 +-
583 files changed, 21998 insertions(+), 16915 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/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 080879b,7292b5a..a49c25a
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@@ -43,14 -43,17 +43,17 @@@ import java.util.*
*/
@SuppressWarnings("RedundantFieldInitialization")
public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> {
+ /** */
+ private static final long serialVersionUID = 0L;
+
- /** Default size of preload thread pool. */
- public static final int DFLT_PRELOAD_THREAD_POOL_SIZE = 2;
+ /** Default size of rebalance thread pool. */
+ public static final int DFLT_REBALANCE_THREAD_POOL_SIZE = 2;
- /** Default preload timeout (ms).*/
- public static final long DFLT_PRELOAD_TIMEOUT = 10000;
+ /** Default rebalance timeout (ms).*/
+ public static final long DFLT_REBALANCE_TIMEOUT = 10000;
- /** Time in milliseconds to wait between preload messages to avoid
overloading CPU. */
- public static final long DFLT_PRELOAD_THROTTLE = 0;
+ /** Time in milliseconds to wait between rebalance messages to avoid
overloading CPU. */
+ public static final long DFLT_REBALANCE_THROTTLE = 0;
/**
* Default time to live. The value is <tt>0</tt> which means that
@@@ -88,14 -91,11 +91,11 @@@
/** Default value for 'invalidate' flag that indicates if this is
invalidation-based cache. */
public static final boolean DFLT_INVALIDATE = false;
- /** Default value for 'storeValueBytes' flag indicating if value bytes
should be stored. */
- public static final boolean DFLT_STORE_VALUE_BYTES = true;
-
- /** Default preload mode for distributed cache. */
- public static final CachePreloadMode DFLT_PRELOAD_MODE =
CachePreloadMode.ASYNC;
+ /** Default rebalance mode for distributed cache. */
+ public static final CacheRebalanceMode DFLT_REBALANCE_MODE =
CacheRebalanceMode.ASYNC;
- /** Default preload batch size in bytes. */
- public static final int DFLT_PRELOAD_BATCH_SIZE = 512 * 1024; // 512K
+ /** Default rebalance batch size in bytes. */
+ public static final int DFLT_REBALANCE_BATCH_SIZE = 512 * 1024; // 512K
/** Default maximum eviction queue ratio. */
public static final float DFLT_MAX_EVICTION_OVERFLOW_RATIO = 10;
@@@ -1388,18 -1370,18 +1370,18 @@@
}
/**
- * Time in milliseconds to wait between preload messages to avoid
overloading of CPU or network. When preloading
- * large data sets, the CPU or network can get over-consumed with
preloading messages, which consecutively may slow
- * down the application performance. This parameter helps tune the amount
of time to wait between preload messages
- * to make sure that preloading process does not have any negative
performance impact. Note that application will
- * continue to work properly while preloading is still in progress. <p>
Value of {@code 0} means that throttling is
- * disabled. By default throttling is disabled - the default is defined
by {@link #DFLT_PRELOAD_THROTTLE} constant.
+ * Time in milliseconds to wait between rebalance messages to avoid
overloading of CPU or network. When rebalancing
+ * large data sets, the CPU or network can get over-consumed with
rebalancing messages, which consecutively may slow
+ * down the application performance. This parameter helps tune the amount
of time to wait between rebalance messages
+ * to make sure that rebalancing process does not have any negative
performance impact. Note that application will
+ * continue to work properly while rebalancing is still in progress. <p>
Value of {@code 0} means that throttling is
+ * disabled. By default throttling is disabled - the default is defined
by {@link #DFLT_REBALANCE_THROTTLE} constant.
*
- * @param rebalanceThrottle Time in milliseconds to wait between
rebalance messages to avoid overloading of CPU,
- * @param preloadThrottle Time in milliseconds to wait between preload
messages to avoid overloading of CPU, {@code
- * 0} to disable throttling.
++ * @param rebalanceThrottle Time in milliseconds to wait between
rebalance messages to avoid overloading of CPU,
+ * {@code 0} to disable throttling.
*/
- public void setPreloadThrottle(long preloadThrottle) {
- this.preloadThrottle = preloadThrottle;
+ public void setRebalanceThrottle(long rebalanceThrottle) {
+ this.rebalanceThrottle = rebalanceThrottle;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 2f94031,830765a..eb8ae54
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@@ -67,11 -67,8 +67,8 @@@ public class GridCacheAttributes implem
/** Default lock timeout. */
private long dfltLockTimeout;
- /** Flag indicating if cached values should be additionally stored in
serialized form. */
- private boolean storeValBytes;
-
- /** Cache preload mode. */
- private CachePreloadMode preloadMode;
+ /** Cache rebalance mode. */
+ private CacheRebalanceMode rebalanceMode;
/** Partitioned cache mode. */
private CacheDistributionMode partDistro;
@@@ -164,11 -161,10 +161,10 @@@
loadPrevVal = cfg.isLoadPreviousValue();
name = cfg.getName();
partDistro = GridCacheUtils.distributionMode(cfg);
- preloadBatchSize = cfg.getPreloadBatchSize();
- preloadMode = cfg.getPreloadMode();
+ rebalanceBatchSize = cfg.getRebalanceBatchSize();
+ rebalanceMode = cfg.getRebalanceMode();
qryIdxEnabled = cfg.isQueryIndexEnabled();
readThrough = cfg.isReadThrough();
- storeValBytes = cfg.isStoreValueBytes();
swapEnabled = cfg.isSwapEnabled();
ttl = cfg.getDefaultTimeToLive();
writeBehindBatchSize = cfg.getWriteBehindBatchSize();
@@@ -394,17 -390,10 +390,17 @@@
}
/**
+ * @return Flag indicating if cached values should be additionally stored
in serialized form.
+ */
+ public boolean storeValueBytes() {
+ return storeValBytes;
+ }
+
+ /**
- * @return Rebalance batch size.
+ * @return Preload batch size.
*/
- public int preloadBatchSize() {
- return preloadBatchSize;
+ public int rebalanceBatchSize() {
+ return rebalanceBatchSize;
}
/**
@@@ -497,11 -486,10 +493,10 @@@
out.writeBoolean(loadPrevVal);
U.writeString(out, name);
U.writeEnum(out, partDistro);
- out.writeInt(preloadBatchSize);
- U.writeEnum(out, preloadMode);
+ out.writeInt(rebalanceBatchSize);
+ U.writeEnum(out, rebalanceMode);
out.writeBoolean(qryIdxEnabled);
out.writeBoolean(readThrough);
- out.writeBoolean(storeValBytes);
out.writeBoolean(swapEnabled);
out.writeLong(ttl);
out.writeInt(writeBehindBatchSize);
@@@ -539,11 -527,10 +534,10 @@@
loadPrevVal = in.readBoolean();
name = U.readString(in);
partDistro = CacheDistributionMode.fromOrdinal(in.readByte());
- preloadBatchSize = in.readInt();
- preloadMode = CachePreloadMode.fromOrdinal(in.readByte());
+ rebalanceBatchSize = in.readInt();
+ rebalanceMode = CacheRebalanceMode.fromOrdinal(in.readByte());
qryIdxEnabled = in.readBoolean();
readThrough = in.readBoolean();
- storeValBytes = in.readBoolean();
swapEnabled = in.readBoolean();
ttl = in.readLong();
writeBehindBatchSize = in.readInt();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index 6fde943,953d15a..357f571
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@@ -493,8 -490,8 +490,8 @@@ public class GridCacheEvictionManager e
* @param ver Version.
* @param p Partition ID.
*/
- private void saveEvictionInfo(K key, GridCacheVersion ver, int p) {
+ private void saveEvictionInfo(KeyCacheObject key, GridCacheVersion ver,
int p) {
- assert cctx.preloadEnabled();
+ assert cctx.rebalanceEnabled();
if (!cctx.isNear()) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/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 255a479,4c50546..fc1e5ab
---
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
@@@ -56,14 -55,14 +55,14 @@@ import java.util.*
import static org.apache.ignite.IgniteSystemProperties.*;
import static org.apache.ignite.cache.CacheAtomicityMode.*;
- import static org.apache.ignite.configuration.CacheConfiguration.*;
import static org.apache.ignite.cache.CacheDistributionMode.*;
import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CachePreloadMode.*;
+import static org.apache.ignite.cache.CacheRebalanceMode.*;
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.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
index 0d5becf,f6774d6..92c62d7
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
@@@ -534,10 -534,10 +534,10 @@@ public class GridDhtLocalPartition impl
boolean swap = cctx.isSwapOrOffheapEnabled();
- boolean rec =
cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_UNLOADED);
+ boolean rec =
cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_UNLOADED);
- for (Iterator<GridDhtCacheEntry<K, V>> it = map.values().iterator();
it.hasNext();) {
- GridDhtCacheEntry<K, V> cached = it.next();
+ for (Iterator<GridDhtCacheEntry> it = map.values().iterator();
it.hasNext();) {
+ GridDhtCacheEntry cached = it.next();
try {
if (cached.clearInternal(clearVer, swap)) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 35f488d,3653aab..5b3e489
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@@ -1047,13 -1051,13 +1051,13 @@@ public final class GridDhtLockFuture<K
boolean replicate = cctx.isDrEnabled();
- boolean rec =
cctx.events().isRecordable(EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ boolean rec =
cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED);
- for (GridCacheEntryInfo<K, V> info : res.preloadEntries()) {
+ for (GridCacheEntryInfo info : res.preloadEntries()) {
try {
- GridCacheEntryEx<K,V> entry =
cctx.cache().entryEx(info.key(), topVer);
+ GridCacheEntryEx entry =
cctx.cache().entryEx(info.key(), topVer);
- if (entry.initialValue(info.value(),
info.valueBytes(), info.version(), info.ttl(),
+ if (entry.initialValue(info.value(), info.version(),
info.ttl(),
info.expireTime(), true, topVer, replicate ?
DR_PRELOAD : DR_NONE)) {
if (rec && !entry.isInternal())
cctx.events().addEvent(entry.partition(),
entry.key(), cctx.localNodeId(),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 47414bb,7630461..bc75bc0
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@@ -1233,9 -1214,9 +1214,9 @@@ public final class GridDhtTxPrepareFutu
long topVer = tx.topologyVersion();
- boolean rec =
cctx.gridEvents().isRecordable(EVT_CACHE_PRELOAD_OBJECT_LOADED);
+ boolean rec =
cctx.gridEvents().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED);
- for (GridCacheEntryInfo<K, V> info : res.preloadEntries()) {
+ for (GridCacheEntryInfo info : res.preloadEntries()) {
GridCacheContext<K, V> cacheCtx =
cctx.cacheContext(info.cacheId());
while (true) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index c500db6,bec3bf0..3c31539
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@@ -454,12 -461,12 +461,12 @@@ public final class GridDhtForceKeysFutu
remapMissed = true;
}
- // If preloading is disabled, we need to check other backups.
- if (!cctx.preloadEnabled()) {
+ // If rebalancing is disabled, we need to check other backups.
+ if (!cctx.rebalanceEnabled()) {
- Collection<K> retryKeys = F.view(
+ Collection<KeyCacheObject> retryKeys = F.view(
keys,
F0.notIn(missedKeys),
- F0.notIn(F.viewReadOnly(res.forcedInfos(), CU.<K,
V>info2Key())));
+ F0.notIn(F.viewReadOnly(res.forcedInfos(),
CU.<KeyCacheObject, V>info2Key())));
if (!retryKeys.isEmpty())
map(retryKeys, F.concat(false, node, exc));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index dfec2d6,149929d..f569021
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@@ -70,9 -70,9 +70,9 @@@ public class GridDhtPartitionDemandPool
private final Collection<DemandWorker> dmdWorkers;
/** Preload predicate. */
- private IgnitePredicate<GridCacheEntryInfo<K, V>> preloadPred;
+ private IgnitePredicate<GridCacheEntryInfo> preloadPred;
- /** Future for preload mode {@link
org.apache.ignite.cache.CachePreloadMode#SYNC}. */
+ /** Future for preload mode {@link
org.apache.ignite.cache.CacheRebalanceMode#SYNC}. */
@GridToStringInclude
private SyncFuture syncFut;
@@@ -351,9 -351,9 +351,9 @@@
if (obj != null)
cctx.time().removeTimeoutObject(obj);
- final GridDhtPartitionsExchangeFuture<K, V> exchFut =
lastExchangeFut;
+ final GridDhtPartitionsExchangeFuture exchFut = lastExchangeFut;
- assert exchFut != null : "Delaying preload process without
topology event.";
+ assert exchFut != null : "Delaying rebalance process without
topology event.";
obj = new GridTimeoutObjectAdapter(delay) {
@Override public void onTimeout() {
@@@ -809,10 -808,29 +808,29 @@@
/** {@inheritDoc} */
@Override protected void body() throws InterruptedException,
IgniteInterruptedCheckedException {
try {
+ int rebalanceOrder = cctx.config().getRebalanceOrder();
+
+ if (!CU.isMarshallerCache(cctx.name())) {
+ if (log.isDebugEnabled())
+ log.debug("Waiting for marshaller cache preload
[cacheName=" + cctx.name() + ']');
+
+ try {
+
cctx.kernalContext().cache().marshallerCache().preloader().syncFuture().get();
+ }
+ catch (IgniteInterruptedCheckedException e) {
+ if (log.isDebugEnabled())
+ log.debug("Failed to wait for marshaller cache
preload future (grid is stopping): " +
+ "[cacheName=" + cctx.name() + ']');
+
+ return;
+ }
+ catch (IgniteCheckedException e) {
+ throw new Error("Ordered preload future should never
fail: " + e.getMessage(), e);
+ }
+ }
+
- int preloadOrder = cctx.config().getPreloadOrder();
-
- if (preloadOrder > 0) {
- IgniteInternalFuture<?> fut =
cctx.kernalContext().cache().orderedPreloadFuture(preloadOrder);
+ if (rebalanceOrder > 0) {
+ IgniteInternalFuture<?> fut =
cctx.kernalContext().cache().orderedPreloadFuture(rebalanceOrder);
try {
if (fut != null) {
@@@ -968,11 -986,11 +986,11 @@@
* @param exchFut Exchange future.
* @return Assignments of partitions to nodes.
*/
- GridDhtPreloaderAssignments<K, V>
assign(GridDhtPartitionsExchangeFuture<K, V> exchFut) {
+ GridDhtPreloaderAssignments<K, V> assign(GridDhtPartitionsExchangeFuture
exchFut) {
// No assignments for disabled preloader.
- GridDhtPartitionTopology<K, V> top = cctx.dht().topology();
+ GridDhtPartitionTopology top = cctx.dht().topology();
- if (!cctx.preloadEnabled())
+ if (!cctx.rebalanceEnabled())
return new GridDhtPreloaderAssignments<>(exchFut,
top.topologyVersion());
int partCnt = cctx.affinity().partitions();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index 139e73e,7b1786d..70f7d29
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@@ -157,10 -157,10 +157,10 @@@ class GridDhtPartitionSupplyPool<K, V>
if (log.isDebugEnabled())
log.debug("Received partition demand [node=" + nodeId +
", demand=" + d + ']');
- queue.offer(new DemandMessage<>(nodeId, d));
+ queue.offer(new DemandMessage(nodeId, d));
}
else
- U.warn(log, "Received partition demand message when
preloading is disabled (will ignore): " + d);
+ U.warn(log, "Received partition demand message when
rebalancing is disabled (will ignore): " + d);
}
finally {
leaveBusy();
@@@ -238,12 -238,12 +238,12 @@@
assert msg != null;
assert node != null;
- GridDhtPartitionDemandMessage<K, V> d = msg.message();
+ GridDhtPartitionDemandMessage d = msg.message();
- GridDhtPartitionSupplyMessage<K, V> s = new
GridDhtPartitionSupplyMessage<>(d.workerId(),
+ GridDhtPartitionSupplyMessage s = new
GridDhtPartitionSupplyMessage(d.workerId(),
d.updateSequence(), cctx.cacheId());
- long preloadThrottle = cctx.config().getPreloadThrottle();
+ long preloadThrottle = cctx.config().getRebalanceThrottle();
boolean ack = false;
@@@ -314,9 -312,9 +312,9 @@@
if (info != null && !(info.key() instanceof
GridPartitionLockKey) && !info.isNew()) {
if (preloadPred == null ||
preloadPred.apply(info))
- s.addEntry(part, info, cctx.shared());
+ s.addEntry(part, info, cctx);
else if (log.isDebugEnabled())
- log.debug("Preload predicate evaluated to
false (will not sender cache entry): " +
+ log.debug("Rebalance predicate evaluated
to false (will not sender cache entry): " +
info);
}
}
@@@ -370,21 -368,13 +368,13 @@@
info.ttl(swapEntry.ttl());
info.expireTime(swapEntry.expireTime());
info.version(swapEntry.version());
-
- if (!swapEntry.valueIsByteArray()) {
- if (convertPortable)
-
info.valueBytes(cctx.convertPortableBytes(swapEntry.valueBytes()));
- else
-
info.valueBytes(swapEntry.valueBytes());
- }
- else
- info.value(swapEntry.value());
+ info.value(swapEntry.value());
if (preloadPred == null ||
preloadPred.apply(info))
- s.addEntry0(part, info,
cctx.shared());
+ s.addEntry0(part, info, cctx);
else {
if (log.isDebugEnabled())
- log.debug("Preload predicate
evaluated to false (will not send " +
+ log.debug("Rebalance
predicate evaluated to false (will not send " +
"cache entry): " + info);
continue;
@@@ -454,9 -445,9 +445,9 @@@
}
if (preloadPred == null ||
preloadPred.apply(info))
- s.addEntry(part, info, cctx.shared());
+ s.addEntry(part, info, cctx);
else if (log.isDebugEnabled())
- log.debug("Preload predicate evaluated to
false (will not sender cache entry): " +
+ log.debug("Rebalance predicate evaluated
to false (will not sender cache entry): " +
info);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index f267a78,c171f97..498a5e5
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@@ -127,11 -127,11 +127,11 @@@ public class GridDhtPreloader<K, V> ext
/** {@inheritDoc} */
@Override public void start() {
if (log.isDebugEnabled())
- log.debug("Starting DHT preloader...");
+ log.debug("Starting DHT rebalancer...");
cctx.io().addHandler(cctx.cacheId(), GridDhtForceKeysRequest.class,
- new MessageHandler<GridDhtForceKeysRequest<K, V>>() {
- @Override public void onMessage(ClusterNode node,
GridDhtForceKeysRequest<K, V> msg) {
+ new MessageHandler<GridDhtForceKeysRequest>() {
+ @Override public void onMessage(ClusterNode node,
GridDhtForceKeysRequest msg) {
processForceKeysRequest(node, msg);
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index 8b5f3ec,f310f30..83a23b7
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@@ -101,8 -101,7 +101,7 @@@ public class GridCacheDeploymentSelfTes
cfg.setCacheMode(PARTITIONED);
cfg.setWriteSynchronizationMode(FULL_SYNC);
- cfg.setPreloadMode(SYNC);
+ cfg.setRebalanceMode(SYNC);
- cfg.setStoreValueBytes(true);
cfg.setAtomicityMode(TRANSACTIONAL);
cfg.setDistributionMode(NEAR_PARTITIONED);
cfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapPreloadSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePutAllUpdateNonPreloadedPartitionSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAtomicNearCacheSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtInternalEntrySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadStartStopSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCachePartitionedUnloadEventsSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeCounterSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSalvageSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6bb9dbc4/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
