Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7a659ce4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a659ce4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a659ce4 Branch: refs/heads/ignite-218 Commit: 7a659ce40591d2fb0f8a569ce8374598b2e4ff8d Parents: fce0964 122f3ce Author: iveselovskiy <[email protected]> Authored: Fri Apr 17 12:51:53 2015 +0300 Committer: iveselovskiy <[email protected]> Committed: Fri Apr 17 12:51:53 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 28 +++++++++++ .../query/h2/sql/GridSqlFunction.java | 6 +-- .../query/h2/sql/GridSqlPlaceholder.java | 51 ++++++++++++++++++++ .../query/h2/sql/GridSqlQueryParser.java | 6 +-- .../h2/sql/AbstractH2CompareQueryTest.java | 49 ++++++++++++++----- .../query/h2/sql/GridQueryParsingTest.java | 9 ++++ .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../processors/query/h2/sql/bigQuery.sql | 2 +- 8 files changed, 132 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
