Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C8324200BEE for ; Fri, 16 Dec 2016 12:41:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id C70B3160B54; Fri, 16 Dec 2016 11:41:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0857E160B3F for ; Fri, 16 Dec 2016 12:41:31 +0100 (CET) Received: (qmail 7586 invoked by uid 500); 16 Dec 2016 11:41:31 -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 7249 invoked by uid 99); 16 Dec 2016 11:41:31 -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, 16 Dec 2016 11:41:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BB1B7F2158; Fri, 16 Dec 2016 11:41:30 +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: Fri, 16 Dec 2016 11:41:36 -0000 Message-Id: <7ce2b1219b9e446ea6c93ea648f2f2a1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/49] ignite git commit: Merge remote-tracking branch 'remotes/professional/ignite-1.7.4' archived-at: Fri, 16 Dec 2016 11:41:33 -0000 Merge remote-tracking branch 'remotes/professional/ignite-1.7.4' # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/858b129e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/858b129e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/858b129e Branch: refs/heads/ignite-2.0 Commit: 858b129ec53f500130b57824a787a4af7c4eb6e7 Parents: 5099f14 bbaa79a Author: Anton Vinogradov Authored: Thu Dec 8 12:44:49 2016 +0300 Committer: Anton Vinogradov Committed: Thu Dec 8 12:44:49 2016 +0300 ---------------------------------------------------------------------- .../rendezvous/RendezvousAffinityFunction.java | 80 ++++-- .../discovery/GridDiscoveryManager.java | 118 +------- .../GridCachePartitionExchangeManager.java | 134 +++------ .../processors/cache/GridCachePreloader.java | 11 +- .../cache/GridCachePreloaderAdapter.java | 5 +- .../processors/cache/GridCacheUtils.java | 17 -- .../binary/CacheObjectBinaryProcessorImpl.java | 3 +- .../dht/GridClientPartitionTopology.java | 120 ++++---- .../dht/GridDhtPartitionTopology.java | 28 +- .../dht/GridDhtPartitionTopologyImpl.java | 284 +++++++++++-------- .../dht/preloader/GridDhtPartitionDemander.java | 230 +++++++++------ .../dht/preloader/GridDhtPartitionFullMap.java | 18 +- .../GridDhtPartitionsExchangeFuture.java | 56 +++- .../dht/preloader/GridDhtPreloader.java | 9 +- .../cache/transactions/IgniteTxHandler.java | 2 +- .../service/GridServiceProcessor.java | 4 +- .../internal/visor/query/VisorQueryJob.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 41 ++- .../tcp/internal/TcpDiscoveryStatistics.java | 4 + .../AbstractAffinityFunctionSelfTest.java | 2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 2 +- .../GridCachePartitionedAffinitySpreadTest.java | 7 +- .../distributed/dht/GridCacheDhtTestUtils.java | 232 --------------- .../GridCacheRebalancingSyncSelfTest.java | 2 + .../h2/twostep/GridReduceQueryExecutor.java | 14 +- 25 files changed, 620 insertions(+), 805 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/858b129e/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/858b129e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/858b129e/modules/core/src/test/java/org/apache/ignite/cache/affinity/AbstractAffinityFunctionSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/cache/affinity/AbstractAffinityFunctionSelfTest.java index ee5b65c,43017db..8f8d78a --- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AbstractAffinityFunctionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AbstractAffinityFunctionSelfTest.java @@@ -104,24 -104,9 +104,25 @@@ public abstract class AbstractAffinityF } /** + * @param backups Number of backups. * @throws Exception If failed. */ + public void testNullKeyForPartitionCalculation() throws Exception { + AffinityFunction aff = affinityFunction(); + + try { + aff.partition(null); + + fail("Should throw IllegalArgumentException due to NULL affinity key."); + } catch (IllegalArgumentException e) { + e.getMessage().contains("Null key is passed for a partition calculation. " + + "Make sure that an affinity key that is used is initialized properly."); + } + } + + /** + * @throws Exception If failed. + */ protected void checkNodeRemoved(int backups) throws Exception { checkNodeRemoved(backups, 1, 1); } http://git-wip-us.apache.org/repos/asf/ignite/blob/858b129e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ----------------------------------------------------------------------