Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/10c24833 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/10c24833 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/10c24833 Branch: refs/heads/ignite-757 Commit: 10c24833686266148fb04991d3fabebd74a6c2a4 Parents: 9ac0e96 a9c3aa4 Author: sboikov <sboi...@gridgain.com> Authored: Fri Apr 24 10:00:52 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Apr 24 10:00:52 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../apache/ignite/cache/CachingProvider.java | 3 + .../configuration/CacheConfiguration.java | 20 + .../ignite/configuration/TopologyValidator.java | 35 ++ .../ignite/events/CacheQueryExecutedEvent.java | 3 +- .../ignite/events/CacheQueryReadEvent.java | 3 +- .../apache/ignite/internal/IgniteKernal.java | 15 +- .../org/apache/ignite/internal/IgnitionEx.java | 6 + .../deployment/GridDeploymentClassLoader.java | 2 +- .../discovery/GridDiscoveryManager.java | 3 + .../eventstorage/GridEventStorageManager.java | 6 + .../affinity/GridAffinityAssignmentCache.java | 4 +- .../cache/CacheStoreBalancingWrapper.java | 6 + .../processors/cache/GridCacheAdapter.java | 9 +- .../cache/GridCacheAffinityManager.java | 12 - .../processors/cache/GridCacheEntryEx.java | 4 + .../processors/cache/GridCacheIoManager.java | 6 + .../processors/cache/GridCacheMapEntry.java | 20 +- .../GridCachePartitionExchangeManager.java | 5 +- .../processors/cache/GridCacheUtils.java | 6 +- .../processors/cache/IgniteCacheProxy.java | 15 +- .../cache/affinity/GridCacheAffinityImpl.java | 2 +- .../GridDistributedCacheAdapter.java | 20 +- .../distributed/GridDistributedLockRequest.java | 99 +++- .../GridDistributedTxRemoteAdapter.java | 3 + .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../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 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 + .../distributed/dht/GridDhtTxLocalAdapter.java | 26 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 +- .../dht/atomic/GridDhtAtomicCache.java | 41 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 21 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +- .../dht/colocated/GridDhtColocatedCache.java | 36 +- .../colocated/GridDhtColocatedLockFuture.java | 38 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 20 + .../distributed/near/GridNearAtomicCache.java | 7 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 3 +- .../distributed/near/GridNearLockFuture.java | 37 +- .../distributed/near/GridNearLockRequest.java | 7 +- .../near/GridNearTransactionalCache.java | 27 +- .../near/GridNearTxFinishFuture.java | 3 + .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../near/GridNearTxPrepareFuture.java | 20 + .../distributed/near/GridNearTxRemote.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 59 ++- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheLocalQueryFuture.java | 3 + .../query/GridCacheQueryFutureAdapter.java | 3 + .../cache/query/GridCacheQueryManager.java | 9 + .../jdbc/GridCacheQueryJdbcMetadataTask.java | 3 + .../cache/transactions/IgniteTxAdapter.java | 7 +- .../cache/transactions/IgniteTxEntry.java | 74 ++- .../cache/transactions/IgniteTxHandler.java | 27 +- .../transactions/IgniteTxLocalAdapter.java | 108 ++-- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../closure/GridClosureProcessor.java | 16 +- .../processors/igfs/IgfsFileWorkerBatch.java | 3 + .../internal/processors/igfs/IgfsThread.java | 8 +- .../internal/processors/job/GridJobWorker.java | 9 + .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 5 +- .../processors/rest/GridRestProcessor.java | 3 + .../service/GridServiceProcessor.java | 9 + .../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/misc/VisorResolveHostNameTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 9 + .../ignite/messaging/MessagingListenActor.java | 3 + .../org/apache/ignite/spi/IgniteSpiThread.java | 3 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 3 + .../startup/cmdline/CommandLineStartup.java | 5 +- .../startup/cmdline/CommandLineTransformer.java | 3 + .../cache/GridCacheAbstractFullApiSelfTest.java | 518 ++++++++++++++++++- .../processors/cache/GridCacheTestEntryEx.java | 2 + .../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 ++ .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 ++ .../GridCacheLocalIsolatedNodesSelfTest.java | 102 ++++ .../testframework/junits/GridAbstractTest.java | 2 +- .../IgniteCacheFailoverTestSuite.java | 3 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 8 +- .../IgniteTopologyValidatorTestSuit.java | 43 ++ .../processors/hadoop/HadoopDefaultJobInfo.java | 3 + .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 3 + .../hadoop/jobtracker/HadoopJobTracker.java | 5 +- .../hadoop/taskexecutor/HadoopRunnableTask.java | 3 + .../external/HadoopExternalTaskExecutor.java | 3 + .../processors/hadoop/v2/HadoopV2Job.java | 11 +- .../hadoop/v2/HadoopV2TaskContext.java | 9 + .../processors/query/h2/IgniteH2Indexing.java | 6 +- .../query/h2/twostep/GridMapQueryExecutor.java | 37 +- .../h2/twostep/GridReduceQueryExecutor.java | 34 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- .../http/jetty/GridJettyRestHandler.java | 3 + .../ignite/schema/ui/SchemaImportApp.java | 8 +- .../ignite/internal/GridFactorySelfTest.java | 3 +- .../uri/GridUriDeploymentClassLoader.java | 4 +- 125 files changed, 2353 insertions(+), 290 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10c24833/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/10c24833/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ----------------------------------------------------------------------
