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 AC20E18910 for ; Wed, 16 Sep 2015 20:55:52 +0000 (UTC) Received: (qmail 97646 invoked by uid 500); 16 Sep 2015 20:55:52 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 97610 invoked by uid 500); 16 Sep 2015 20:55:52 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 97518 invoked by uid 99); 16 Sep 2015 20:55:52 -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, 16 Sep 2015 20:55:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64BCCE0498; Wed, 16 Sep 2015 20:55:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Wed, 16 Sep 2015 20:55:55 -0000 Message-Id: In-Reply-To: <83076333f1c3487092caba8e339f02db@git.apache.org> References: <83076333f1c3487092caba8e339f02db@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.4' into ignite-1452 Merge remote-tracking branch 'remotes/origin/ignite-1.4' into ignite-1452 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5b1b58ee Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5b1b58ee Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5b1b58ee Branch: refs/heads/ignite-1452 Commit: 5b1b58ee601a2d3e0903de35b6fa1c7eb42c7f1c Parents: c1ca2ce 6187241 Author: sboikov Authored: Wed Sep 16 23:55:26 2015 +0300 Committer: sboikov Committed: Wed Sep 16 23:55:26 2015 +0300 ---------------------------------------------------------------------- .../query/GridCacheDistributedQueryFuture.java | 27 +- .../cache/query/GridCacheLocalQueryFuture.java | 5 + .../cache/query/GridCacheQueryAdapter.java | 170 ++++++++----- .../query/GridCacheQueryFutureAdapter.java | 11 +- .../cache/query/GridCacheQueryManager.java | 30 ++- .../distributed/CacheAffEarlySelfTest.java | 245 +++++++++++++++++++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 118 ++++----- ...CacheScanPartitionQueryFallbackSelfTest.java | 224 +++++------------ 8 files changed, 532 insertions(+), 298 deletions(-) ----------------------------------------------------------------------