Merge branches 'ignite-104' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de86990e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de86990e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de86990e Branch: refs/heads/ignite-426 Commit: de86990ee3fcff825da0f156fba1de4de6f8e92a Parents: bc39443 d9acbd1 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Aug 6 11:36:25 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Aug 6 11:36:25 2015 -0700 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 5 + .../cache/query/GridCacheSqlQuery.java | 33 ++- .../cache/query/GridCacheTwoStepQuery.java | 34 +-- .../ignite/spi/discovery/tcp/ClientImpl.java | 28 +- .../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 + parent/pom.xml | 97 ++++--- scripts/git-apply-patch.sh | 94 ------- scripts/git-patch-functions.sh | 56 +--- 21 files changed, 697 insertions(+), 512 deletions(-) ----------------------------------------------------------------------
