Merge branch 'sprint-1' into ignite-138
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/efb5272a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/efb5272a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/efb5272a Branch: refs/heads/ignite-189 Commit: efb5272af56e567aaf575e322ef6fba75d6963fa Parents: e0d0ca9 9513a62 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Feb 12 15:44:54 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Feb 12 15:44:54 2015 +0300 ---------------------------------------------------------------------- assembly/dependencies-optional-fabric.xml | 1 + assembly/dependencies-optional-hadoop.xml | 2 +- assembly/dependencies-schema-load.xml | 2 +- assembly/dependencies-visor-trial.xml | 80 - assembly/release-base-fabric.xml | 83 - assembly/release-base.xml | 2 + assembly/release-fabric.xml | 59 +- assembly/release-scala.xml | 50 + examples/pom-standalone.xml | 83 +- examples/pom.xml | 79 +- .../scalar/examples/ScalarCacheExample.scala | 5 +- .../ClientAbstractMultiThreadedSelfTest.java | 29 +- .../ClientAbstractMultiNodeSelfTest.java | 18 +- .../integration/ClientAbstractSelfTest.java | 195 +- .../rest/AbstractRestProcessorSelfTest.java | 3 +- .../rest/RestBinaryProtocolSelfTest.java | 211 +- .../rest/RestMemcacheProtocolSelfTest.java | 80 +- .../processors/rest/RestProcessorTest.java | 2 +- .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 5 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 14 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 5 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 4 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 3 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 3 +- .../loadtests/client/ClientTcpSslLoadTest.java | 4 +- modules/clients/src/test/keystore/generate.sh | 25 +- modules/core/pom.xml | 81 + .../src/main/java/org/apache/ignite/Ignite.java | 20 +- .../java/org/apache/ignite/IgniteCache.java | 67 +- .../org/apache/ignite/IgniteCountDownLatch.java | 2 - .../java/org/apache/ignite/IgniteServices.java | 2 +- .../org/apache/ignite/cache/CacheEntry.java | 623 ---- .../org/apache/ignite/cache/CacheManager.java | 15 +- .../apache/ignite/cache/CacheProjection.java | 56 +- .../java/org/apache/ignite/cache/GridCache.java | 3 +- .../cache/eviction/CacheEvictionFilter.java | 8 +- .../cache/eviction/CacheEvictionPolicy.java | 10 +- .../ignite/cache/eviction/EvictableEntry.java | 67 +- .../eviction/fifo/CacheFifoEvictionPolicy.java | 48 +- .../fifo/CacheFifoEvictionPolicyMBean.java | 8 - .../ignitefs/CacheIgniteFsEvictionFilter.java | 5 +- .../CacheIgniteFsPerBlockLruEvictionPolicy.java | 49 +- .../eviction/lru/CacheLruEvictionPolicy.java | 32 +- .../lru/CacheLruEvictionPolicyMBean.java | 8 - .../random/CacheRandomEvictionPolicy.java | 33 +- .../configuration/AtomicConfiguration.java | 2 +- .../configuration/CacheConfiguration.java | 6 +- .../ignite/events/AuthorizationEvent.java | 2 +- .../org/apache/ignite/events/CacheEvent.java | 2 +- .../apache/ignite/events/CheckpointEvent.java | 2 +- .../apache/ignite/events/DeploymentEvent.java | 2 +- .../java/org/apache/ignite/events/JobEvent.java | 2 +- .../ignite/internal/GridJobContextImpl.java | 3 - .../ignite/internal/GridKernalContext.java | 28 - .../ignite/internal/GridKernalContextImpl.java | 47 +- .../ignite/internal/GridPluginComponent.java | 2 - .../apache/ignite/internal/GridProductImpl.java | 189 - .../apache/ignite/internal/GridProperties.java | 2 +- .../ignite/internal/GridUpdateNotifier.java | 15 - .../org/apache/ignite/internal/IgniteEx.java | 12 +- .../apache/ignite/internal/IgniteKernal.java | 271 +- .../ignite/internal/IgniteVersionUtils.java | 78 + .../impl/GridRouterCommandLineStartup.java | 4 +- .../internal/managers/GridManagerAdapter.java | 14 +- .../managers/security/GridSecurityImpl.java | 95 - .../processors/cache/CacheEntryEvent.java | 5 +- .../processors/cache/CacheEntryImpl.java | 8 +- .../processors/cache/CacheEntryImpl0.java | 6 +- .../processors/cache/CacheInvokeEntry.java | 42 +- .../cache/CacheVersionedEntryImpl.java | 62 + .../processors/cache/EvictableEntryImpl.java | 188 + .../processors/cache/GridCacheAdapter.java | 403 ++- .../cache/GridCacheAffinityManager.java | 2 +- .../cache/GridCacheConcurrentMap.java | 115 +- .../processors/cache/GridCacheContext.java | 36 +- .../cache/GridCacheDeploymentManager.java | 8 +- .../processors/cache/GridCacheEntryEx.java | 55 +- .../processors/cache/GridCacheEntryImpl.java | 729 ---- .../processors/cache/GridCacheEntrySet.java | 33 +- .../cache/GridCacheEvictionEntry.java | 494 --- .../cache/GridCacheEvictionManager.java | 42 +- .../cache/GridCacheFilterEvaluationEntry.java | 400 --- .../processors/cache/GridCacheIterator.java | 33 +- .../processors/cache/GridCacheKeySet.java | 30 +- .../processors/cache/GridCacheMapAdapter.java | 70 +- .../processors/cache/GridCacheMapEntry.java | 402 ++- .../processors/cache/GridCacheMessage.java | 20 +- .../processors/cache/GridCachePeekMode.java | 4 +- .../processors/cache/GridCacheProcessor.java | 7 +- .../processors/cache/GridCacheProjectionEx.java | 25 +- .../cache/GridCacheProjectionImpl.java | 126 +- .../processors/cache/GridCacheProxyImpl.java | 82 +- .../processors/cache/GridCacheStoreManager.java | 63 +- .../processors/cache/GridCacheSwapManager.java | 9 +- .../processors/cache/GridCacheUtils.java | 85 +- .../cache/GridCacheValueCollection.java | 29 +- .../cache/GridCacheWriteBehindStore.java | 17 +- .../processors/cache/IgniteCacheProxy.java | 55 +- .../distributed/GridCacheTtlUpdateRequest.java | 2 +- .../GridDistributedCacheAdapter.java | 10 +- .../GridDistributedTxRemoteAdapter.java | 15 +- .../GridPartitionedCacheEntryImpl.java | 423 --- .../IgniteExternalizableExpiryPolicy.java | 14 +- .../distributed/dht/GridDhtCacheAdapter.java | 78 +- .../distributed/dht/GridDhtCacheEntry.java | 13 - .../distributed/dht/GridDhtCacheEntryImpl.java | 172 - .../cache/distributed/dht/GridDhtGetFuture.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 16 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 4 +- .../dht/GridPartitionedGetFuture.java | 6 +- .../dht/atomic/GridDhtAtomicCache.java | 49 +- .../dht/atomic/GridDhtAtomicCacheEntry.java | 20 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 5 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 7 +- .../dht/colocated/GridDhtColocatedCache.java | 43 +- .../colocated/GridDhtColocatedCacheEntry.java | 12 - .../colocated/GridDhtColocatedLockFuture.java | 6 +- .../colocated/GridDhtDetachedCacheEntry.java | 3 - .../distributed/near/GridNearAtomicCache.java | 36 +- .../distributed/near/GridNearCacheAdapter.java | 113 +- .../distributed/near/GridNearCacheEntry.java | 14 +- .../distributed/near/GridNearGetFuture.java | 6 +- .../distributed/near/GridNearGetRequest.java | 8 +- .../distributed/near/GridNearLockFuture.java | 8 +- .../distributed/near/GridNearLockRequest.java | 8 +- .../near/GridNearTransactionalCache.java | 16 +- .../near/GridNearTxFinishFuture.java | 6 +- .../processors/cache/local/GridLocalCache.java | 10 +- .../cache/local/GridLocalLockFuture.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 63 +- .../query/GridCacheDistributedQueryManager.java | 6 +- .../cache/query/GridCacheLocalQueryFuture.java | 6 +- .../cache/query/GridCacheQueriesImpl.java | 4 +- .../cache/query/GridCacheQueryAdapter.java | 9 +- .../cache/query/GridCacheQueryInfo.java | 8 +- .../cache/query/GridCacheQueryManager.java | 302 +- .../cache/query/GridCacheQueryRequest.java | 8 +- .../GridCacheContinuousQueryAdapter.java | 5 +- .../GridCacheContinuousQueryEntry.java | 432 +-- .../GridCacheContinuousQueryHandler.java | 14 +- .../GridCacheContinuousQueryManager.java | 14 +- .../jdbc/GridCacheQueryJdbcValidationTask.java | 5 - .../cache/transactions/IgniteInternalTx.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 17 + .../cache/transactions/IgniteTxEntry.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 55 +- .../cache/transactions/IgniteTxLocalEx.java | 8 +- .../GridCacheVersionConflictContext.java | 4 +- .../processors/fs/GridGgfsDataManager.java | 12 +- .../processors/fs/GridGgfsIpcHandler.java | 13 +- .../internal/processors/fs/GridGgfsServer.java | 2 +- .../processors/fs/IgniteFsProcessor.java | 5 - .../license/GridLicenseProcessor.java | 69 - .../license/GridLicenseSubsystem.java | 53 - .../license/GridLicenseUseRegistry.java | 90 - .../license/os/GridOsLicenseProcessor.java | 66 - .../internal/processors/license/os/package.html | 24 - .../internal/processors/license/package.html | 24 - .../portable/GridPortableProcessor.java | 3 + .../portable/os/GridOsPortableProcessor.java | 5 + .../processors/rest/GridRestProcessor.java | 7 +- .../handlers/cache/GridCacheCommandHandler.java | 4 - .../version/GridVersionCommandHandler.java | 4 +- .../service/GridServiceProcessor.java | 27 +- .../streamer/GridStreamProcessor.java | 5 - .../ignite/internal/product/IgniteProduct.java | 67 - .../internal/product/IgniteProductLicense.java | 183 - .../product/IgniteProductLicenseException.java | 70 - .../apache/ignite/internal/product/package.html | 24 - .../ignite/internal/util/IgniteUtils.java | 33 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 5 +- .../ignite/internal/util/lang/GridFunc.java | 410 +-- .../ignite/internal/util/typedef/PCE.java | 11 +- .../apache/ignite/internal/visor/VisorJob.java | 8 +- .../ignite/internal/visor/cache/VisorCache.java | 16 +- .../visor/cache/VisorCacheClearTask.java | 140 +- .../visor/cache/VisorCacheCompactTask.java | 2 +- .../visor/cache/VisorCacheLoadTask.java | 2 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../cache/VisorCacheMetricsCollectorTask.java | 2 +- .../visor/cache/VisorCachePreloadTask.java | 2 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 19 +- .../compute/VisorComputeCancelSessionsTask.java | 4 +- .../compute/VisorComputeMonitoringHolder.java | 16 +- .../compute/VisorComputeResetMetricsTask.java | 2 +- .../VisorComputeToggleMonitoringTask.java | 10 +- .../visor/ggfs/VisorGgfsFormatTask.java | 2 +- .../visor/ggfs/VisorGgfsProfilerClearTask.java | 4 +- .../visor/ggfs/VisorGgfsProfilerTask.java | 4 +- .../visor/ggfs/VisorGgfsResetMetricsTask.java | 2 +- .../visor/ggfs/VisorGgfsSamplingStateTask.java | 2 +- .../internal/visor/log/VisorLogSearchTask.java | 10 +- .../internal/visor/misc/VisorAckTask.java | 2 +- .../visor/misc/VisorLatestVersionTask.java | 2 +- .../visor/node/VisorGridConfiguration.java | 10 +- .../VisorNodeConfigurationCollectorJob.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 49 +- .../visor/node/VisorNodeDataCollectorTask.java | 3 +- .../node/VisorNodeEventsCollectorTask.java | 16 +- .../internal/visor/node/VisorNodeGcTask.java | 2 +- .../internal/visor/node/VisorNodePingTask.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 2 +- .../visor/query/VisorQueryNextPageTask.java | 4 +- .../internal/visor/query/VisorQueryTask.java | 18 +- .../streamer/VisorStreamerMetricsResetTask.java | 4 +- .../visor/streamer/VisorStreamerResetTask.java | 4 +- .../internal/visor/util/VisorTaskUtils.java | 18 +- .../org/apache/ignite/lang/IgniteFuture.java | 1 - .../optimized/OptimizedClassDescriptor.java | 2 +- .../optimized/optimized-classnames.properties | 62 +- .../ignite/plugin/security/GridSecurity.java | 97 - .../plugin/security/GridSecuritySubject.java | 1 - .../startup/cmdline/CommandLineStartup.java | 8 +- .../core/src/main/resources/ignite.properties | 1 + modules/core/src/test/config/tests.properties | 6 +- .../apache/ignite/GridTestStoreNodeStartup.java | 4 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- ...CachePartitionFairAffinityNodesSelfTest.java | 4 +- .../GridJobMasterLeaveAwareSelfTest.java | 6 +- .../ignite/internal/GridProjectionSelfTest.java | 2 +- .../ignite/internal/GridStartStopSelfTest.java | 6 +- .../ignite/internal/GridVersionSelfTest.java | 7 +- .../IgniteComputeTopologyExceptionTest.java | 112 + .../checkpoint/GridCheckpointTaskSelfTest.java | 4 +- .../GridDeploymentMessageCountSelfTest.java | 7 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 8 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 237 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 348 +- .../GridCacheAbstractRemoveFailureTest.java | 11 +- .../cache/GridCacheAbstractSelfTest.java | 60 +- .../cache/GridCacheAbstractTxReadTest.java | 1 - .../cache/GridCacheAffinityApiSelfTest.java | 14 +- .../cache/GridCacheAffinityRoutingSelfTest.java | 4 +- .../cache/GridCacheAlwaysEvictionPolicy.java | 3 +- .../GridCacheAsyncOperationsLimitSelfTest.java | 6 +- .../cache/GridCacheBasicApiAbstractTest.java | 8 +- .../cache/GridCacheBasicStoreAbstractTest.java | 2 +- .../cache/GridCacheClearAllSelfTest.java | 301 +- .../cache/GridCacheClearLocalySelfTest.java | 336 ++ .../cache/GridCacheConcurrentMapSelfTest.java | 84 +- .../cache/GridCacheConcurrentMapTest.java | 15 +- .../GridCacheConcurrentTxMultiNodeTest.java | 21 +- ...idCacheConfigurationConsistencySelfTest.java | 6 +- .../GridCacheDaemonNodeAbstractSelfTest.java | 8 +- .../cache/GridCacheDeploymentSelfTest.java | 29 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 74 +- .../cache/GridCacheEntryVersionSelfTest.java | 6 +- .../GridCacheEvictionEventAbstractTest.java | 5 +- .../GridCacheFinishPartitionsSelfTest.java | 10 +- .../cache/GridCacheGlobalClearAllSelfTest.java | 167 - .../GridCacheGroupLockAbstractSelfTest.java | 203 +- .../GridCacheGroupLockFailoverSelfTest.java | 7 +- .../cache/GridCacheGroupLockPutTask.java | 11 +- .../GridCacheInterceptorAbstractSelfTest.java | 2 +- .../cache/GridCacheKeyCheckSelfTest.java | 7 +- .../processors/cache/GridCacheLeakTest.java | 3 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 4 +- .../GridCacheMarshallerTxAbstractTest.java | 16 +- .../cache/GridCacheMemoryModeSelfTest.java | 2 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 5 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 10 +- ...ridCacheMultinodeUpdateAbstractSelfTest.java | 2 +- .../cache/GridCacheMvccManagerSelfTest.java | 4 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 2 +- .../cache/GridCacheNestedTxAbstractTest.java | 9 +- .../cache/GridCacheObjectToStringSelfTest.java | 17 +- ...HeapMultiThreadedUpdateAbstractSelfTest.java | 75 +- ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 76 +- .../cache/GridCacheOffHeapSelfTest.java | 12 +- .../processors/cache/GridCacheOffHeapTest.java | 5 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 87 +- ...heOffHeapTieredEvictionAbstractSelfTest.java | 23 +- .../cache/GridCacheOffheapUpdateSelfTest.java | 28 +- .../GridCacheOrderedPreloadingSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 15 +- .../cache/GridCachePartitionedGetSelfTest.java | 28 +- .../GridCachePreloadingEvictionsSelfTest.java | 21 +- .../cache/GridCachePutAllFailoverSelfTest.java | 11 +- .../GridCacheReferenceCleanupSelfTest.java | 37 +- .../cache/GridCacheReloadSelfTest.java | 4 +- ...ridCacheReplicatedSynchronousCommitTest.java | 6 +- .../cache/GridCacheSlowTxWarnTest.java | 6 +- .../processors/cache/GridCacheStopSelfTest.java | 9 +- .../cache/GridCacheStoreValueBytesSelfTest.java | 4 +- .../cache/GridCacheSwapPreloadSelfTest.java | 21 +- .../processors/cache/GridCacheTestEntryEx.java | 47 +- ...cheTransactionalAbstractMetricsSelfTest.java | 13 +- .../GridCacheValueBytesPreloadingSelfTest.java | 10 +- ...idCacheValueConsistencyAbstractSelfTest.java | 7 +- .../GridCacheVariableTopologySelfTest.java | 8 +- ...BehindStorePartitionedMultiNodeSelfTest.java | 11 +- .../IgniteCacheEntryListenerAbstractTest.java | 1 - .../cache/IgniteCacheInvokeAbstractTest.java | 4 + .../processors/cache/IgniteTxAbstractTest.java | 29 +- .../IgniteTxConcurrentGetAbstractTest.java | 6 +- .../IgniteTxExceptionAbstractSelfTest.java | 52 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 74 +- .../IgniteTxMultiThreadedAbstractTest.java | 7 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 52 +- ...eAbstractDataStructuresFailoverSelfTest.java | 26 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 2 +- .../GridCacheSequenceApiSelfAbstractTest.java | 11 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 32 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 8 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- ...tractDistributedByteArrayValuesSelfTest.java | 54 +- .../GridCacheAbstractNodeRestartSelfTest.java | 44 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 7 +- .../GridCacheAtomicTimeoutSelfTest.java | 45 +- .../GridCacheBasicOpAbstractTest.java | 74 +- .../GridCacheClientModesAbstractSelfTest.java | 30 +- .../GridCacheEntrySetAbstractSelfTest.java | 16 +- ...acheEntrySetIterationPreloadingSelfTest.java | 8 +- .../distributed/GridCacheEventAbstractTest.java | 133 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 1 - .../distributed/GridCacheLockAbstractTest.java | 2 +- .../distributed/GridCacheMixedModeSelfTest.java | 5 +- .../GridCacheMultiNodeAbstractTest.java | 190 +- .../GridCacheMultiNodeLockAbstractTest.java | 33 +- ...dCacheMultithreadedFailoverAbstractTest.java | 26 +- .../GridCacheNodeFailureAbstractTest.java | 15 +- ...dCachePartitionedAffinityFilterSelfTest.java | 5 +- ...chePartitionedReloadAllAbstractSelfTest.java | 9 +- .../GridCachePreloadEventsAbstractSelfTest.java | 4 +- ...GridCachePreloadRestartAbstractSelfTest.java | 22 +- .../GridCacheTransformEventSelfTest.java | 6 +- .../IgniteCrossCacheTxStoreSelfTest.java | 26 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 16 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 12 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 28 +- .../IgniteTxTimeoutAbstractTest.java | 11 +- ...tPartitionedOnlyByteArrayValuesSelfTest.java | 25 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 42 +- .../dht/GridCacheColocatedDebugTest.java | 120 +- ...eColocatedOptimisticTransactionSelfTest.java | 17 +- .../dht/GridCacheDhtEntrySelfTest.java | 48 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 11 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 4 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 23 +- .../dht/GridCacheDhtMappingSelfTest.java | 2 +- .../dht/GridCacheDhtMultiBackupTest.java | 7 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 14 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 42 +- .../GridCacheDhtPreloadDisabledSelfTest.java | 8 +- .../GridCacheDhtPreloadMessageCountTest.java | 14 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 56 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 22 +- ...cheGroupLockPartitionedAbstractSelfTest.java | 17 +- ...ockPartitionedMultiNodeAbstractSelfTest.java | 35 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 11 +- ...idCachePartitionedPreloadEventsSelfTest.java | 6 +- ...dCachePartitionedTopologyChangeSelfTest.java | 49 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 8 +- .../dht/IgniteTxReentryColocatedSelfTest.java | 5 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 7 +- .../atomic/GridCacheAtomicPreloadSelfTest.java | 14 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 4 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 12 +- ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 10 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 4 +- .../near/GridCacheGetStoreErrorSelfTest.java | 9 +- .../near/GridCacheNearEvictionSelfTest.java | 20 +- .../near/GridCacheNearMetricsSelfTest.java | 199 +- .../near/GridCacheNearMultiGetSelfTest.java | 17 +- .../near/GridCacheNearMultiNodeSelfTest.java | 10 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 142 +- .../near/GridCacheNearOnlySelfTest.java | 11 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 25 +- .../GridCacheNearPartitionedClearSelfTest.java | 19 +- .../GridCacheNearReaderPreloadSelfTest.java | 27 +- .../near/GridCacheNearReadersSelfTest.java | 14 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 23 +- ...AffinityExcludeNeighborsPerformanceTest.java | 2 +- .../GridCachePartitionedAffinitySelfTest.java | 11 +- .../GridCachePartitionedFullApiSelfTest.java | 172 +- .../GridCachePartitionedLoadCacheSelfTest.java | 10 +- ...achePartitionedMultiNodeCounterSelfTest.java | 48 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 90 +- ...ePartitionedMultiThreadedPutGetSelfTest.java | 14 +- ...achePartitionedPreloadLifecycleSelfTest.java | 67 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 4 +- .../GridCachePartitionedStorePutSelfTest.java | 20 +- .../near/GridCachePutArrayValueSelfTest.java | 14 +- ...idCacheRendezvousAffinityClientSelfTest.java | 5 +- .../near/IgniteTxReentryNearSelfTest.java | 5 +- .../GridCacheReplicatedEvictionSelfTest.java | 2 +- ...ReplicatedFullApiMultithreadedSelfTest1.java | 36 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 13 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 17 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 82 +- .../GridCacheReplicatedPreloadSelfTest.java | 51 +- ...GridCacheReplicatedPreloadUndeploysTest.java | 4 +- .../GridCacheBatchEvictUnswapSelfTest.java | 10 +- ...heConcurrentEvictionConsistencySelfTest.java | 22 +- .../GridCacheConcurrentEvictionsSelfTest.java | 6 +- .../GridCacheDistributedEvictionsSelfTest.java | 16 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 50 +- .../eviction/GridCacheEvictionAbstractTest.java | 69 +- .../GridCacheEvictionFilterSelfTest.java | 29 +- .../GridCacheEvictionLockUnlockSelfTest.java | 2 +- .../GridCacheEvictionTouchSelfTest.java | 42 +- .../cache/eviction/GridCacheMockEntry.java | 287 +- .../GridCacheFifoEvictionPolicySelfTest.java | 14 +- .../lru/GridCacheLruEvictionPolicySelfTest.java | 15 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 2 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../GridCacheRandomEvictionPolicySelfTest.java | 25 +- ...iteCacheAtomicExpiryPolicyWithStoreTest.java | 49 + .../IgniteCacheExpiryPolicyAbstractTest.java | 154 +- .../IgniteCacheExpiryPolicyTestSuite.java | 3 + ...eCacheExpiryPolicyWithStoreAbstractTest.java | 236 ++ .../IgniteCacheTxExpiryPolicyWithStoreTest.java | 43 + ...iteCacheNoLoadPreviousValueAbstractTest.java | 1 - .../IgniteCacheNoReadThroughAbstractTest.java | 1 - .../IgniteCacheNoWriteThroughAbstractTest.java | 1 - .../IgniteCacheStoreSessionAbstractTest.java | 10 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 29 +- .../local/GridCacheLocalLoadAllSelfTest.java | 2 +- .../local/GridCacheLocalTxTimeoutSelfTest.java | 20 +- .../GridCacheSwapScanQueryAbstractSelfTest.java | 43 - ...ridCacheContinuousQueryAbstractSelfTest.java | 59 +- .../dataload/GridDataLoaderImplSelfTest.java | 2 +- .../GridDataLoaderProcessorSelfTest.java | 26 +- .../processors/fs/GridGgfsCacheSelfTest.java | 6 +- .../fs/GridGgfsProcessorSelfTest.java | 3 +- .../GridServiceProcessorAbstractSelfTest.java | 10 +- .../GridServiceProcessorMultiNodeSelfTest.java | 2 +- .../product/GridProductVersionSelfTest.java | 4 +- .../util/future/GridFinishedFutureSelfTest.java | 2 +- .../apache/ignite/lang/GridFuncSelfTest.java | 3254 ------------------ .../loadtests/GridCacheMultiNodeLoadTest.java | 2 - .../cache/GridCacheAbstractLoadTest.java | 12 +- ...ridCacheAffinityTransactionsOffHeapTest.java | 40 +- .../loadtests/cache/GridCacheBenchmark.java | 6 +- .../cache/GridCacheDataStructuresLoadTest.java | 6 +- .../cache/GridCacheGroupLockComparisonTest.java | 9 +- .../loadtests/cache/GridCacheLoadTest.java | 26 +- .../cache/GridCachePutRemoveLoadTest.java | 8 +- .../cache/GridCacheSingleNodeLoadTest.java | 6 +- .../loadtests/cache/GridCacheSwapLoadTest.java | 10 +- .../capacity/GridCapacityLoadTest.java | 2 +- .../colocation/GridTestCacheStore.java | 7 +- .../loadtests/colocation/GridTestMain.java | 12 +- .../GridCachePartitionedAtomicLongLoadTest.java | 4 +- .../ignite/loadtests/dsi/GridDsiClient.java | 4 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 23 +- .../cacheget/GridBenchmarkCacheGetLoadTest.java | 1 - .../mapper/GridContinuousMapperTask1.java | 3 +- .../mapper/GridContinuousMapperTask2.java | 3 +- .../swap/GridSwapEvictAllBenchmark.java | 10 +- .../marshaller/GridMarshallerAbstractTest.java | 79 +- .../p2p/GridAbstractMultinodeRedeployTest.java | 4 +- .../CacheCheckpointSpiSecondCacheSelfTest.java | 14 +- .../GridCacheStoreValueBytesTest.java | 16 +- .../ignite/testframework/GridTestUtils.java | 17 +- .../testframework/junits/GridAbstractTest.java | 4 - .../junits/GridTestKernalContext.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 10 +- .../GridAbstractLifecycleAwareSelfTest.java | 6 +- .../junits/common/GridCommonAbstractTest.java | 66 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../testsuites/IgniteComputeGridTestSuite.java | 1 + .../testsuites/IgniteLangSelfTestSuite.java | 1 - .../processors/hadoop/GridHadoopSetup.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 10 +- ...idHibernateL2CacheConfigurationSelfTest.java | 36 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 5 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +- .../cache/GridCacheQueryLoadSelfTest.java | 9 +- .../processors/cache/GridCacheSwapSelfTest.java | 11 +- .../near/GridCachePartitionedQuerySelfTest.java | 36 +- .../http/jetty/GridJettyRestHandler.java | 2 +- modules/scalar/pom.xml | 15 - .../ignite/scalar/ScalarConversions.scala | 6 +- .../pimps/ScalarCacheProjectionPimp.scala | 10 +- .../scala/org/apache/ignite/scalar/scalar.scala | 6 +- .../tests/ScalarCacheProjectionSpec.scala | 39 - .../schema-load/src/main/java/media/style.css | 5 + .../apache/ignite/schema/model/PojoField.java | 6 +- .../org/apache/ignite/schema/ui/MessageBox.java | 8 +- .../apache/ignite/schema/ui/SchemaLoadApp.java | 88 +- .../org/apache/ignite/IgniteSpringBean.java | 14 +- .../cache/spring/SpringDynamicCacheManager.java | 17 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 23 +- .../spring/GridSpringCacheManagerSelfTest.java | 23 +- .../GridSpringDynamicCacheManagerSelfTest.java | 11 +- .../optimized/OptimizedClassNamesGenerator.java | 2 +- modules/visor-console/pom.xml | 15 - .../ignite/visor/commands/VisorConsole.scala | 27 +- .../visor/commands/ack/VisorAckCommand.scala | 4 +- .../commands/alert/VisorAlertCommand.scala | 24 +- .../commands/cache/VisorCacheClearCommand.scala | 17 +- .../commands/cache/VisorCacheCommand.scala | 8 +- .../cache/VisorCacheCompactCommand.scala | 4 +- .../commands/cache/VisorCacheScanCommand.scala | 8 +- .../commands/cache/VisorCacheSwapCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 15 +- .../commands/deploy/VisorDeployCommand.scala | 11 +- .../commands/disco/VisorDiscoveryCommand.scala | 27 +- .../commands/events/VisorEventsCommand.scala | 19 +- .../visor/commands/gc/VisorGcCommand.scala | 6 +- .../visor/commands/kill/VisorKillCommand.scala | 10 +- .../visor/commands/node/VisorNodeCommand.scala | 18 +- .../visor/commands/ping/VisorPingCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 13 +- .../commands/tasks/VisorTasksCommand.scala | 38 +- .../commands/top/VisorTopologyCommand.scala | 26 +- .../visor/commands/vvm/VisorVvmCommand.scala | 28 +- .../scala/org/apache/ignite/visor/visor.scala | 74 +- .../cache/VisorCacheClearCommandSpec.scala | 16 +- .../commands/cache/VisorCacheCommandSpec.scala | 2 +- .../cache/VisorCacheCompactCommandSpec.scala | 8 +- .../cswap/VisorCacheSwapCommandSpec.scala | 4 +- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- .../cache/websession/GridWebSessionFilter.java | 2 +- .../internal/websession/WebSessionSelfTest.java | 4 +- pom.xml | 211 +- 522 files changed, 7529 insertions(+), 14784 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java index 79015dd,23dd368..e6ff9b5 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java @@@ -18,9 -18,7 +18,8 @@@ package org.apache.ignite.internal.processors.cache.transactions; import org.apache.ignite.*; - import org.apache.ignite.cache.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.managers.communication.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.version.*; import org.apache.ignite.internal.processors.timeout.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/efb5272a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ----------------------------------------------------------------------
