Merge branch 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
# Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ebde2802 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ebde2802 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ebde2802 Branch: refs/heads/ignite-sprint-6 Commit: ebde2802e3af1e9c281cb586ad205f7cfe42a9c2 Parents: d827cbb c75caba Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue May 26 17:25:24 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue May 26 17:25:24 2015 +0300 ---------------------------------------------------------------------- dev-tools/src/main/groovy/jiraslurp.groovy | 36 ++++++++------ .../processors/cache/IgniteCacheProxy.java | 3 +- .../GridDistributedTxRemoteAdapter.java | 10 ++-- .../processors/query/GridQueryIndexing.java | 16 ++++++ .../processors/query/GridQueryProcessor.java | 52 +++++++------------- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 +++++++- .../processors/query/h2/IgniteH2Indexing.java | 17 +++++++ .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +++++-- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java | 6 +++ 12 files changed, 123 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebde2802/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebde2802/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ebde2802/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ----------------------------------------------------------------------
