Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-471-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/661b6af1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/661b6af1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/661b6af1 Branch: refs/heads/ignite-471-2 Commit: 661b6af12134fb576e63369e03f57334962e2903 Parents: 2460267 d70dbd4 Author: sboikov <sboi...@gridgain.com> Authored: Tue May 26 10:51:00 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue May 26 10:51:00 2015 +0300 ---------------------------------------------------------------------- dev-tools/slurp.sh | 8 - dev-tools/src/main/groovy/jiraslurp.groovy | 186 ++++++++++++------- .../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 + .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../commands/tasks/VisorTasksCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 63 ++++++- pom.xml | 11 ++ 18 files changed, 293 insertions(+), 131 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/661b6af1/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/661b6af1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ----------------------------------------------------------------------
