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 E4A6218BB7 for ; Fri, 12 Jun 2015 13:39:59 +0000 (UTC) Received: (qmail 95825 invoked by uid 500); 12 Jun 2015 13:39:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 95794 invoked by uid 500); 12 Jun 2015 13:39:53 -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 95784 invoked by uid 99); 12 Jun 2015 13:39:53 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jun 2015 13:39:53 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 19CBBCD810 for ; Fri, 12 Jun 2015 13:39:53 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id f4MFOb-27J_W for ; Fri, 12 Jun 2015 13:39: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 405632A3FC for ; Fri, 12 Jun 2015 13:39:40 +0000 (UTC) Received: (qmail 94505 invoked by uid 99); 12 Jun 2015 13:39:36 -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; Fri, 12 Jun 2015 13:39:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 04232DFF09; Fri, 12 Jun 2015 13:39:36 +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: Fri, 12 Jun 2015 13:40:13 -0000 Message-Id: <6027ffd61e344831bd5d80626e42278b@git.apache.org> In-Reply-To: <3205cdd0fed244619f0fb13cfaa4eecf@git.apache.org> References: <3205cdd0fed244619f0fb13cfaa4eecf@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [39/50] [abbrv] incubator-ignite git commit: Partition reserve for partition scan query fixed Partition reserve for partition scan query fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2b63ff8c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b63ff8c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b63ff8c Branch: refs/heads/ignite-950 Commit: 2b63ff8cfac20da0c7ab2f2fe55c33019dd3e9c4 Parents: e188e18 Author: agura Authored: Thu Jun 11 21:55:00 2015 +0300 Committer: agura Committed: Thu Jun 11 21:55:00 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/query/GridCacheQueryManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b63ff8c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 6e71ba7..1317d38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -791,8 +791,9 @@ public abstract class GridCacheQueryManager extends GridCacheManagerAdapte locPart = dht.topology().localPartition(part, topVer, false); - if (locPart == null || (locPart.state() != OWNING && locPart.state() != RENTING) || - !locPart.reserve()) + // double check for owning state + if (locPart == null || locPart.state() != OWNING || !locPart.reserve() || + locPart.state() != OWNING) throw new GridDhtInvalidPartitionException(part, "Partition can't be reserved"); iter = new Iterator() {