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/af8ed9a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af8ed9a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af8ed9a2 Branch: refs/heads/ignite-104 Commit: af8ed9a2548497cd4603ad0f0cb485aae80eacc9 Parents: 2ac7989 0055b40 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Jul 22 15:10:01 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Jul 22 15:10:01 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 8 + .../ignite/internal/util/IgniteUtils.java | 6 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 2 + .../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 +--- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 + .../IgniteCacheQueryNodeRestartSelfTest.java | 5 - 24 files changed, 367 insertions(+), 386 deletions(-) ----------------------------------------------------------------------
