You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/01/18 09:25:41 UTC

[19/19] ignite git commit: Merge branch 'master' into ignite-2316

Merge branch 'master' into ignite-2316


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87b0be42
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87b0be42
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87b0be42

Branch: refs/heads/ignite-2316
Commit: 87b0be42b83aae53aa60b73c4ac1c0b28cc6381e
Parents: 17b3a9f d881417
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Jan 18 11:26:00 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Jan 18 11:26:00 2016 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/IgniteTransactions.java   |   4 +-
 .../apache/ignite/internal/GridComponent.java   |   5 +-
 .../ignite/internal/GridUpdateNotifier.java     | 454 ------------------
 .../apache/ignite/internal/IgniteKernal.java    | 221 ++++-----
 .../ignite/internal/IgniteVersionUtils.java     |   4 +-
 .../ignite/internal/MarshallerContextImpl.java  |  86 +++-
 .../ignite/internal/binary/BinaryUtils.java     |  78 ++++
 .../internal/direct/DirectMessageReader.java    |  11 +
 .../internal/direct/DirectMessageWriter.java    |  13 +
 .../direct/state/DirectMessageState.java        |  10 +
 .../stream/v1/DirectByteBufferStreamImplV1.java |   8 +
 .../stream/v2/DirectByteBufferStreamImplV2.java |   8 +
 .../managers/discovery/CustomEventListener.java |   4 +-
 .../discovery/DiscoveryCustomMessage.java       |   9 -
 .../discovery/GridDiscoveryManager.java         |  39 +-
 .../cache/CacheEntrySerializablePredicate.java  |   3 +-
 .../cache/CacheInvokeDirectResult.java          |   4 +-
 .../processors/cache/CacheObjectContext.java    |  91 ++--
 .../cache/DynamicCacheChangeBatch.java          |   5 -
 .../processors/cache/GridCacheIoManager.java    |  23 +
 .../processors/cache/GridCacheProcessor.java    |  94 ++--
 .../processors/cache/GridCacheReturn.java       |   2 +
 .../processors/cache/IgniteCacheProxy.java      |   2 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |  33 +-
 .../GridDistributedLockResponse.java            |   2 +-
 .../GridDistributedTxFinishRequest.java         |  11 +-
 .../GridDistributedTxPrepareRequest.java        |   2 +-
 .../GridDistributedTxPrepareResponse.java       |   4 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |   4 +-
 .../distributed/dht/GridDhtLockFuture.java      |  44 +-
 .../distributed/dht/GridDhtLockRequest.java     |   2 +-
 .../distributed/dht/GridDhtTxFinishRequest.java |  90 ++--
 .../dht/GridDhtTxFinishResponse.java            |   4 +-
 .../cache/distributed/dht/GridDhtTxLocal.java   |   1 +
 .../dht/GridDhtTxPrepareRequest.java            |   2 +-
 .../dht/atomic/GridDhtAtomicUpdateRequest.java  |  21 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |   6 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |  22 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |   4 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   6 +-
 .../GridDhtPartitionDemandMessage.java          |   6 +-
 .../dht/preloader/GridDhtPartitionDemander.java |  11 +-
 .../GridDhtPartitionSupplyMessageV2.java        |   6 +-
 .../GridDhtPartitionsExchangeFuture.java        |   8 +-
 .../preloader/GridDhtPartitionsFullMessage.java |   2 +-
 .../GridDhtPartitionsSingleMessage.java         |   4 +-
 .../distributed/near/GridNearGetResponse.java   |   4 +-
 ...ridNearOptimisticTxPrepareFutureAdapter.java |   6 +-
 .../near/GridNearSingleGetResponse.java         |   2 +-
 .../near/GridNearTxFinishFuture.java            | 432 +++++++++++++-----
 .../near/GridNearTxFinishRequest.java           |   5 +
 .../near/GridNearTxFinishResponse.java          |   4 +-
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../near/GridNearTxPrepareResponse.java         |   4 +-
 .../cache/query/GridCacheQueryRequest.java      |  16 +-
 .../cache/query/GridCacheQueryResponse.java     |  18 +-
 .../continuous/CacheContinuousQueryEntry.java   |  70 +--
 .../cache/transactions/IgniteInternalTx.java    |   6 +
 .../cache/transactions/IgniteTxAdapter.java     |  23 +-
 .../cache/transactions/IgniteTxEntry.java       |  11 +-
 .../cache/transactions/IgniteTxHandler.java     |  26 +-
 .../transactions/IgniteTxLocalAdapter.java      |   6 +-
 .../cache/transactions/IgniteTxManager.java     |  20 +
 .../processors/cluster/ClusterProcessor.java    | 174 +++++++
 .../processors/cluster/GridUpdateNotifier.java  | 457 +++++++++++++++++++
 .../continuous/AbstractContinuousMessage.java   |   5 -
 .../continuous/GridContinuousProcessor.java     |  13 +-
 .../datastreamer/DataStreamerRequest.java       |   1 +
 .../datastructures/DataStructuresProcessor.java |  11 +-
 .../processors/igfs/IgfsAckMessage.java         |   4 +-
 .../handlers/cache/GridCacheCommandHandler.java |   6 +-
 .../ignite/internal/util/GridStringBuilder.java |  19 +
 .../ignite/internal/util/IgniteUtils.java       |  10 +
 .../internal/util/nio/GridDirectParser.java     |  52 ++-
 .../communication/tcp/TcpCommunicationSpi.java  |   9 +-
 .../ignite/spi/discovery/DiscoverySpi.java      |   2 +
 .../tcp/ipfinder/TcpDiscoveryIpFinder.java      |  14 +-
 .../ignite/stream/socket/SocketStreamer.java    |   3 +-
 .../internal/GridUpdateNotifierSelfTest.java    | 137 ------
 ...UpdateNotifierPerClusterSettingSelfTest.java | 130 ++++++
 .../binary/BinaryMarshallerSelfTest.java        |  44 +-
 ...cheAbstractFullApiMultithreadedSelfTest.java |  13 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   2 +-
 .../cache/GridCacheDeploymentSelfTest.java      |   3 +-
 .../processors/cache/GridCacheStopSelfTest.java |   2 +-
 ...IgniteCacheGetCustomCollectionsSelfTest.java | 128 ++++++
 ...gniteCacheLoadRebalanceEvictionSelfTest.java | 188 ++++++++
 .../cache/IgniteDynamicCacheStartSelfTest.java  |  30 +-
 ...niteDynamicCacheStartStopConcurrentTest.java | 119 +++++
 ...eMarshallerCacheConcurrentReadWriteTest.java | 189 ++++++++
 .../IgniteClientDataStructuresAbstractTest.java |   3 +
 .../dht/GridCacheTxNodeFailureSelfTest.java     |  13 +-
 .../IgniteCacheCommitDelayTxRecoveryTest.java   | 376 +++++++++++++++
 .../IgniteCachePutRetryAbstractSelfTest.java    |  36 +-
 ...gniteCachePutRetryTransactionalSelfTest.java |  21 +
 .../cluster/GridUpdateNotifierSelfTest.java     | 140 ++++++
 .../continuous/GridEventConsumeSelfTest.java    |   3 +
 .../internal/util/nio/GridNioSelfTest.java      |  11 +-
 .../platform/PlatformComputeEchoTask.java       |   6 +-
 ...dTcpCommunicationSpiRecoveryAckSelfTest.java |   1 -
 ...CommunicationRecoveryAckClosureSelfTest.java |  19 +-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java |   2 +
 .../startup/GridRandomCommandLineLoader.java    |   4 +-
 .../ignite/testframework/GridTestUtils.java     |  27 ++
 .../junits/common/GridCommonAbstractTest.java   |  34 +-
 .../ignite/testsuites/IgniteBasicTestSuite.java |   2 +
 .../testsuites/IgniteCacheTestSuite4.java       |   7 +
 .../testsuites/IgniteCacheTestSuite5.java       |   2 +
 .../IgniteCacheTxRecoverySelfTestSuite.java     |   3 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |   4 +-
 modules/storm/README.txt                        |  37 ++
 modules/storm/licenses/apache-2.0.txt           | 202 ++++++++
 modules/storm/pom.xml                           | 104 +++++
 .../ignite/stream/storm/StormStreamer.java      | 304 ++++++++++++
 .../ignite/stream/storm/package-info.java       |  22 +
 .../storm/IgniteStormStreamerSelfTestSuite.java |  38 ++
 .../storm/StormIgniteStreamerSelfTest.java      | 184 ++++++++
 .../ignite/stream/storm/TestStormSpout.java     | 141 ++++++
 .../storm/src/test/resources/example-ignite.xml |  71 +++
 .../yardstick/cache/IgniteGetTxBenchmark.java   |  30 ++
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  |  69 ++-
 pom.xml                                         |   1 +
 122 files changed, 4526 insertions(+), 1284 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/87b0be42/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------