Merge remote-tracking branch 'remotes/origin/master' into ignite-946
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/92e81dca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/92e81dca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/92e81dca Branch: refs/heads/ignite-843 Commit: 92e81dca00800b1b74f0ade328121aaf0ab1d4df Parents: 2e7799d d9acbd1 Author: Denis Magda <dma...@gridgain.com> Authored: Mon Aug 10 09:57:31 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Mon Aug 10 09:57:31 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 5 + .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../JettyRestProcessorAbstractSelfTest.java | 14 +- .../apache/ignite/IgniteSystemProperties.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 21 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 43 +- .../managers/communication/GridIoManager.java | 188 +++++++- .../processors/cache/GridCacheMvccManager.java | 73 +-- .../processors/cache/GridCacheProcessor.java | 12 +- .../processors/cache/GridCacheProxyImpl.java | 42 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 1 - .../GridDhtPartitionsExchangeFuture.java | 20 +- .../distributed/near/GridNearGetFuture.java | 20 +- .../cache/query/GridCacheSqlQuery.java | 33 +- .../cache/query/GridCacheTwoStepQuery.java | 34 +- .../handlers/query/QueryCommandHandler.java | 6 +- .../ignite/internal/util/GridLogThrottle.java | 63 ++- .../ignite/internal/util/IgniteUtils.java | 16 + .../util/nio/GridCommunicationClient.java | 5 +- .../util/nio/GridNioFinishedFuture.java | 12 + .../ignite/internal/util/nio/GridNioFuture.java | 14 + .../internal/util/nio/GridNioFutureImpl.java | 15 + .../util/nio/GridNioRecoveryDescriptor.java | 13 +- .../ignite/internal/util/nio/GridNioServer.java | 5 + .../util/nio/GridNioSessionMetaKey.java | 5 +- .../util/nio/GridShmemCommunicationClient.java | 7 +- .../util/nio/GridTcpNioCommunicationClient.java | 14 +- .../communication/tcp/TcpCommunicationSpi.java | 84 +++- .../ignite/spi/discovery/tcp/ClientImpl.java | 29 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 50 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 7 +- .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../src/test/config/io-manager-benchmark.xml | 3 +- .../GridJobMasterLeaveAwareSelfTest.java | 10 +- .../IgniteClientReconnectAbstractTest.java | 5 +- .../IgniteClientReconnectCacheTest.java | 5 +- .../GridDeploymentMessageCountSelfTest.java | 5 +- .../cache/CacheStopAndDestroySelfTest.java | 8 +- .../GridCacheAtomicMessageCountSelfTest.java | 6 +- .../processors/cache/GridCacheMvccSelfTest.java | 1 - ...ridCacheReplicatedSynchronousCommitTest.java | 5 +- .../cache/GridCacheSwapPreloadSelfTest.java | 2 + .../IgniteCacheAbstractStopBusySelfTest.java | 6 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 6 +- ...eDynamicCacheStartNoExchangeTimeoutTest.java | 4 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 5 +- ...niteCacheClientNodeChangingTopologyTest.java | 6 +- ...teCacheClientNodePartitionsExchangeTest.java | 4 +- .../IgniteCacheNearOffheapGetSelfTest.java | 131 ++++++ ...xOriginatingNodeFailureAbstractSelfTest.java | 6 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 6 +- .../GridCacheDhtPreloadMessageCountTest.java | 5 +- ...ePrimaryNodeFailureRecoveryAbstractTest.java | 6 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 5 +- .../near/IgniteCacheNearTxRollbackTest.java | 6 +- .../GridCacheReplicatedInvalidateSelfTest.java | 6 +- ...CommunicationRecoveryAckClosureSelfTest.java | 464 +++++++++++++++++++ .../tcp/TcpDiscoveryMultiThreadedTest.java | 8 +- .../testsuites/IgniteCacheTestSuite2.java | 1 + .../IgniteSpiCommunicationSelfTestSuite.java | 1 + .../ignite/util/TestTcpCommunicationSpi.java | 6 +- .../processors/query/h2/IgniteH2Indexing.java | 27 +- .../processors/query/h2/sql/GridSqlElement.java | 18 +- .../query/h2/sql/GridSqlFunction.java | 17 +- .../processors/query/h2/sql/GridSqlQuery.java | 4 +- .../query/h2/sql/GridSqlQueryParser.java | 94 ++-- .../query/h2/sql/GridSqlQuerySplitter.java | 117 +++-- .../processors/query/h2/sql/GridSqlSelect.java | 76 +-- .../processors/query/h2/sql/GridSqlType.java | 24 +- .../processors/query/h2/sql/GridSqlUnion.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 7 +- .../query/h2/twostep/GridMergeIndex.java | 7 + .../h2/twostep/GridMergeIndexUnsorted.java | 17 +- .../query/h2/twostep/GridMergeTable.java | 52 +-- .../h2/twostep/GridReduceQueryExecutor.java | 280 +++++------ .../query/h2/twostep/GridThreadLocalTable.java | 262 +++++++++++ ...CacheScanPartitionQueryFallbackSelfTest.java | 15 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 21 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +- modules/log4j2/README.txt | 15 +- .../ignite/logger/log4j2/Log4J2Logger.java | 2 +- .../ignite/logger/log4j2/Log4j2FileAware.java | 35 -- .../http/jetty/GridJettyRestHandler.java | 12 +- .../parser/dialect/OracleMetadataDialect.java | 4 +- .../org/apache/ignite/spark/IgniteContext.scala | 19 +- .../src/test/java/config/ignite-test-config.xml | 43 ++ .../ignite/internal/GridFactorySelfTest.java | 9 + .../visor/commands/kill/VisorKillCommand.scala | 2 +- .../config/benchmark-multicast.properties | 1 + .../yardstick/config/benchmark-query.properties | 3 +- modules/yardstick/config/ignite-base-config.xml | 2 - .../yardstick/IgniteBenchmarkArguments.java | 11 + .../cache/IgniteJdbcSqlQueryBenchmark.java | 134 ++++++ parent/pom.xml | 97 ++-- scripts/git-apply-patch.sh | 94 ---- scripts/git-patch-functions.sh | 56 +-- 99 files changed, 2299 insertions(+), 897 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/92e81dca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ----------------------------------------------------------------------
