Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-424
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38db16b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38db16b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38db16b4 Branch: refs/heads/ignite-424 Commit: 38db16b464c63683bfddf90c006efef8e1abbd25 Parents: 0995cdf 381fd1a Author: avinogradov <avinogra...@gridgain.com> Authored: Fri Apr 24 11:58:13 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Fri Apr 24 11:58:13 2015 +0300 ---------------------------------------------------------------------- .../examples/ScalarContinuationExample.scala | 10 +- .../aop/aspectj/GridifyAspectJAspect.java | 2 +- .../aspectj/GridifySetToSetAspectJAspect.java | 2 +- .../aspectj/GridifySetToValueAspectJAspect.java | 2 +- .../aop/spring/GridifySetToSetSpringAspect.java | 2 +- .../spring/GridifySetToValueSpringAspect.java | 2 +- .../gridify/aop/spring/GridifySpringAspect.java | 2 +- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../apache/ignite/cache/CacheInterceptor.java | 9 +- .../cache/CacheServerNotFoundException.java | 12 +- .../apache/ignite/cache/CachingProvider.java | 3 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 7 +- .../igfs/IgfsPerBlockLruEvictionPolicy.java | 3 +- .../cache/eviction/lru/LruEvictionPolicy.java | 5 +- .../eviction/sorted/SortedEvictionPolicy.java | 431 +++++ .../sorted/SortedEvictionPolicyMBean.java | 66 + .../cache/eviction/sorted/package-info.java | 21 + .../apache/ignite/cache/query/QueryMetrics.java | 2 +- .../ignite/compute/ComputeJobContinuation.java | 2 + .../configuration/CacheConfiguration.java | 33 +- .../configuration/IgniteConfiguration.java | 107 ++ .../ignite/configuration/TopologyValidator.java | 35 + .../ignite/events/CacheQueryExecutedEvent.java | 3 +- .../ignite/events/CacheQueryReadEvent.java | 3 +- .../ignite/internal/GridJobContextImpl.java | 100 +- .../org/apache/ignite/internal/IgniteEx.java | 10 +- .../apache/ignite/internal/IgniteKernal.java | 25 +- .../org/apache/ignite/internal/IgnitionEx.java | 14 +- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../connection/GridClientNioTcpConnection.java | 9 +- .../ClusterTopologyServerNotFoundException.java | 12 +- .../internal/managers/GridManagerAdapter.java | 4 +- .../managers/communication/GridIoManager.java | 33 +- .../GridLifecycleAwareMessageFilter.java | 35 + .../deployment/GridDeploymentClassLoader.java | 2 +- .../discovery/GridDiscoveryManager.java | 69 +- .../eventstorage/GridEventStorageManager.java | 6 + .../affinity/GridAffinityAssignmentCache.java | 11 +- .../processors/cache/CacheEntryImpl.java | 29 +- .../processors/cache/CacheLockImpl.java | 20 +- .../processors/cache/CacheOperationContext.java | 170 ++ .../processors/cache/CacheProjection.java | 1386 ------------- .../cache/CacheStoreBalancingWrapper.java | 6 + .../cache/CacheVersionedEntryImpl.java | 29 +- .../internal/processors/cache/GridCache.java | 223 --- .../processors/cache/GridCacheAdapter.java | 207 +- .../cache/GridCacheAffinityManager.java | 12 - .../processors/cache/GridCacheAtomicFuture.java | 7 - .../cache/GridCacheConcurrentMap.java | 24 +- .../processors/cache/GridCacheContext.java | 66 +- .../processors/cache/GridCacheEntryEx.java | 4 + .../cache/GridCacheEvictionManager.java | 11 +- .../processors/cache/GridCacheGateway.java | 119 +- .../processors/cache/GridCacheIoManager.java | 6 + .../processors/cache/GridCacheMapEntry.java | 20 +- .../GridCachePartitionExchangeManager.java | 7 +- .../processors/cache/GridCacheProcessor.java | 21 +- .../processors/cache/GridCacheProjectionEx.java | 351 ---- .../cache/GridCacheProjectionImpl.java | 766 -------- .../processors/cache/GridCacheProxy.java | 27 - .../processors/cache/GridCacheProxyImpl.java | 396 ++-- .../processors/cache/GridCacheUtils.java | 59 +- .../processors/cache/IgniteCacheProxy.java | 449 +++-- .../processors/cache/IgniteInternalCache.java | 1816 ++++++++++++++++++ .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../cache/affinity/GridCacheAffinityProxy.java | 30 +- .../CacheDataStructuresManager.java | 8 +- .../GridDistributedCacheAdapter.java | 20 +- .../distributed/GridDistributedLockRequest.java | 99 +- .../GridDistributedTxRemoteAdapter.java | 3 + .../dht/GridDhtAffinityAssignmentResponse.java | 21 +- .../distributed/dht/GridDhtCacheAdapter.java | 8 +- .../cache/distributed/dht/GridDhtGetFuture.java | 9 +- .../distributed/dht/GridDhtLockFuture.java | 20 +- .../distributed/dht/GridDhtLockRequest.java | 7 +- .../distributed/dht/GridDhtTopologyFuture.java | 8 + .../dht/GridDhtTransactionalCacheAdapter.java | 21 +- .../distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 + .../distributed/dht/GridDhtTxLocalAdapter.java | 26 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 8 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 +- .../dht/GridPartitionedGetFuture.java | 7 + .../dht/atomic/GridDhtAtomicCache.java | 110 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 57 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +- .../dht/colocated/GridDhtColocatedCache.java | 61 +- .../colocated/GridDhtColocatedLockFuture.java | 42 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 20 + .../distributed/near/GridNearAtomicCache.java | 13 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java | 41 +- .../distributed/near/GridNearLockRequest.java | 7 +- .../near/GridNearTransactionalCache.java | 49 +- .../near/GridNearTxFinishFuture.java | 3 + .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../near/GridNearTxPrepareFuture.java | 20 + .../distributed/near/GridNearTxRemote.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 69 +- .../processors/cache/query/CacheQueries.java | 103 - .../cache/query/CacheQueriesImpl.java | 142 -- .../cache/query/CacheQueriesProxy.java | 200 -- .../processors/cache/query/CacheQuery.java | 5 +- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheLocalQueryFuture.java | 3 + .../query/GridCacheQueryFutureAdapter.java | 3 + .../cache/query/GridCacheQueryManager.java | 130 +- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 7 +- .../cache/transactions/IgniteTxAdapter.java | 9 +- .../cache/transactions/IgniteTxEntry.java | 74 +- .../cache/transactions/IgniteTxHandler.java | 27 +- .../transactions/IgniteTxLocalAdapter.java | 122 +- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../cache/transactions/IgniteTxManager.java | 44 - .../IgniteCacheObjectProcessorImpl.java | 2 +- .../closure/GridClosureProcessor.java | 16 +- .../datastreamer/DataStreamProcessor.java | 28 +- .../datastreamer/DataStreamerCacheUpdaters.java | 15 +- .../datastreamer/DataStreamerImpl.java | 84 +- .../datastreamer/DataStreamerRequest.java | 38 +- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../datastructures/DataStructuresProcessor.java | 24 +- .../datastructures/GridCacheAtomicLongImpl.java | 4 +- .../GridCacheAtomicReferenceImpl.java | 4 +- .../GridCacheAtomicSequenceImpl.java | 4 +- .../GridCacheAtomicStampedImpl.java | 4 +- .../GridCacheCountDownLatchImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 2 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 2 - .../processors/igfs/IgfsDataManager.java | 6 +- .../processors/igfs/IgfsFileWorkerBatch.java | 3 + .../processors/igfs/IgfsMetaManager.java | 8 +- .../internal/processors/igfs/IgfsThread.java | 8 +- .../processors/job/GridJobHoldListener.java | 6 +- .../processors/job/GridJobProcessor.java | 28 +- .../internal/processors/job/GridJobWorker.java | 32 +- .../portable/GridPortableInputStream.java | 26 - .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 5 +- .../processors/rest/GridRestProcessor.java | 3 + .../handlers/cache/GridCacheCommandHandler.java | 64 +- .../service/GridServiceProcessor.java | 11 +- .../processors/task/GridTaskProcessor.java | 6 +- .../processors/task/GridTaskWorker.java | 12 + .../timeout/GridTimeoutProcessor.java | 3 + .../ignite/internal/util/IgniteUtils.java | 2 +- .../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 12 +- .../ignite/internal/util/nio/GridNioServer.java | 6 + .../apache/ignite/internal/util/typedef/X.java | 2 +- .../ignite/internal/util/worker/GridWorker.java | 3 + .../visor/cache/VisorCacheMetadataTask.java | 9 +- .../internal/visor/cache/VisorCacheMetrics.java | 4 +- .../visor/cache/VisorCacheRebalanceTask.java | 4 +- .../visor/cache/VisorCacheResetMetricsTask.java | 2 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 6 +- .../ignite/messaging/MessagingListenActor.java | 3 + .../org/apache/ignite/spi/IgniteSpiThread.java | 3 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 + .../ignite/startup/BasicWarmupClosure.java | 20 +- .../startup/cmdline/CommandLineStartup.java | 5 +- .../startup/cmdline/CommandLineTransformer.java | 3 + .../TransactionSynchronization.java | 45 - .../resources/META-INF/classnames.properties | 41 +- .../internal/GridCacheProjectionRemoveTest.java | 41 - .../internal/GridContinuousTaskSelfTest.java | 114 ++ ...ridFailFastNodeFailureDetectionSelfTest.java | 5 + .../internal/GridLifecycleBeanSelfTest.java | 36 + .../internal/IgniteInternalCacheRemoveTest.java | 41 + .../GridDiscoveryManagerAliveCacheSelfTest.java | 6 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 520 ++++- .../GridCacheConcurrentTxMultiNodeTest.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 4 +- .../processors/cache/GridCacheTestEntryEx.java | 2 + .../cache/IgniteDynamicCacheStartSelfTest.java | 4 +- .../cache/IgniteExcangeFutureHistoryTest.java | 74 + ...gniteTopologyValidatorAbstractCacheTest.java | 183 ++ ...iteTopologyValidatorAbstractTxCacheTest.java | 125 ++ ...ValidatorNearPartitionedAtomicCacheTest.java | 30 + ...logyValidatorNearPartitionedTxCacheTest.java | 30 + ...logyValidatorPartitionedAtomicCacheTest.java | 49 + ...TopologyValidatorPartitionedTxCacheTest.java | 30 + ...ologyValidatorReplicatedAtomicCacheTest.java | 49 + ...eTopologyValidatorReplicatedTxCacheTest.java | 30 + .../GridCacheAtomicTimeoutSelfTest.java | 314 --- ...ridCachePartitionNotLoadedEventSelfTest.java | 22 +- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 + .../IgniteCacheMessageRecoveryAbstractTest.java | 175 ++ .../IgniteCachePutGetRestartAbstractTest.java | 234 +++ .../IgniteCacheTxFairAffinityNodeJoinTest.java | 35 + .../IgniteCacheTxMessageRecoveryTest.java | 32 + ...arDisabledFairAffinityPutGetRestartTest.java | 35 + ...iteCacheTxNearDisabledPutGetRestartTest.java | 30 + .../dht/GridCacheDhtPreloadSelfTest.java | 4 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 + .../dht/IgniteCacheMultiTxLockSelfTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 36 + ...micFairAffinityMultiNodeFullApiSelfTest.java | 35 + ...ledFairAffinityMultiNodeFullApiSelfTest.java | 36 + ...derFairAffinityMultiNodeFullApiSelfTest.java | 36 + ...nlyFairAffinityMultiNodeFullApiSelfTest.java | 35 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 1 + ...achePartitionedPreloadLifecycleSelfTest.java | 2 +- ...nedFairAffinityMultiNodeFullApiSelfTest.java | 37 + ...dezvousAffinityMultiNodeFullApiSelfTest.java | 35 - ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ++++ ...acheSortedEvictionPolicyPerformanceTest.java | 135 ++ .../GridCacheSortedEvictionPolicySelfTest.java | 373 ++++ .../GridCacheLocalIsolatedNodesSelfTest.java | 102 + .../GridCacheSwapScanQueryAbstractSelfTest.java | 26 +- .../DataStreamerMultiThreadedSelfTest.java | 101 + .../processors/igfs/IgfsSizeSelfTest.java | 2 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../cache/GridCacheCommandHandlerSelfTest.java | 10 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../GridContinuousOperationsLoadTest.java | 3 +- .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../testframework/junits/GridAbstractTest.java | 15 + .../IgniteCacheEvictionSelfTestSuite.java | 3 + .../IgniteCacheFailoverTestSuite.java | 4 + .../IgniteCacheFullApiSelfTestSuite.java | 9 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 10 +- .../IgniteTopologyValidatorTestSuit.java | 43 + .../ignite/util/TestTcpCommunicationSpi.java | 54 + .../processors/hadoop/HadoopDefaultJobInfo.java | 3 + .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 + .../hadoop/jobtracker/HadoopJobTracker.java | 19 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 3 + .../external/HadoopExternalTaskExecutor.java | 3 + .../processors/hadoop/v2/HadoopV2Job.java | 11 +- .../hadoop/v2/HadoopV2TaskContext.java | 9 + .../HadoopDefaultMapReducePlannerSelfTest.java | 8 +- .../HibernateAccessStrategyAdapter.java | 10 +- .../hibernate/HibernateCollectionRegion.java | 2 +- .../cache/hibernate/HibernateEntityRegion.java | 2 +- .../hibernate/HibernateGeneralDataRegion.java | 2 +- .../hibernate/HibernateNaturalIdRegion.java | 2 +- .../HibernateNonStrictAccessStrategy.java | 4 +- .../hibernate/HibernateQueryResultsRegion.java | 2 +- .../HibernateReadOnlyAccessStrategy.java | 2 +- .../HibernateReadWriteAccessStrategy.java | 2 +- .../ignite/cache/hibernate/HibernateRegion.java | 4 +- .../cache/hibernate/HibernateRegionFactory.java | 10 +- .../hibernate/HibernateTimestampsRegion.java | 2 +- .../HibernateTransactionalAccessStrategy.java | 4 +- .../HibernateTransactionalDataRegion.java | 2 +- .../HibernateL2CacheConfigurationSelfTest.java | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 10 +- .../query/h2/sql/GridSqlFunction.java | 6 +- .../query/h2/sql/GridSqlPlaceholder.java | 51 + .../query/h2/sql/GridSqlQueryParser.java | 6 +- .../query/h2/twostep/GridMapQueryExecutor.java | 37 +- .../h2/twostep/GridReduceQueryExecutor.java | 34 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 53 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 66 +- .../GridCacheQuerySerializationSelfTest.java | 144 ++ ...idCacheReduceQueryMultithreadedSelfTest.java | 3 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 + ...GridCachePartitionedFieldsQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 8 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 11 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 4 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- .../h2/sql/AbstractH2CompareQueryTest.java | 49 +- .../query/h2/sql/GridQueryParsingTest.java | 9 + .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../processors/query/h2/sql/bigQuery.sql | 2 +- .../http/jetty/GridJettyRestHandler.java | 3 + .../ignite/schema/generator/CodeGenerator.java | 60 +- .../ignite/schema/ui/SchemaImportApp.java | 8 +- .../ignite/internal/GridFactorySelfTest.java | 3 +- .../uri/GridUriDeploymentClassLoader.java | 4 +- modules/visor-console/pom.xml | 4 +- .../ignite/visor/commands/VisorConsole.scala | 20 +- .../cache/IgniteCacheAbstractBenchmark.java | 2 +- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 4 +- pom.xml | 14 +- 291 files changed, 9018 insertions(+), 5387 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38db16b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38db16b4/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/38db16b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ----------------------------------------------------------------------
