Merge remote-tracking branch 'remotes/origin/master' into ignite-1093
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/19969226 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/19969226 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/19969226 Branch: refs/heads/ignite-1093 Commit: 199692269b9c3385e79327dc05f16c7610cf9e78 Parents: 6640c9a d5986c2 Author: Anton Vinogradov <vinogradov.an...@gmail.com> Authored: Wed Aug 12 14:33:19 2015 +0300 Committer: Anton Vinogradov <vinogradov.an...@gmail.com> Committed: Wed Aug 12 14:33:19 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 5 + .../configuration/IgniteConfiguration.java | 1 - .../GridCachePartitionExchangeManager.java | 48 ++-- .../dht/atomic/GridDhtAtomicCache.java | 36 ++- .../cache/query/GridCacheSqlQuery.java | 33 ++- .../cache/query/GridCacheTwoStepQuery.java | 34 +-- .../ignite/spi/discovery/tcp/ClientImpl.java | 28 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 91 ++++--- .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../cache/CacheStopAndDestroySelfTest.java | 87 ------ .../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 +- .../h2/twostep/GridReduceQueryExecutor.java | 211 ++++++--------- .../query/h2/twostep/GridThreadLocalTable.java | 262 +++++++++++++++++++ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 19 +- .../config/benchmark-multicast.properties | 1 + parent/pom.xml | 97 ++++--- scripts/git-apply-patch.sh | 94 ------- scripts/git-patch-functions.sh | 56 +--- 27 files changed, 830 insertions(+), 661 deletions(-) ----------------------------------------------------------------------
