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 38B4418107 for ; Wed, 8 Jul 2015 06:21:00 +0000 (UTC) Received: (qmail 9468 invoked by uid 500); 8 Jul 2015 06:21:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 9423 invoked by uid 500); 8 Jul 2015 06:21:00 -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 9414 invoked by uid 99); 8 Jul 2015 06:21:00 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 06:21:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id B680F1A6AD0 for ; Wed, 8 Jul 2015 06:20:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id ehw8qF6N2yjT for ; Wed, 8 Jul 2015 06:20:51 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id EADF24E208 for ; Wed, 8 Jul 2015 06:20:50 +0000 (UTC) Received: (qmail 9177 invoked by uid 99); 8 Jul 2015 06:20:50 -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, 08 Jul 2015 06:20:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 24448E3AAD; Wed, 8 Jul 2015 06:20:50 +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, 08 Jul 2015 06:20:56 -0000 Message-Id: In-Reply-To: <9f3e3d6d54754b508a34ffe76c7fc75c@git.apache.org> References: <9f3e3d6d54754b508a34ffe76c7fc75c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] incubator-ignite git commit: Merge remote-tracking branch 'origin/master' 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-747 Commit: 0f1b31a5b89f7406bfe44e488a9a832567ee1ccb Parents: 17ee8a6 4f46ee8 Author: ashutak Authored: Tue Jul 7 20:39:42 2015 +0300 Committer: ashutak 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(-) ----------------------------------------------------------------------