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 561CD186B9 for ; Wed, 17 Jun 2015 12:06:16 +0000 (UTC) Received: (qmail 6389 invoked by uid 500); 17 Jun 2015 12:06:16 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 6357 invoked by uid 500); 17 Jun 2015 12:06:16 -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 6348 invoked by uid 99); 17 Jun 2015 12:06:16 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 12:06:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id CD0E8182238 for ; Wed, 17 Jun 2015 12:06:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-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 (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id FvPQ_qLn4o78 for ; Wed, 17 Jun 2015 12:06:14 +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 2271D27D99 for ; Wed, 17 Jun 2015 12:06:12 +0000 (UTC) Received: (qmail 6031 invoked by uid 99); 17 Jun 2015 12:06:11 -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, 17 Jun 2015 12:06:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 29392DFF94; Wed, 17 Jun 2015 12:06:11 +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, 17 Jun 2015 12:06:19 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/50] incubator-ignite git commit: Merge branches 'ignite-sprint-5' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6 Merge branches 'ignite-sprint-5' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6 Conflicts: modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java modules/scalar-2.10/pom.xml modules/spark-2.10/pom.xml modules/spark/pom.xml modules/visor-console-2.10/pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/09073386 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/09073386 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/09073386 Branch: refs/heads/ignite-gg-10123 Commit: 0907338684050e952b01df06fe927707e4a280a1 Parents: 460521c Author: Yakov Zhdanov Authored: Mon Jun 15 10:21:53 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jun 15 10:21:53 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/query/ScanQuery.java | 20 -------------------- .../cache/query/GridCacheQueryManager.java | 5 ----- .../testsuites/IgniteCacheTestSuite4.java | 2 -- 3 files changed, 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09073386/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java index 90000e8..11a8c84 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java @@ -119,26 +119,6 @@ public final class ScanQuery extends Query> { return this; } - /** - * Gets partition number over which this query should iterate. Will return {@code null} if partition was not - * set. In this case query will iterate over all partitions in the cache. - * - * @return Partition number or {@code null}. - */ - @Nullable public Integer getPartition() { - return part; - } - - /** - * Sets partition number over which this query should iterate. If {@code null}, query will iterate over - * all partitions in the cache. Must be in the range [0, N) where N is partition number in the cache. - * - * @param part Partition number over which this query should iterate. - */ - public void setPartition(@Nullable Integer part) { - this.part = part; - } - /** {@inheritDoc} */ @Override public ScanQuery setPageSize(int pageSize) { return (ScanQuery)super.setPageSize(pageSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09073386/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 7493d07..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,14 +791,9 @@ public abstract class GridCacheQueryManager extends GridCacheManagerAdapte locPart = dht.topology().localPartition(part, topVer, false); -<<<<<<< HEAD // double check for owning state if (locPart == null || locPart.state() != OWNING || !locPart.reserve() || locPart.state() != OWNING) -======= - if (locPart == null || (locPart.state() != OWNING && locPart.state() != RENTING) || - !locPart.reserve()) ->>>>>>> 4375529fa929e650f7b68d750318d67a8609ee10 throw new GridDhtInvalidPartitionException(part, "Partition can't be reserved"); iter = new Iterator() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09073386/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 7fa038c..c598e38 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -141,8 +141,6 @@ public class IgniteCacheTestSuite4 extends TestSuite { suite.addTestSuite(IgniteStartCacheInTransactionSelfTest.class); suite.addTestSuite(IgniteStartCacheInTransactionAtomicSelfTest.class); - suite.addTestSuite(IgniteCacheManyClientsTest.class); - return suite; } }