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 8748718980 for ; Tue, 16 Jun 2015 09:35:07 +0000 (UTC) Received: (qmail 35533 invoked by uid 500); 16 Jun 2015 09:35:07 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 35502 invoked by uid 500); 16 Jun 2015 09:35:07 -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 35493 invoked by uid 99); 16 Jun 2015 09:35:07 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Jun 2015 09:35:07 +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 EEEAD182829 for ; Tue, 16 Jun 2015 09:35:06 +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-us-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 4rSxSc5_Uu8P for ; Tue, 16 Jun 2015 09:35:05 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id C09872AD35 for ; Tue, 16 Jun 2015 09:34:55 +0000 (UTC) Received: (qmail 34752 invoked by uid 99); 16 Jun 2015 09:34:55 -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; Tue, 16 Jun 2015 09:34:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A1DA0E36E5; Tue, 16 Jun 2015 09:34:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 16 Jun 2015 09:35:27 -0000 Message-Id: <54c16fbb3a10445eac364631aa12aa3a@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-883' into ignite-883-1 Merge remote-tracking branch 'remotes/origin/ignite-883' into ignite-883-1 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/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiSelfTest.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/65db72eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/65db72eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/65db72eb Branch: refs/heads/ignite-960 Commit: 65db72eb4a731e4b459ec0686f1741ef4ade13ab Parents: 5160088 8870a17 Author: sboikov Authored: Fri Jun 12 17:55:08 2015 +0300 Committer: sboikov Committed: Fri Jun 12 17:55:08 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/query/ScanQuery.java | 23 + .../apache/ignite/internal/IgniteKernal.java | 1 - .../discovery/GridDiscoveryManager.java | 9 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 28 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 439 ++++++++++++------- .../ignite/spi/discovery/tcp/ServerImpl.java | 223 ++++++---- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 66 +++ .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +- .../TcpDiscoveryMulticastIpFinder.java | 19 +- .../messages/TcpDiscoveryAbstractMessage.java | 10 +- .../distributed/IgniteCacheManyClientsTest.java | 138 +++++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 73 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + 15 files changed, 774 insertions(+), 295 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65db72eb/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java index e6b69bc,11a8c84..90000e8 --- 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 @@@ -99,23 -99,26 +99,46 @@@ public final class ScanQuery exte /** * 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. + * @return {@code this} for chaining. + */ + public ScanQuery setPartition(@Nullable Integer part) { + this.part = part; + + 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/65db72eb/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65db72eb/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/65db72eb/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index c598e38,ed9fc9a..7fa038c --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@@ -138,9 -140,6 +138,11 @@@ public class IgniteCacheTestSuite4 exte suite.addTestSuite(IgniteCacheManyClientsTest.class); + suite.addTestSuite(IgniteStartCacheInTransactionSelfTest.class); + suite.addTestSuite(IgniteStartCacheInTransactionAtomicSelfTest.class); + ++ suite.addTestSuite(IgniteCacheManyClientsTest.class); ++ return suite; } }