Merge branch 'gridgain-7.5.30' into ignite-3414
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/08328b8e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/08328b8e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/08328b8e Branch: refs/heads/ignite-3414 Commit: 08328b8e6be93784da69ec07a09713aa838b28ad Parents: 464cd9c 84e83c9 Author: vozerov-gridgain <[email protected]> Authored: Tue Jul 19 09:53:45 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Jul 19 09:53:45 2016 +0300 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 7 +- assembly/LICENSE_HADOOP | 7 +- examples/pom-standalone-lgpl.xml | 6 +- examples/pom-standalone.xml | 6 +- examples/pom.xml | 6 +- examples/schema-import/pom-standalone.xml | 6 +- examples/schema-import/pom.xml | 6 +- .../examples/IndexingBridgeMethodTest.java | 93 ++++ .../IgniteExamplesJ8SelfTestSuite.java | 2 + modules/cassandra/pom.xml | 2 +- modules/core/pom.xml | 6 +- .../java/org/apache/ignite/IgniteCache.java | 25 + .../org/apache/ignite/IgniteDataStreamer.java | 52 ++- .../IgniteDataStreamerTimeoutException.java | 45 ++ .../apache/ignite/IgniteSystemProperties.java | 8 +- .../configuration/CacheConfiguration.java | 3 + .../apache/ignite/internal/IgniteKernal.java | 21 + .../ignite/internal/MarshallerContextImpl.java | 29 +- .../ignite/internal/binary/BinaryContext.java | 6 +- .../cache/CacheEvictableEntryImpl.java | 11 +- .../processors/cache/GridCacheAdapter.java | 219 ++++++++- .../processors/cache/GridCacheIoManager.java | 150 +++++- .../processors/cache/GridCacheMessage.java | 9 + .../GridCachePartitionExchangeManager.java | 147 +++++- .../processors/cache/GridCacheProcessor.java | 2 + .../processors/cache/GridCacheProxyImpl.java | 36 ++ .../cache/GridCacheSharedContext.java | 68 +++ .../processors/cache/GridCacheUtils.java | 21 + .../processors/cache/IgniteCacheProxy.java | 40 ++ .../processors/cache/IgniteInternalCache.java | 23 + .../distributed/GridCacheTxRecoveryFuture.java | 70 ++- .../distributed/GridCacheTxRecoveryRequest.java | 8 + .../GridCacheTxRecoveryResponse.java | 8 + .../distributed/GridDistributedLockRequest.java | 6 + .../GridDistributedLockResponse.java | 6 + .../GridDistributedTxFinishRequest.java | 7 +- .../GridDistributedTxFinishResponse.java | 8 + .../GridDistributedTxPrepareRequest.java | 6 + .../GridDistributedTxPrepareResponse.java | 9 +- .../GridDistributedUnlockRequest.java | 6 + .../distributed/dht/GridDhtLockFuture.java | 52 ++- .../dht/GridDhtTransactionalCacheAdapter.java | 77 ++- .../distributed/dht/GridDhtTxFinishFuture.java | 92 +++- .../cache/distributed/dht/GridDhtTxLocal.java | 27 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 124 ++++- .../dht/atomic/GridDhtAtomicCache.java | 137 ++++-- .../GridDhtAtomicDeferredUpdateResponse.java | 7 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 47 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 6 + .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 54 ++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 6 + .../atomic/GridNearAtomicUpdateResponse.java | 6 + .../dht/colocated/GridDhtColocatedCache.java | 10 + .../colocated/GridDhtColocatedLockFuture.java | 71 +-- .../GridDhtPartitionsExchangeFuture.java | 26 +- .../near/GridNearOptimisticTxPrepareFuture.java | 32 ++ .../GridNearPessimisticTxPrepareFuture.java | 34 +- .../near/GridNearTxFinishFuture.java | 97 +++- .../near/GridNearTxPrepareFutureAdapter.java | 7 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../cache/transactions/IgniteTxHandler.java | 281 ++++++++--- .../datastreamer/DataStreamerImpl.java | 71 ++- .../service/GridServiceProcessor.java | 70 ++- .../processors/service/GridServiceProxy.java | 54 +-- .../processors/task/GridTaskWorker.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 21 + .../visor/compute/VisorGatewayTask.java | 3 +- .../visor/node/VisorNodeDataCollectorTask.java | 26 -- .../OptimizedObjectStreamRegistry.java | 145 +++--- .../apache/ignite/transactions/Transaction.java | 5 +- .../resources/META-INF/classnames.properties | 78 +++- modules/core/src/test/config/log4j-test.xml | 6 + .../GridEventStorageCheckAllEventsSelfTest.java | 30 +- .../binary/BinaryMarshallerSelfTest.java | 41 ++ .../cache/GridCacheAbstractFullApiSelfTest.java | 322 ++++++------- .../cache/GridCacheAbstractMetricsSelfTest.java | 2 +- .../cache/GridCacheAbstractSelfTest.java | 113 ++--- .../GridCacheInterceptorAbstractSelfTest.java | 2 +- .../processors/cache/H2CacheStoreStrategy.java | 468 +++++++++++++++++++ .../cache/IgniteCacheAtomicPeekModesTest.java | 2 +- .../cache/IgniteCachePeekModesAbstractTest.java | 463 +++++++++++++++++- .../processors/cache/MapCacheStoreStrategy.java | 145 ++++++ .../cache/TestCacheStoreStrategy.java | 96 ++++ ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 170 +++---- ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 2 +- .../CacheKeepBinaryIterationTest.java | 36 +- ...eContinuousQueryMultiNodesFilteringTest.java | 278 +++++++++++ ...dCacheContinuousQueryNodesFilteringTest.java | 168 +++++++ .../datastreamer/DataStreamerTimeoutTest.java | 163 +++++++ ...rviceDeploymentExceptionPropagationTest.java | 80 ++++ .../OptimizedMarshallerPooledSelfTest.java | 44 ++ ...CommunicationRecoveryAckClosureSelfTest.java | 18 + .../junits/common/GridCommonAbstractTest.java | 12 +- .../multijvm/IgniteCacheProcessProxy.java | 153 ++++-- .../testsuites/IgniteBinaryBasicTestSuite.java | 2 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../IgniteMarshallerSelfTestSuite.java | 2 + modules/flume/README.txt | 2 +- .../cache/IgniteCacheQueryIndexSelfTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite3.java | 4 + .../ignite/visor/commands/VisorConsole.scala | 5 +- .../commands/alert/VisorAlertCommand.scala | 2 +- .../commands/cache/VisorCacheCommand.scala | 40 +- .../commands/cache/VisorCacheStopCommand.scala | 2 +- .../config/VisorConfigurationCommand.scala | 23 +- .../commands/events/VisorEventsCommand.scala | 29 +- .../visor/commands/gc/VisorGcCommand.scala | 11 +- .../visor/commands/kill/VisorKillCommand.scala | 184 ++++++-- .../visor/commands/node/VisorNodeCommand.scala | 13 +- .../visor/commands/vvm/VisorVvmCommand.scala | 11 +- .../scala/org/apache/ignite/visor/visor.scala | 76 +-- parent/pom.xml | 1 + 113 files changed, 5104 insertions(+), 995 deletions(-) ----------------------------------------------------------------------
