Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-9615
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ac3e73bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ac3e73bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ac3e73bf Branch: refs/heads/ignite-gg-9615 Commit: ac3e73bf61ded529c75b188205457c8d79b865e7 Parents: 9ed0b61 6e496e6 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Thu Aug 6 14:02:34 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Thu Aug 6 14:02:34 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 5 + .../processors/cache/GridCacheProcessor.java | 10 +- .../processors/cache/GridCacheUtils.java | 1 - .../ignite/internal/util/GridLogThrottle.java | 63 +++++++-- .../ignite/spi/discovery/tcp/ClientImpl.java | 27 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 15 +++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 5 + .../cache/GridCacheSwapPreloadSelfTest.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 | 69 +++++----- ...idCacheReduceQueryMultithreadedSelfTest.java | 21 ++- modules/log4j2/README.txt | 15 ++- .../ignite/logger/log4j2/Log4J2Logger.java | 2 +- .../ignite/logger/log4j2/Log4j2FileAware.java | 35 ----- .../org/apache/ignite/spark/IgniteContext.scala | 19 ++- .../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 +++++++------- 24 files changed, 435 insertions(+), 189 deletions(-) ----------------------------------------------------------------------
