Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8521b89b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8521b89b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8521b89b Branch: refs/heads/ignite-1093-2 Commit: 8521b89b5631ca861c75d3f75a328b21b0c3f1dd Parents: ebd841f 2311de4 Author: vozerov-gridgain <[email protected]> Authored: Wed Sep 9 16:23:22 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Sep 9 16:23:22 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 27 +- .../cache/query/GridCacheLocalQueryFuture.java | 5 +- .../cache/query/GridCacheQueryAdapter.java | 43 +-- .../query/GridCacheQueryFutureAdapter.java | 9 +- .../cache/query/GridCacheQueryManager.java | 11 +- .../query/GridCacheQueryMetricsAdapter.java | 125 +++++---- .../processors/query/GridQueryProcessor.java | 50 ++-- .../CacheAbstractQueryMetricsSelfTest.java | 279 +++++++++---------- 8 files changed, 284 insertions(+), 265 deletions(-) ----------------------------------------------------------------------
