Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6EFEA1879E for ; Wed, 3 Jun 2015 17:15:05 +0000 (UTC) Received: (qmail 83576 invoked by uid 500); 3 Jun 2015 17:15:05 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 83545 invoked by uid 500); 3 Jun 2015 17:15:05 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 83536 invoked by uid 99); 3 Jun 2015 17:15:05 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jun 2015 17:15:05 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id ECEAFC08D9 for ; Wed, 3 Jun 2015 17:15:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.791 X-Spam-Level: X-Spam-Status: No, score=0.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id bxXuRn9p65J2 for ; Wed, 3 Jun 2015 17:14:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 8065127D78 for ; Wed, 3 Jun 2015 17:14:36 +0000 (UTC) Received: (qmail 80368 invoked by uid 99); 3 Jun 2015 17:14:33 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jun 2015 17:14:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C569E098A; Wed, 3 Jun 2015 17:14:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 03 Jun 2015 17:15:03 -0000 Message-Id: In-Reply-To: <052e6ff62fa54a66be224a18e92c2d52@git.apache.org> References: <052e6ff62fa54a66be224a18e92c2d52@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/35] incubator-ignite git commit: Merge branch 'ignite-745' into ignite-sprint-5 Merge branch 'ignite-745' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/71efd274 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71efd274 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71efd274 Branch: refs/heads/ignite-218 Commit: 71efd274bf97648247a64031a7f2002c9daf8be6 Parents: ba6d055 f8169a9 Author: agura Authored: Wed Jun 3 02:13:17 2015 +0300 Committer: agura Committed: Wed Jun 3 02:13:17 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/query/QueryMetrics.java | 6 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../processors/query/GridQueryProcessor.java | 305 ++++++++++++------- .../cache/GridCacheQueryMetricsSelfTest.java | 84 ++++- 4 files changed, 276 insertions(+), 131 deletions(-) ----------------------------------------------------------------------