Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a51cdf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a51cdf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a51cdf8 Branch: refs/heads/ignite-1085 Commit: 9a51cdf8d051dd0a6c0159fe1a2bc4bf56201da7 Parents: bc29797 0f1b31a Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Jul 7 19:09:30 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Jul 7 19:09:30 2015 -0700 ---------------------------------------------------------------------- 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(-) ----------------------------------------------------------------------
