Merge remote-tracking branch 'remotes/origin/ignite-sql-cache-stmt' into ignite-sql-opt-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd216c3e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd216c3e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd216c3e Branch: refs/heads/ignite-sql-opt-2 Commit: cd216c3e3cacd01c3327a06fedbe18b4ad6a59a4 Parents: eeb3ec4 1171b36 Author: sboikov <[email protected]> Authored: Wed Nov 25 08:51:38 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 25 08:51:38 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/IgnitionEx.java | 9 +- .../processors/cache/CacheLockImpl.java | 18 +++- .../colocated/GridDhtColocatedLockFuture.java | 8 +- .../cache/query/GridCacheTwoStepQuery.java | 17 +++- .../cache/GridCacheAbstractFullApiSelfTest.java | 42 +++++++- .../processors/query/h2/IgniteH2Indexing.java | 53 ++++------ .../query/h2/sql/GridSqlQuerySplitter.java | 2 +- .../processors/query/h2/sql/GridSqlSelect.java | 37 +++++++ .../query/h2/twostep/GridMergeIndex.java | 7 ++ .../h2/twostep/GridMergeIndexUnsorted.java | 14 +++ .../h2/twostep/GridReduceQueryExecutor.java | 102 +++++++++++++------ 11 files changed, 228 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cd216c3e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ----------------------------------------------------------------------
