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 689DB200BCF for ; Mon, 5 Dec 2016 15:41:29 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 64B93160B27; Mon, 5 Dec 2016 14:41:29 +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 62E64160B31 for ; Mon, 5 Dec 2016 15:41:28 +0100 (CET) Received: (qmail 52271 invoked by uid 500); 5 Dec 2016 14:41:27 -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 50989 invoked by uid 99); 5 Dec 2016 14:41:24 -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; Mon, 05 Dec 2016 14:41:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 73879E076F; Mon, 5 Dec 2016 14:41:24 +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: Mon, 05 Dec 2016 14:41:59 -0000 Message-Id: <5a415b0470054d32803402619b991e5c@git.apache.org> In-Reply-To: <9b02f898291a4bb79d1fc8ffa95db9cd@git.apache.org> References: <9b02f898291a4bb79d1fc8ffa95db9cd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] ignite git commit: minor archived-at: Mon, 05 Dec 2016 14:41:29 -0000 minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2202f64d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2202f64d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2202f64d Branch: refs/heads/ignite-comm-balance-master Commit: 2202f64d4f497e356e4efeb5d0be3470f1834096 Parents: 71b7b2a Author: sboikov Authored: Mon Nov 28 10:51:21 2016 +0300 Committer: sboikov Committed: Mon Nov 28 10:51:21 2016 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridDhtAtomicUpdateRequest.java | 8 ++------ .../distributed/dht/atomic/GridNearAtomicUpdateRequest.java | 8 ++------ .../java/org/apache/ignite/internal/util/IgniteUtils.java | 1 + .../org/apache/ignite/internal/util/StripedExecutor.java | 7 +++++-- .../org/apache/ignite/internal/util/nio/GridNioServer.java | 1 - .../ignite/internal/util/nio/GridSelectorNioSessionImpl.java | 1 - 6 files changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2202f64d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index f7ae0fd..72d362b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -601,12 +601,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid return CU.TTL_NOT_CHANGED; } - /** - * Get single partition for that message. - * - * @return Partition. - */ - public int partition() { + /** {@inheritDoc} */ + @Override public int partition() { return partIds != null && !partIds.isEmpty() ? partIds.get(0) : -1; } http://git-wip-us.apache.org/repos/asf/ignite/blob/2202f64d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java index 9968cb0..19a2699 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateRequest.java @@ -679,12 +679,8 @@ public class GridNearAtomicUpdateRequest extends GridCacheMessage implements Gri return ctx.atomicMessageLogger(); } - /** - * Get single partition for that message. - * - * @return Partition. - */ - public int partition() { + /** {@inheritDoc} */ + @Override public int partition() { return partIds != null && !partIds.isEmpty() ? partIds.get(0) : -1; } http://git-wip-us.apache.org/repos/asf/ignite/blob/2202f64d/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java index 6e91d56..5db7964 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java @@ -502,6 +502,7 @@ public abstract class IgniteUtils { } }; + /** */ private static final boolean assertionsEnabled; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/2202f64d/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java index a6161f3..847c2b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java @@ -128,8 +128,11 @@ public class StripedExecutor implements ExecutorService { public void execute(int idx, Runnable cmd) { if (idx == -1) execute(cmd); - else + else { + assert idx >= 0 : idx; + stripes[idx % stripes.length].execute(cmd); + } } /** {@inheritDoc} */ @@ -238,7 +241,7 @@ public class StripedExecutor implements ExecutorService { */ @NotNull @Override public Future submit( @NotNull Runnable task, - T result + T res ) { throw new UnsupportedOperationException(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/2202f64d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java index cb693b1..1b82c99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java @@ -1892,7 +1892,6 @@ public class GridNioServer { if ((key.interestOps() & SelectionKey.OP_WRITE) == 0) key.interestOps(key.interestOps() | SelectionKey.OP_WRITE); - // Update timestamp to protected against false write timeout. ses.bytesSent(0); } http://git-wip-us.apache.org/repos/asf/ignite/blob/2202f64d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java index 9642370..85361bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridSelectorNioSessionImpl.java @@ -29,7 +29,6 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentLinkedDeque8;