Merge remote-tracking branch 'remotes/origin/master' into ignite-901
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d067155d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d067155d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d067155d Branch: refs/heads/ignite-901 Commit: d067155d125c6f58e11e9dc596cf42c1dd622408 Parents: e3dd331 0f1b31a Author: sboikov <semen.boi...@inria.fr> Authored: Tue Jul 7 21:13:33 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Tue Jul 7 21:13:33 2015 +0300 ---------------------------------------------------------------------- dev-tools/slurp.sh | 2 +- .../internal/interop/InteropIgnition.java | 17 +- .../internal/interop/InteropProcessor.java | 7 + .../cache/query/GridCacheQueryAdapter.java | 35 ++++- .../processors/query/GridQueryProcessor.java | 5 + .../CacheAbstractQueryMetricsSelfTest.java | 157 ++++++++++++++++++- .../cache/CacheLocalQueryMetricsSelfTest.java | 33 ++++ ...titionedQueryMetricsDistributedSelfTest.java | 33 ++++ ...chePartitionedQueryMetricsLocalSelfTest.java | 33 ++++ .../CachePartitionedQueryMetricsSelfTest.java | 32 ---- ...plicatedQueryMetricsDistributedSelfTest.java | 33 ++++ ...acheReplicatedQueryMetricsLocalSelfTest.java | 33 ++++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 ---- .../IgniteCacheQuerySelfTestSuite.java | 7 +- scripts/git-patch-prop.sh | 2 +- 15 files changed, 386 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d067155d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d067155d/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d067155d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ----------------------------------------------------------------------
