Merge ignite-45 --> ignite-421
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cba2edf5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cba2edf5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cba2edf5 Branch: refs/heads/ignite-421 Commit: cba2edf5e266fe69caddbf98668df853d5b2a251 Parents: 210d5ca 0f7b028 Author: sevdokimov <[email protected]> Authored: Wed Mar 11 12:41:27 2015 +0300 Committer: sevdokimov <[email protected]> Committed: Wed Mar 11 12:41:27 2015 +0300 ---------------------------------------------------------------------- .../examples/datagrid/CacheApiExample.java | 23 +- .../ClientAbstractMultiThreadedSelfTest.java | 1 - .../ClientAbstractMultiNodeSelfTest.java | 1 - .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 1 - .../src/main/java/org/apache/ignite/Ignite.java | 24 +- .../apache/ignite/IgniteSystemProperties.java | 5 + .../main/java/org/apache/ignite/Ignition.java | 18 + .../java/org/apache/ignite/cache/GridCache.java | 5 + .../org/apache/ignite/cluster/ClusterGroup.java | 22 +- .../configuration/CacheConfiguration.java | 168 ++--- .../configuration/IgniteConfiguration.java | 163 +++-- .../configuration/NearCacheConfiguration.java | 131 ++++ .../internal/GridEventConsumeHandler.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 41 +- .../ignite/internal/IgniteNodeAttributes.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 172 ++++-- .../internal/cluster/ClusterGroupAdapter.java | 53 +- .../ignite/internal/cluster/ClusterGroupEx.java | 6 +- .../discovery/GridDiscoveryManager.java | 214 +++++-- .../affinity/GridAffinityAssignmentCache.java | 8 +- .../affinity/GridAffinityProcessor.java | 15 +- .../cache/DynamicCacheChangeRequest.java | 76 ++- .../cache/DynamicCacheDescriptor.java | 66 +- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheAttributes.java | 363 ++--------- .../processors/cache/GridCacheContext.java | 14 +- .../GridCacheDefaultAffinityKeyMapper.java | 2 +- .../cache/GridCacheDeploymentManager.java | 17 +- .../cache/GridCacheEvictionManager.java | 10 +- .../GridCachePartitionExchangeManager.java | 2 + .../processors/cache/GridCacheProcessor.java | 617 ++++++++++--------- .../processors/cache/GridCacheProxyImpl.java | 12 + .../processors/cache/GridCacheUtils.java | 93 +-- .../processors/cache/IgniteCacheProxy.java | 22 +- .../distributed/dht/GridDhtCacheAdapter.java | 6 +- .../distributed/dht/GridDhtCacheEntry.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 3 +- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 23 +- .../distributed/near/GridNearCacheAdapter.java | 35 +- .../distributed/near/GridNearGetFuture.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 2 +- .../cache/query/GridCacheQueryAdapter.java | 9 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 20 +- .../continuous/CacheContinuousQueryManager.java | 9 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 11 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 11 +- .../jdbc/GridCacheQueryJdbcValidationTask.java | 7 +- .../cache/transactions/IgniteTxAdapter.java | 2 +- .../processors/igfs/IgfsDataManager.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 123 ---- .../ignite/internal/util/lang/GridFunc.java | 30 - .../ignite/internal/visor/cache/VisorCache.java | 4 +- .../visor/cache/VisorCacheConfiguration.java | 2 +- .../cache/VisorCacheEvictionConfiguration.java | 2 +- .../cache/VisorCacheNearConfiguration.java | 6 +- .../ignite/startup/BasicWarmupClosure.java | 8 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- ...CachePartitionFairAffinityNodesSelfTest.java | 2 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 3 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 3 +- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 +- .../GridProjectionForCachesSelfTest.java | 23 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 3 +- .../discovery/GridDiscoveryManagerSelfTest.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 6 +- .../GridCacheAbstractLocalStoreSelfTest.java | 4 +- .../cache/GridCacheAbstractSelfTest.java | 8 +- ...acheAbstractUsersAffinityMapperSelfTest.java | 6 +- .../GridCacheAtomicMessageCountSelfTest.java | 11 +- ...dCacheAtomicUsersAffinityMapperSelfTest.java | 12 +- .../cache/GridCacheBasicStoreAbstractTest.java | 8 - .../cache/GridCacheClearAllSelfTest.java | 2 - .../cache/GridCacheClearLocalySelfTest.java | 7 +- ...dCacheColocatedTxStoreExceptionSelfTest.java | 6 +- .../GridCacheConcurrentTxMultiNodeTest.java | 3 - ...idCacheConfigurationConsistencySelfTest.java | 78 +-- .../GridCacheDaemonNodeAbstractSelfTest.java | 3 +- .../GridCacheDeploymentOffHeapSelfTest.java | 3 +- .../cache/GridCacheDeploymentSelfTest.java | 3 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 3 +- .../GridCacheEvictionEventAbstractTest.java | 8 - .../GridCacheExAbstractFullApiSelfTest.java | 6 +- .../GridCacheFinishPartitionsSelfTest.java | 3 +- ...idCacheGetAndTransformStoreAbstractTest.java | 9 - .../cache/GridCacheIncrementTransformTest.java | 2 - ...cheInterceptorAtomicNearEnabledSelfTest.java | 11 +- ...erceptorAtomicPrimaryWriteOrderSelfTest.java | 8 +- .../GridCacheInterceptorAtomicSelfTest.java | 8 +- ...GridCacheInterceptorNearEnabledSelfTest.java | 7 +- .../cache/GridCacheInterceptorSelfTest.java | 8 +- .../GridCacheKeyCheckNearEnabledSelfTest.java | 6 +- .../cache/GridCacheKeyCheckSelfTest.java | 7 +- .../processors/cache/GridCacheLeakTest.java | 3 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 22 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 3 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 5 +- ...ultinodeUpdateAtomicNearEnabledSelfTest.java | 6 +- .../GridCacheMultinodeUpdateAtomicSelfTest.java | 6 +- ...CacheMultinodeUpdateNearEnabledSelfTest.java | 6 +- .../cache/GridCacheMultinodeUpdateSelfTest.java | 6 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 1 - .../cache/GridCacheObjectToStringSelfTest.java | 3 +- .../processors/cache/GridCacheOffHeapTest.java | 3 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../cache/GridCacheOffheapUpdateSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 3 - .../cache/GridCachePartitionedGetSelfTest.java | 4 +- .../GridCachePartitionedLocalStoreSelfTest.java | 13 +- ...chePartitionedOffHeapLocalStoreSelfTest.java | 13 +- ...hePartitionedProjectionAffinitySelfTest.java | 1 - .../cache/GridCachePartitionedWritesTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 5 +- .../cache/GridCachePutAllFailoverSelfTest.java | 2 +- .../GridCacheReferenceCleanupSelfTest.java | 3 +- .../cache/GridCacheReloadSelfTest.java | 3 +- .../GridCacheReplicatedLocalStoreSelfTest.java | 13 +- ...CacheReplicatedTxStoreExceptionSelfTest.java | 6 +- ...heReplicatedUsersAffinityMapperSelfTest.java | 12 +- .../GridCacheReturnValueTransferSelfTest.java | 22 +- .../cache/GridCacheSwapPreloadSelfTest.java | 1 - ...ridCacheTxPartitionedLocalStoreSelfTest.java | 13 +- .../GridCacheTxUsersAffinityMapperSelfTest.java | 12 +- .../GridCacheValueBytesPreloadingSelfTest.java | 3 +- ...idCacheValueConsistencyAbstractSelfTest.java | 10 +- ...istencyTransactionalNearEnabledSelfTest.java | 6 +- .../cache/GridCacheVersionMultinodeTest.java | 13 +- .../GridCacheWriteBehindStoreAbstractTest.java | 2 - ...BehindStorePartitionedMultiNodeSelfTest.java | 3 +- .../IgniteCacheAbstractStopBusySelfTest.java | 14 +- .../cache/IgniteCacheAbstractTest.java | 4 +- .../cache/IgniteCacheAtomicInvokeTest.java | 6 +- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 6 +- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 8 +- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 6 +- ...IgniteCacheEntryListenerAtomicLocalTest.java | 6 +- .../IgniteCacheEntryListenerAtomicTest.java | 6 +- .../IgniteCacheEntryListenerTxLocalTest.java | 6 +- .../cache/IgniteCacheEntryListenerTxTest.java | 6 +- .../cache/IgniteCacheInvokeReadThroughTest.java | 6 +- .../cache/IgniteCachePeekModesAbstractTest.java | 6 +- .../cache/IgniteCacheStartStopLoadTest.java | 136 ++++ .../cache/IgniteCacheTxInvokeTest.java | 6 +- .../cache/IgniteCacheTxLocalInvokeTest.java | 6 +- .../IgniteCacheTxNearEnabledInvokeTest.java | 8 +- .../cache/IgniteCachingProviderSelfTest.java | 4 +- .../IgniteClientAffinityAssignmentSelfTest.java | 7 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 82 ++- .../cache/IgnitePutAllLargeBatchSelfTest.java | 3 +- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 2 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 4 +- .../IgniteCacheAtomicExecutionContextTest.java | 6 +- ...iteCachePartitionedExecutionContextTest.java | 6 +- ...niteCacheReplicatedExecutionContextTest.java | 6 +- .../IgniteCacheTxExecutionContextTest.java | 6 +- .../IgniteCollectionAbstractTest.java | 1 - ...idCachePartitionedNodeRestartTxSelfTest.java | 2 - ...tractPartitionedByteArrayValuesSelfTest.java | 9 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 5 +- .../GridCacheAtomicTimeoutSelfTest.java | 5 +- .../GridCacheClientModesAbstractSelfTest.java | 3 +- ...acheEntrySetIterationPreloadingSelfTest.java | 4 +- .../distributed/GridCacheLockAbstractTest.java | 1 - .../distributed/GridCacheMixedModeSelfTest.java | 2 +- ...dCacheMultithreadedFailoverAbstractTest.java | 19 +- ...dCachePartitionedAffinityFilterSelfTest.java | 1 - ...chePartitionedReloadAllAbstractSelfTest.java | 4 +- .../GridCachePreloadEventsAbstractSelfTest.java | 3 +- ...GridCachePreloadRestartAbstractSelfTest.java | 4 +- .../GridCacheTransformEventSelfTest.java | 1 - .../IgniteCrossCacheTxStoreSelfTest.java | 3 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 4 +- ...tPartitionedOnlyByteArrayValuesSelfTest.java | 4 +- ...heAbstractTransformWriteThroughSelfTest.java | 3 +- ...acheAtomicExpiredEntriesPreloadSelfTest.java | 6 +- .../dht/GridCacheAtomicFullApiSelfTest.java | 5 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 3 +- ...idCacheAtomicNearEnabledFullApiSelfTest.java | 8 +- ...EnabledPrimaryWriteOrderFullApiSelfTest.java | 8 +- .../dht/GridCacheClientOnlySelfTest.java | 8 +- .../dht/GridCacheColocatedDebugTest.java | 3 +- .../dht/GridCacheColocatedFailoverSelfTest.java | 6 +- ...eColocatedOptimisticTransactionSelfTest.java | 4 +- .../GridCacheColocatedPrimarySyncSelfTest.java | 8 +- .../GridCacheColocatedTxExceptionSelfTest.java | 6 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 6 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 2 +- .../GridCacheDhtAtomicRemoveFailureTest.java | 3 +- .../dht/GridCacheDhtEntrySelfTest.java | 1 - .../dht/GridCacheDhtEntrySetSelfTest.java | 3 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 10 +- .../dht/GridCacheDhtEvictionSelfTest.java | 9 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 3 +- ...idCacheDhtExpiredEntriesPreloadSelfTest.java | 6 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 7 +- .../dht/GridCacheDhtMappingSelfTest.java | 1 - .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 1 - .../GridCacheDhtPreloadDisabledSelfTest.java | 2 - .../dht/GridCacheDhtRemoveFailureTest.java | 3 +- .../dht/GridCacheDhtTxPreloadSelfTest.java | 3 +- .../dht/GridCacheGlobalLoadTest.java | 6 +- ...ePartitionedNearDisabledFullApiSelfTest.java | 8 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 3 +- ...nedNearDisabledMultiNodeFullApiSelfTest.java | 8 +- ...bledMultiNodeP2PDisabledFullApiSelfTest.java | 8 +- ...isabledTxOriginatingNodeFailureSelfTest.java | 6 +- ...dCachePartitionedTopologyChangeSelfTest.java | 3 +- ...itionedTxOriginatingNodeFailureSelfTest.java | 5 - ...IgniteCacheContainsKeyColocatedSelfTest.java | 5 +- ...teTxConsistencyColocatedRestartSelfTest.java | 5 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 3 +- ...lueConsistencyAtomicNearEnabledSelfTest.java | 14 +- ...micPrimaryWriteOrderNearEnabledSelfTest.java | 6 +- ...CacheContainsKeyColocatedAtomicSelfTest.java | 5 +- ...tNearPartitionedByteArrayValuesSelfTest.java | 5 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 14 +- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 5 +- ...omicMultiNodeP2PDisabledFullApiSelfTest.java | 5 +- ...omicNearEnabledMultiNodeFullApiSelfTest.java | 8 +- ...imaryWriteOrderMultiNodeFullApiSelfTest.java | 8 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 10 +- .../GridCacheAtomicNearRemoveFailureTest.java | 3 +- .../GridCacheAtomicOffHeapFullApiSelfTest.java | 5 +- ...heAtomicOffHeapMultiNodeFullApiSelfTest.java | 5 +- ...cPrimaryWriteOrderNearRemoveFailureTest.java | 3 +- .../near/GridCacheExNearFullApiSelfTest.java | 6 +- .../near/GridCacheGetStoreErrorSelfTest.java | 6 +- .../GridCacheNearEvictionEventSelfTest.java | 5 - .../near/GridCacheNearEvictionSelfTest.java | 10 +- ...dCacheNearExpiredEntriesPreloadSelfTest.java | 6 +- .../near/GridCacheNearJobExecutionSelfTest.java | 3 +- .../near/GridCacheNearMultiGetSelfTest.java | 2 - .../near/GridCacheNearMultiNodeSelfTest.java | 3 +- .../near/GridCacheNearOneNodeSelfTest.java | 2 - ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 6 +- .../near/GridCacheNearOnlySelfTest.java | 7 - .../near/GridCacheNearOnlyTopologySelfTest.java | 6 +- .../GridCacheNearPartitionedClearSelfTest.java | 3 +- .../near/GridCacheNearPrimarySyncSelfTest.java | 8 +- .../GridCacheNearReaderPreloadSelfTest.java | 5 +- .../near/GridCacheNearReadersSelfTest.java | 7 +- .../near/GridCacheNearRemoveFailureTest.java | 3 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 3 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 6 - .../near/GridCacheNearTxPreloadSelfTest.java | 2 +- .../GridCachePartitionedAffinitySelfTest.java | 2 - .../near/GridCachePartitionedBasicApiTest.java | 3 +- ...ionedClientOnlyNoPrimaryFullApiSelfTest.java | 7 +- .../near/GridCachePartitionedEventSelfTest.java | 3 +- .../GridCachePartitionedEvictionSelfTest.java | 2 +- ...titionedExplicitLockNodeFailureSelfTest.java | 2 +- ...GridCachePartitionedFilteredPutSelfTest.java | 3 +- .../GridCachePartitionedFullApiSelfTest.java | 1 - ...idCachePartitionedHitsAndMissesSelfTest.java | 3 +- ...achePartitionedMultiNodeCounterSelfTest.java | 3 +- ...idCachePartitionedMultiNodeLockSelfTest.java | 3 +- .../GridCachePartitionedMultiNodeSelfTest.java | 2 - ...ePartitionedMultiThreadedPutGetSelfTest.java | 9 +- ...itionedNearOnlyNoPrimaryFullApiSelfTest.java | 6 +- ...GridCachePartitionedNodeFailureSelfTest.java | 2 - .../GridCachePartitionedNodeRestartTest.java | 3 +- ...achePartitionedPreloadLifecycleSelfTest.java | 1 - ...hePartitionedQueryMultiThreadedSelfTest.java | 2 - ...achePartitionedTxSingleThreadedSelfTest.java | 1 - ...idCacheRendezvousAffinityClientSelfTest.java | 5 +- .../near/IgniteCacheNearReadCommittedTest.java | 5 +- ...stractReplicatedByteArrayValuesSelfTest.java | 1 - .../GridCacheReplicatedEvictionSelfTest.java | 5 +- .../GridCacheReplicatedFullApiSelfTest.java | 5 +- .../GridCacheReplicatedTxExceptionSelfTest.java | 6 +- ...ssimisticOriginatingNodeFailureSelfTest.java | 7 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 3 +- .../GridCacheBatchEvictUnswapSelfTest.java | 4 +- ...heConcurrentEvictionConsistencySelfTest.java | 3 +- .../GridCacheConcurrentEvictionsSelfTest.java | 9 +- .../GridCacheDistributedEvictionsSelfTest.java | 8 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 3 - .../eviction/GridCacheEvictionAbstractTest.java | 18 +- .../GridCacheEvictionFilterSelfTest.java | 14 +- .../GridCacheEvictionLockUnlockSelfTest.java | 9 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 5 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 6 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 7 +- .../IgniteCacheAtomicExpiryPolicyTest.java | 6 +- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 6 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 5 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 6 +- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 6 +- .../IgniteCacheTxLocalExpiryPolicyTest.java | 6 +- .../IgniteCacheAtomicLoadAllTest.java | 6 +- .../IgniteCacheAtomicLoaderWriterTest.java | 6 +- .../IgniteCacheAtomicLocalLoadAllTest.java | 6 +- ...CacheAtomicLocalNoLoadPreviousValueTest.java | 6 +- ...IgniteCacheAtomicLocalNoReadThroughTest.java | 6 +- ...gniteCacheAtomicLocalNoWriteThroughTest.java | 6 +- ...tomicNearEnabledNoLoadPreviousValueTest.java | 8 +- ...CacheAtomicNearEnabledNoReadThroughTest.java | 8 +- ...acheAtomicNearEnabledNoWriteThroughTest.java | 8 +- ...gniteCacheAtomicNoLoadPreviousValueTest.java | 6 +- .../IgniteCacheAtomicNoReadThroughTest.java | 6 +- .../IgniteCacheAtomicNoWriteThroughTest.java | 6 +- .../IgniteCacheAtomicStoreSessionTest.java | 6 +- .../integration/IgniteCacheTxLoadAllTest.java | 6 +- .../IgniteCacheTxLoaderWriterTest.java | 6 +- .../IgniteCacheTxLocalLoadAllTest.java | 5 +- ...niteCacheTxLocalNoLoadPreviousValueTest.java | 6 +- .../IgniteCacheTxLocalNoReadThroughTest.java | 6 +- .../IgniteCacheTxLocalNoWriteThroughTest.java | 6 +- ...cheTxNearEnabledNoLoadPreviousValueTest.java | 8 +- ...niteCacheTxNearEnabledNoReadThroughTest.java | 8 +- ...iteCacheTxNearEnabledNoWriteThroughTest.java | 8 +- .../IgniteCacheTxNoLoadPreviousValueTest.java | 6 +- .../IgniteCacheTxNoReadThroughTest.java | 6 +- .../IgniteCacheTxNoWriteThroughTest.java | 6 +- .../IgniteCacheTxStoreSessionTest.java | 6 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 1 - ...ridCacheContinuousQueryAbstractSelfTest.java | 7 +- ...ontinuousQueryAtomicNearEnabledSelfTest.java | 8 +- .../GridCacheContinuousQueryAtomicSelfTest.java | 6 +- ...eContinuousQueryPartitionedOnlySelfTest.java | 6 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 7 +- ...ridCacheReduceFieldsQueryAtomicSelfTest.java | 6 +- .../dataload/GridDataLoaderPerformanceTest.java | 3 +- .../GridDataLoaderProcessorSelfTest.java | 10 +- .../processors/igfs/IgfsAbstractSelfTest.java | 2 +- ...sCachePerBlockLruEvictionPolicySelfTest.java | 8 +- .../processors/igfs/IgfsCacheSelfTest.java | 2 +- .../igfs/IgfsDataManagerSelfTest.java | 2 +- .../igfs/IgfsMetaManagerSelfTest.java | 3 +- .../processors/igfs/IgfsMetricsSelfTest.java | 8 +- .../processors/igfs/IgfsModesSelfTest.java | 4 +- .../processors/igfs/IgfsProcessorSelfTest.java | 2 +- .../processors/igfs/IgfsSizeSelfTest.java | 4 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../processors/igfs/IgfsTaskSelfTest.java | 4 +- .../IgfsAbstractRecordResolverSelfTest.java | 3 +- .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 3 +- .../loadtests/GridCacheMultiNodeLoadTest.java | 3 +- .../cache/GridCachePutRemoveLoadTest.java | 373 ----------- .../cache/GridCacheSingleNodeLoadTest.java | 182 ------ .../GridCachePartitionedAtomicLongLoadTest.java | 1 - .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../GridCacheStoreValueBytesNode.java | 13 +- .../ignite/testframework/GridTestUtils.java | 25 + .../testframework/junits/GridAbstractTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 21 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +- .../igfs/HadoopIgfsDualAbstractSelfTest.java | 2 +- ...oopSecondaryFileSystemConfigurationTest.java | 4 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 6 +- .../IgniteHadoopFileSystemClientSelfTest.java | 3 +- ...IgniteHadoopFileSystemHandshakeSelfTest.java | 5 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 2 +- ...niteHadoopFileSystemLoggerStateSelfTest.java | 2 +- ...teHadoopFileSystemSecondaryModeSelfTest.java | 4 +- .../HibernateL2CacheTransactionalSelfTest.java | 3 +- .../cache/GridCacheAbstractQuerySelfTest.java | 4 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 2 - .../GridCacheCrossCacheQuerySelfTestNewApi.java | 3 - .../cache/GridCacheOffHeapAndSwapSelfTest.java | 4 +- .../GridCacheQueryMultiThreadedSelfTest.java | 1 - .../GridCacheSqlQueryMultiThreadedSelfTest.java | 5 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 3 +- .../GridCacheAtomicFieldsQuerySelfTest.java | 8 +- ...cheAtomicNearEnabledFieldsQuerySelfTest.java | 8 +- ...GridCachePartitionedFieldsQuerySelfTest.java | 7 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 1 - .../query/h2/sql/GridQueryParsingTest.java | 4 +- .../GridTmLookupLifecycleAwareSelfTest.java | 12 +- .../org/apache/ignite/IgniteSpringBean.java | 29 + .../org/apache/ignite/yardstick/IgniteNode.java | 3 +- 374 files changed, 2395 insertions(+), 2914 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cba2edf5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 9d27f4a,a1792d7..030e53a --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@@ -1247,9 -1248,16 +1250,16 @@@ public class IgniteCacheProxy<K, V> ext /** {@inheritDoc} */ @Override public boolean isClosed() { // TODO IGNITE-45 (Support start/close/destroy cache correctly) - return getCacheManager() == null; + return cacheMgr != null && cacheMgr.isClosed(); } + /** + * + */ + public GridCacheProjectionEx delegate() { + return delegate; + } + /** {@inheritDoc} */ @SuppressWarnings("unchecked") @Override public <T> T unwrap(Class<T> clazz) {
