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/3d3818d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d3818d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d3818d8 Branch: refs/heads/ignite-gg-9615 Commit: 3d3818d845f0f1ac73a385760103eb7e951cf7c7 Parents: ac3e73b d9acbd1 Author: ptupitsyn <ptupit...@gridgain.com> Authored: Fri Aug 7 12:24:24 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Fri Aug 7 12:24:24 2015 +0300 ---------------------------------------------------------------------- .../cache/query/GridCacheSqlQuery.java | 33 ++- .../cache/query/GridCacheTwoStepQuery.java | 34 +-- .../TcpDiscoveryMulticastIpFinder.java | 7 +- .../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 +- .../config/benchmark-multicast.properties | 1 + scripts/git-apply-patch.sh | 94 ------- scripts/git-patch-functions.sh | 56 +--- 18 files changed, 623 insertions(+), 456 deletions(-) ----------------------------------------------------------------------
