Merge remote-tracking branch 'remotes/origin/master' into ignite-752
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/27b426b1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/27b426b1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/27b426b1 Branch: refs/heads/ignite-752 Commit: 27b426b1f4cefdecf2aa95d28d363f34ecc1a25a Parents: 5f1a000 0055b40 Author: Denis Magda <dma...@gridgain.com> Authored: Thu Jul 23 09:43:14 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu Jul 23 09:43:14 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 8 + .../ignite/internal/util/IgniteUtils.java | 6 +- .../processors/query/h2/sql/GridSqlAlias.java | 4 + .../processors/query/h2/sql/GridSqlColumn.java | 4 + .../processors/query/h2/sql/GridSqlConst.java | 4 + .../processors/query/h2/sql/GridSqlElement.java | 40 +- .../query/h2/sql/GridSqlFunction.java | 2 + .../processors/query/h2/sql/GridSqlJoin.java | 4 + .../query/h2/sql/GridSqlOperation.java | 21 +- .../query/h2/sql/GridSqlOperationType.java | 2 + .../query/h2/sql/GridSqlParameter.java | 4 + .../query/h2/sql/GridSqlPlaceholder.java | 4 + .../processors/query/h2/sql/GridSqlQuery.java | 25 +- .../query/h2/sql/GridSqlQueryParser.java | 11 +- .../query/h2/sql/GridSqlQuerySplitter.java | 405 ++++++++++++------- .../processors/query/h2/sql/GridSqlSelect.java | 91 ++--- .../query/h2/sql/GridSqlSubquery.java | 4 + .../processors/query/h2/sql/GridSqlTable.java | 4 + .../processors/query/h2/sql/GridSqlType.java | 10 +- .../processors/query/h2/sql/GridSqlUnion.java | 11 - .../cache/GridCacheCrossCacheQuerySelfTest.java | 77 +--- .../IgniteCacheQueryNodeRestartSelfTest.java | 5 - 22 files changed, 360 insertions(+), 386 deletions(-) ----------------------------------------------------------------------
