Merge branches 'ignite-843' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f764893e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f764893e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f764893e Branch: refs/heads/ignite-843 Commit: f764893efb79c5370bff8941bce38847ce762cac Parents: cbb8e4a 4031db7 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Jul 8 15:58:48 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Jul 8 15:58:48 2015 +0700 ---------------------------------------------------------------------- bin/ignite.bat | 8 +- bin/ignite.sh | 6 +- bin/include/parseargs.bat | 1 + bin/include/parseargs.sh | 3 + dev-tools/slurp.sh | 2 +- modules/core/pom.xml | 4 +- .../java/org/apache/ignite/IgniteCache.java | 5 + .../apache/ignite/IgniteSystemProperties.java | 3 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 - .../cache/eviction/lru/LruEvictionPolicy.java | 5 - .../eviction/sorted/SortedEvictionPolicy.java | 19 +- .../apache/ignite/internal/IgniteKernal.java | 1 - .../internal/interop/InteropIgnition.java | 48 ++- .../internal/interop/InteropProcessor.java | 7 + .../managers/communication/GridIoManager.java | 124 ++++-- .../managers/communication/GridIoMessage.java | 15 +- .../managers/communication/GridIoPolicy.java | 32 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../processors/cache/CacheObjectImpl.java | 1 - .../processors/cache/CacheOperationContext.java | 44 ++- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheAdapter.java | 91 +++-- .../processors/cache/GridCacheAtomicFuture.java | 12 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../processors/cache/GridCacheMvccManager.java | 8 +- .../processors/cache/GridCacheProxyImpl.java | 10 +- .../processors/cache/GridCacheSwapManager.java | 257 ++++++++----- .../processors/cache/GridCacheUtils.java | 42 +++ .../processors/cache/IgniteCacheProxy.java | 36 +- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../dht/GridPartitionedGetFuture.java | 13 +- .../dht/atomic/GridDhtAtomicCache.java | 18 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 15 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 177 ++++++++- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/query/GridCacheQueryAdapter.java | 35 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../datastructures/GridCacheAtomicLongImpl.java | 25 +- .../GridCacheAtomicSequenceImpl.java | 11 +- .../GridCacheAtomicStampedImpl.java | 21 +- .../GridCacheCountDownLatchImpl.java | 16 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../processors/query/GridQueryProcessor.java | 5 + .../ignite/internal/util/IgniteUtils.java | 6 +- .../plugin/extensions/communication/IoPool.java | 42 +++ .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 46 +++ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- .../startup/cmdline/CommandLineStartup.java | 3 +- .../startup/cmdline/CommandLineTransformer.java | 9 + .../communication/GridIoManagerSelfTest.java | 2 +- .../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++ .../cache/IgniteInternalCacheTypesTest.java | 3 +- .../IgniteCachePutRetryAbstractSelfTest.java | 147 ++++++++ .../dht/IgniteCachePutRetryAtomicSelfTest.java | 34 ++ ...gniteCachePutRetryTransactionalSelfTest.java | 74 ++++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../GridCachePartitionedFailoverSelfTest.java | 5 + .../GridCachePartitionedNodeRestartTest.java | 5 - ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 - .../GridCacheReplicatedNodeRestartSelfTest.java | 5 - ...acheAtomicReplicatedNodeRestartSelfTest.java | 14 +- ...heConcurrentEvictionConsistencySelfTest.java | 15 +- .../GridCacheEvictionFilterSelfTest.java | 2 - .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++ .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++++ .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 5 + .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../CacheAbstractQueryMetricsSelfTest.java | 157 +++++++- .../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++ ...titionedQueryMetricsDistributedSelfTest.java | 33 ++ ...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++ .../CachePartitionedQueryMetricsSelfTest.java | 32 -- ...plicatedQueryMetricsDistributedSelfTest.java | 33 ++ ...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 -- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + .../IgniteCacheQuerySelfTestSuite.java | 7 +- modules/kafka/pom.xml | 116 ++++++ .../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++ .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++ .../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++ .../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++ .../ignite/stream/kafka/SimplePartitioner.java | 53 +++ modules/mesos/pom.xml | 1 - modules/rest-http/pom.xml | 14 +- .../util/spring/IgniteSpringHelperImpl.java | 72 +++- .../IgniteExcludeInConfigurationTest.java | 78 ++++ .../org/apache/ignite/spring/sprint-exclude.xml | 57 +++ .../testsuites/IgniteSpringTestSuite.java | 2 + modules/urideploy/pom.xml | 8 +- .../ignite/visor/commands/VisorConsole.scala | 3 +- .../visor/commands/open/VisorOpenCommand.scala | 319 ++++++++++++++++ .../scala/org/apache/ignite/visor/visor.scala | 230 +---------- .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 + .../commands/kill/VisorKillCommandSpec.scala | 1 + .../commands/start/VisorStartCommandSpec.scala | 1 + .../commands/tasks/VisorTasksCommandSpec.scala | 1 + .../commands/vvm/VisorVvmCommandSpec.scala | 1 + modules/web/pom.xml | 6 +- parent/pom.xml | 1 + pom.xml | 1 + scripts/git-patch-prop.sh | 2 +- 126 files changed, 3466 insertions(+), 757 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f764893e/pom.xml ----------------------------------------------------------------------
