Merge branches 'ignite-734' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-734
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0037868d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0037868d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0037868d Branch: refs/heads/ignite-471 Commit: 0037868d4c81f8173dafc7447b364d95d4601b33 Parents: fcb8d0d 19bd611 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Apr 28 12:03:30 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Apr 28 12:03:30 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 +- .../main/java/org/apache/ignite/Ignition.java | 44 + .../apache/ignite/cache/CacheInterceptor.java | 9 +- .../cache/CacheServerNotFoundException.java | 12 +- .../apache/ignite/cache/CachingProvider.java | 3 + .../configuration/CacheConfiguration.java | 20 + .../configuration/IgniteConfiguration.java | 107 ++ .../ignite/configuration/TopologyValidator.java | 35 + .../ignite/events/CacheQueryExecutedEvent.java | 3 +- .../ignite/events/CacheQueryReadEvent.java | 3 +- .../ignite/internal/GridJobContextImpl.java | 7 +- .../apache/ignite/internal/IgniteKernal.java | 15 +- .../org/apache/ignite/internal/IgnitionEx.java | 179 ++- .../ignite/internal/MarshallerContextImpl.java | 2 +- .../connection/GridClientNioTcpConnection.java | 9 +- .../ClusterTopologyServerNotFoundException.java | 12 +- .../managers/communication/GridIoManager.java | 33 +- .../GridLifecycleAwareMessageFilter.java | 35 + .../deployment/GridDeploymentClassLoader.java | 2 +- .../discovery/GridDiscoveryManager.java | 21 +- .../eventstorage/GridEventStorageManager.java | 6 + .../affinity/GridAffinityAssignmentCache.java | 4 +- .../processors/cache/CacheInvokeResult.java | 24 +- .../cache/CacheStoreBalancingWrapper.java | 6 + .../processors/cache/GridCacheAdapter.java | 11 +- .../cache/GridCacheAffinityManager.java | 12 - .../processors/cache/GridCacheEntryEx.java | 4 + .../processors/cache/GridCacheIoManager.java | 6 + .../processors/cache/GridCacheMapEntry.java | 24 +- .../GridCachePartitionExchangeManager.java | 7 +- .../processors/cache/GridCacheReturn.java | 5 +- .../processors/cache/GridCacheUtils.java | 53 +- .../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 | 16 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 +- .../dht/GridPartitionedGetFuture.java | 7 + .../dht/atomic/GridDhtAtomicCache.java | 44 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 45 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +- .../dht/colocated/GridDhtColocatedCache.java | 56 +- .../colocated/GridDhtColocatedLockFuture.java | 42 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 20 + .../distributed/near/GridNearAtomicCache.java | 7 +- .../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 | 45 +- .../near/GridNearTxFinishFuture.java | 3 + .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../near/GridNearTxPrepareFuture.java | 20 + .../distributed/near/GridNearTxRemote.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 65 +- .../query/GridCacheDistributedQueryManager.java | 3 + .../cache/query/GridCacheLocalQueryFuture.java | 3 + .../query/GridCacheQueryFutureAdapter.java | 3 + .../cache/query/GridCacheQueryManager.java | 20 +- .../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 +- .../IgniteCacheObjectProcessorImpl.java | 2 +- .../closure/GridClosureProcessor.java | 16 +- .../datastreamer/DataStreamProcessor.java | 28 +- .../datastreamer/DataStreamerImpl.java | 3 +- .../datastreamer/DataStreamerRequest.java | 38 +- .../processors/igfs/IgfsFileWorkerBatch.java | 3 + .../internal/processors/igfs/IgfsThread.java | 8 +- .../processors/job/GridJobProcessor.java | 6 + .../internal/processors/job/GridJobWorker.java | 9 + .../portable/GridPortableInputStream.java | 26 - .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 5 +- .../processors/rest/GridRestProcessor.java | 3 + .../top/GridTopologyCommandHandler.java | 3 +- .../service/GridServiceProcessor.java | 9 + .../processors/task/GridTaskWorker.java | 12 + .../timeout/GridTimeoutProcessor.java | 3 + .../ignite/internal/util/IgniteUtils.java | 22 +- .../util/ipc/loopback/IpcServerTcpEndpoint.java | 2 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 12 +- .../ignite/internal/util/nio/GridNioServer.java | 6 + .../util/spring/IgniteSpringHelper.java | 54 +- .../apache/ignite/internal/util/typedef/X.java | 2 +- .../ignite/internal/util/worker/GridWorker.java | 3 + .../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 + .../startup/cmdline/CommandLineStartup.java | 5 +- .../startup/cmdline/CommandLineTransformer.java | 3 + .../resources/META-INF/classnames.properties | 41 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 518 ++++++- .../processors/cache/GridCacheTestEntryEx.java | 2 + .../cache/IgniteExchangeFutureHistoryTest.java | 77 ++ ...gniteTopologyValidatorAbstractCacheTest.java | 183 +++ ...iteTopologyValidatorAbstractTxCacheTest.java | 125 ++ ...ValidatorNearPartitionedAtomicCacheTest.java | 30 + ...logyValidatorNearPartitionedTxCacheTest.java | 30 + ...logyValidatorPartitionedAtomicCacheTest.java | 49 + ...TopologyValidatorPartitionedTxCacheTest.java | 30 + ...ologyValidatorReplicatedAtomicCacheTest.java | 49 + ...eTopologyValidatorReplicatedTxCacheTest.java | 30 + .../CacheNoValueClassOnServerNodeTest.java | 129 ++ .../IgniteCachePutGetRestartAbstractTest.java | 2 +- ...arDisabledFairAffinityPutGetRestartTest.java | 35 + ...acheSortedEvictionPolicyPerformanceTest.java | 13 +- .../GridCacheLocalIsolatedNodesSelfTest.java | 102 ++ .../DataStreamerMultiThreadedSelfTest.java | 110 ++ .../GridSwapSpaceSpiAbstractSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 15 + .../IgniteCacheFailoverTestSuite.java | 3 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 11 +- .../IgniteTopologyValidatorTestSuit.java | 43 + .../CacheNoValueClassOnServerTestClient.java | 88 ++ .../apache/ignite/tests/p2p/cache/Person.java | 42 + .../CacheConfigurationP2PTestClient.java | 1 - .../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 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 1284 ------------------ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 235 +++- ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 - ...GridCachePartitionedFieldsQuerySelfTest.java | 115 -- ...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 - ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 + ...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 - .../GridCacheReplicatedFieldsQuerySelfTest.java | 157 --- ...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 - ...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 + .../h2/GridIndexingSpiAbstractSelfTest.java | 2 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 32 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../http/jetty/GridJettyRestHandler.java | 3 + .../ignite/schema/generator/CodeGenerator.java | 60 +- .../ignite/schema/ui/SchemaImportApp.java | 8 +- .../util/spring/IgniteSpringHelperImpl.java | 217 ++- .../ignite/internal/GridFactorySelfTest.java | 3 +- .../IgniteStartFromStreamConfigurationTest.java | 50 + .../testsuites/IgniteSpringTestSuite.java | 2 + .../uri/GridUriDeploymentClassLoader.java | 4 +- pom.xml | 14 +- 172 files changed, 4059 insertions(+), 2256 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0037868d/pom.xml ----------------------------------------------------------------------
