Merge branch 'ignite-sprint-4-1.0.6-7.0.6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5
# Conflicts: # examples/pom.xml # modules/aop/pom.xml # modules/aws/pom.xml # modules/clients/pom.xml # modules/cloud/pom.xml # modules/codegen/pom.xml # modules/core/pom.xml # modules/core/src/main/resources/ignite.properties # modules/extdata/p2p/pom.xml # modules/extdata/uri/pom.xml # modules/gce/pom.xml # modules/geospatial/pom.xml # modules/hadoop/pom.xml # modules/hibernate/pom.xml # modules/indexing/pom.xml # modules/jcl/pom.xml # modules/jta/pom.xml # modules/log4j/pom.xml # modules/rest-http/pom.xml # modules/scalar/pom.xml # modules/schedule/pom.xml # modules/schema-import/pom.xml # modules/slf4j/pom.xml # modules/spring/pom.xml # modules/ssh/pom.xml # modules/tools/pom.xml # modules/urideploy/pom.xml # modules/visor-console/pom.xml # modules/visor-plugins/pom.xml # modules/web/pom.xml # modules/yardstick/pom.xml # pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d70dbd4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d70dbd4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d70dbd4c Branch: refs/heads/ignite-sprint-6 Commit: d70dbd4ccee8e886a76f5643106927f29dd1bce0 Parents: f39a3a9 8977537 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue May 26 10:16:07 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue May 26 10:16:07 2015 +0300 ---------------------------------------------------------------------- .../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 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java | 6 +++ 12 files changed, 102 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d70dbd4c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d70dbd4c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ----------------------------------------------------------------------
