Merge branches 'ignite-843-rc1' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0a79ecd3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0a79ecd3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0a79ecd3 Branch: refs/heads/ignite-843-rc1 Commit: 0a79ecd3644c8f536bab7b249d5768101e0ea8b3 Parents: 5e2fcb8 8b99f65 Author: Andrey <[email protected]> Authored: Mon Nov 9 14:47:05 2015 +0700 Committer: Andrey <[email protected]> Committed: Mon Nov 9 14:47:05 2015 +0700 ---------------------------------------------------------------------- .../java8/messaging/MessagingExample.java | 7 +- .../rest/AbstractRestProcessorSelfTest.java | 5 +- .../JettyRestProcessorAbstractSelfTest.java | 142 +- .../src/main/java/org/apache/ignite/Ignite.java | 12 +- .../configuration/CacheConfiguration.java | 54 +- .../configuration/ConnectorConfiguration.java | 61 +- .../configuration/IgniteConfiguration.java | 32 +- .../apache/ignite/internal/IgniteKernal.java | 54 +- .../org/apache/ignite/internal/IgnitionEx.java | 3 + .../communication/GridIoMessageFactory.java | 10 +- .../discovery/GridDiscoveryManager.java | 5 +- .../affinity/GridAffinityAssignmentCache.java | 13 + .../cache/GridCacheAffinityManager.java | 28 +- .../processors/cache/GridCacheIoManager.java | 19 +- .../processors/cache/GridCacheMapEntry.java | 38 +- .../GridCachePartitionExchangeManager.java | 188 ++- .../processors/cache/GridCachePreloader.java | 60 +- .../cache/GridCachePreloaderAdapter.java | 45 +- .../processors/cache/GridCacheProcessor.java | 74 +- .../distributed/GridCacheTxRecoveryFuture.java | 13 +- .../distributed/dht/GridDhtCacheEntry.java | 11 +- .../distributed/dht/GridDhtLocalPartition.java | 71 +- .../dht/GridDhtPartitionsReservation.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 44 +- .../dht/preloader/GridDhtForceKeysFuture.java | 14 + .../GridDhtPartitionDemandMessage.java | 14 +- .../preloader/GridDhtPartitionDemandPool.java | 1192 --------------- .../dht/preloader/GridDhtPartitionDemander.java | 1389 ++++++++++++++++++ .../dht/preloader/GridDhtPartitionSupplier.java | 1034 +++++++++++++ .../GridDhtPartitionSupplyMessageV2.java | 380 +++++ .../preloader/GridDhtPartitionSupplyPool.java | 555 ------- .../GridDhtPartitionsExchangeFuture.java | 8 + .../dht/preloader/GridDhtPreloader.java | 299 +++- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../datastructures/DataStructuresProcessor.java | 3 + .../processors/job/GridJobProcessor.java | 96 +- .../handlers/cache/GridCacheCommandHandler.java | 128 +- .../handlers/query/QueryCommandHandler.java | 258 +++- .../top/GridTopologyCommandHandler.java | 4 - .../service/GridServiceProcessor.java | 31 +- .../processors/task/GridTaskWorker.java | 4 +- .../ignite/internal/util/lang/GridTuple4.java | 2 +- .../ignite/internal/visor/cache/VisorCache.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 21 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../TcpDiscoveryClientReconnectMessage.java | 1 + .../messages/TcpDiscoveryDiscardMessage.java | 1 + .../GridTaskFailoverAffinityRunTest.java | 3 + .../processors/cache/CacheNamesSelfTest.java | 69 + .../CacheSerializableTransactionsTest.java | 313 ++-- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 + .../GridCacheAbstractRemoveFailureTest.java | 4 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 2 +- .../cache/IgniteCacheTxNearPeekModesTest.java | 7 +- .../cache/IgniteCacheTxPeekModesTest.java | 5 + .../CacheGetFutureHangsSelfTest.java | 3 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 21 +- .../IgniteCacheCrossCacheTxFailoverTest.java | 4 +- .../IgniteCachePutRetryAbstractSelfTest.java | 4 +- ...ledFairAffinityMultiNodeFullApiSelfTest.java | 5 - ...omicNearEnabledMultiNodeFullApiSelfTest.java | 5 - ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 5 - .../near/GridCacheNearTxExceptionSelfTest.java | 15 + .../GridCacheRebalancingAsyncSelfTest.java | 68 + .../GridCacheRebalancingSyncSelfTest.java | 506 +++++++ ...eRebalancingUnmarshallingFailedSelfTest.java | 147 ++ .../GridCacheReplicatedPreloadSelfTest.java | 22 +- .../GridServiceProcessorStopSelfTest.java | 103 ++ ...gniteClientReconnectMassiveShutdownTest.java | 84 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 5 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 17 - .../spi/discovery/tcp/TestTcpDiscoverySpi.java | 46 + .../ignite/testframework/GridTestUtils.java | 4 +- .../testframework/junits/GridAbstractTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 5 + .../junits/common/GridCommonAbstractTest.java | 21 +- .../junits/multijvm/IgniteProcessProxy.java | 7 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteCacheTestSuite3.java | 4 + .../testsuites/IgniteKernalSelfTestSuite.java | 2 + .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../cache/SqlFieldsQuerySelfTest.java | 2 - .../tcp/GridOrderedMessageCancelSelfTest.java | 18 +- .../ignite/logger/log4j2/Log4J2Logger.java~ | 542 ------- .../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 - .../ignite/logger/log4j2/Log4jFileAware.java~ | 13 - modules/rest-http/pom.xml | 6 + .../http/jetty/GridJettyRestProtocol.java | 4 +- .../scala/org/apache/ignite/spark/Entity.scala | 2 +- .../org/apache/ignite/spark/IgniteRDDSpec.scala | 249 ++++ .../org/apache/ignite/spark/IgniteRddSpec.scala | 249 ---- .../org/apache/ignite/IgniteSpringBean.java | 10 +- modules/ssh/pom.xml | 2 +- .../visor/commands/open/VisorOpenCommand.scala | 14 +- .../config/benchmark-client-mode.properties | 4 +- .../config/benchmark-failover.properties | 107 ++ .../config/benchmark-multicast.properties | 71 +- .../yardstick/config/benchmark-store.properties | 4 +- modules/yardstick/config/benchmark.properties | 4 +- .../config/ignite-failover-base-config.xml | 126 ++ .../config/ignite-failover-localhost-config.xml | 56 + modules/yardstick/pom.xml | 3 +- .../yardstick/IgniteAbstractBenchmark.java | 2 +- .../yardstick/IgniteBenchmarkArguments.java | 66 +- .../cache/IgniteCacheAbstractBenchmark.java | 8 +- .../yardstick/cache/IgniteGetBenchmark.java | 4 +- .../cache/IgniteJdbcSqlQueryBenchmark.java | 4 +- .../yardstick/cache/IgnitePutAllBenchmark.java | 4 +- .../cache/IgnitePutAllTxBenchmark.java | 4 +- .../yardstick/cache/IgnitePutBenchmark.java | 4 +- .../yardstick/cache/IgnitePutGetBenchmark.java | 4 +- .../cache/IgnitePutGetTxBenchmark.java | 4 +- .../cache/IgnitePutIndexedValue1Benchmark.java | 4 +- .../cache/IgnitePutIndexedValue2Benchmark.java | 4 +- .../cache/IgnitePutIndexedValue8Benchmark.java | 4 +- .../yardstick/cache/IgnitePutTxBenchmark.java | 4 +- .../cache/IgniteSqlQueryBenchmark.java | 4 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 4 +- .../cache/IgniteSqlQueryPutBenchmark.java | 4 +- .../IgniteAtomicInvokeRetryBenchmark.java | 214 +++ ...IgniteAtomicOffHeapInvokeRetryBenchmark.java | 31 + .../IgniteAtomicOffHeapRetriesBenchmark.java | 31 + .../failover/IgniteAtomicRetriesBenchmark.java | 89 ++ .../IgniteFailoverAbstractBenchmark.java | 320 ++++ .../cache/failover/IgniteFailoverNode.java | 60 + ...IgniteTransactionalInvokeRetryBenchmark.java | 212 +++ ...ransactionalOffHeapInvokeRetryBenchmark.java | 33 + ...ransactionalOffHeapWriteInvokeBenchmark.java | 37 + ...eTransactionalOffHeapWriteReadBenchmark.java | 32 + ...IgniteTransactionalWriteInvokeBenchmark.java | 182 +++ .../IgniteTransactionalWriteReadBenchmark.java | 141 ++ 133 files changed, 7675 insertions(+), 3327 deletions(-) ----------------------------------------------------------------------
