Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f1b31a5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f1b31a5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f1b31a5 Branch: refs/heads/ignite-950 Commit: 0f1b31a5b89f7406bfe44e488a9a832567ee1ccb Parents: 17ee8a6 4f46ee8 Author: ashutak <ashu...@gridgain.com> Authored: Tue Jul 7 20:39:42 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Tue Jul 7 20:39:42 2015 +0300 ---------------------------------------------------------------------- .../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 +- 13 files changed, 384 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
