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 E5D2E200B8C for ; Mon, 12 Sep 2016 10:26:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E4A43160AC8; Mon, 12 Sep 2016 08:26:21 +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 911AA160AF9 for ; Mon, 12 Sep 2016 10:26:18 +0200 (CEST) Received: (qmail 15085 invoked by uid 500); 12 Sep 2016 08:26:17 -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 13769 invoked by uid 99); 12 Sep 2016 08:26:17 -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, 12 Sep 2016 08:26:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D4644DFCC0; Mon, 12 Sep 2016 08:26:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Date: Mon, 12 Sep 2016 08:26:57 -0000 Message-Id: In-Reply-To: <8eb329ee1f544101a6a37883051b8e88@git.apache.org> References: <8eb329ee1f544101a6a37883051b8e88@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [43/46] ignite git commit: IGNITE-3828: Added wrapper for DataStreamerImpl keys to minimize impact of hash code collisions. This closes #1034. archived-at: Mon, 12 Sep 2016 08:26:22 -0000 IGNITE-3828: Added wrapper for DataStreamerImpl keys to minimize impact of hash code collisions. This closes #1034. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c3993d9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c3993d9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c3993d9 Branch: refs/heads/master Commit: 6c3993d9d4b2126a4ef9699fdb3c0d296b03dea7 Parents: 65c92fa Author: Andrey V. Mashenkov Authored: Fri Sep 9 13:09:40 2016 +0300 Committer: vozerov-gridgain Committed: Fri Sep 9 13:09:40 2016 +0300 ---------------------------------------------------------------------- .../datastreamer/DataStreamerImpl.java | 69 +++++++++++++++----- 1 file changed, 51 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c3993d9/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java index a3bae24..05e6488 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java @@ -39,6 +39,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; import javax.cache.CacheException; import javax.cache.expiry.ExpiryPolicy; + import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteCheckedException; @@ -139,7 +140,6 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed /** Cache name ({@code null} for default cache). */ private final String cacheName; - /** Per-node buffer size. */ @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized") private int bufSize = DFLT_PER_NODE_BUFFER_SIZE; @@ -512,7 +512,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed activeFuts.add(resFut); - Collection keys = + Collection keys = new GridConcurrentHashSet<>(entries.size(), U.capacity(entries.size()), 1); Collection entries0 = new ArrayList<>(entries.size()); @@ -521,7 +521,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed KeyCacheObject key = cacheObjProc.toCacheKeyObject(cacheObjCtx, null, entry.getKey(), true); CacheObject val = cacheObjProc.toCacheObject(cacheObjCtx, entry.getValue(), true); - keys.add(key); + keys.add(new KeyCacheObjectWrapper(key)); entries0.add(new DataStreamerEntry(key, val)); } @@ -572,13 +572,13 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed activeFuts.add(resFut); - Collection keys = null; + Collection keys = null; if (entries.size() > 1) { keys = new GridConcurrentHashSet<>(entries.size(), U.capacity(entries.size()), 1); for (DataStreamerEntry entry : entries) - keys.add(entry.getKey()); + keys.add(new KeyCacheObjectWrapper(entry.getKey())); } load0(entries, resFut, keys, 0); @@ -641,7 +641,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed private void load0( Collection entries, final GridFutureAdapter resFut, - @Nullable final Collection activeKeys, + @Nullable final Collection activeKeys, final int remaps ) { assert entries != null; @@ -729,7 +729,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed if (activeKeys != null) { for (DataStreamerEntry e : entriesForNode) - activeKeys.remove(e.getKey()); + activeKeys.remove(new KeyCacheObjectWrapper(e.getKey())); if (activeKeys.isEmpty()) resFut.onDone(); @@ -1103,7 +1103,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed * @throws org.apache.ignite.plugin.security.SecurityException If permissions are not enough for streaming. */ private void checkSecurityPermission(SecurityPermission perm) - throws org.apache.ignite.plugin.security.SecurityException{ + throws org.apache.ignite.plugin.security.SecurityException { if (!ctx.security().enabled()) return; @@ -1172,8 +1172,8 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed * @param newEntries Infos. * @param topVer Topology version. * @param lsnr Listener for the operation future. - * @throws IgniteInterruptedCheckedException If failed. * @return Future for operation. + * @throws IgniteInterruptedCheckedException If failed. */ @Nullable GridFutureAdapter update(Iterable newEntries, AffinityTopologyVersion topVer, @@ -1221,7 +1221,6 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed /** * @return Future if any submitted. - * * @throws IgniteInterruptedCheckedException If thread has been interrupted. */ @Nullable IgniteInternalFuture flush() throws IgniteInterruptedCheckedException { @@ -1273,13 +1272,12 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed private void incrementActiveTasks() throws IgniteInterruptedCheckedException { if (timeout == DFLT_UNLIMIT_TIMEOUT) U.acquire(sem); - else - if (!U.tryAcquire(sem, timeout, TimeUnit.MILLISECONDS)) { - if (log.isDebugEnabled()) - log.debug("Failed to add parallel operation."); + else if (!U.tryAcquire(sem, timeout, TimeUnit.MILLISECONDS)) { + if (log.isDebugEnabled()) + log.debug("Failed to add parallel operation."); - throw new IgniteDataStreamerTimeoutException("Data streamer exceeded timeout when starts parallel operation."); - } + throw new IgniteDataStreamerTimeoutException("Data streamer exceeded timeout when starts parallel operation."); + } } /** @@ -1307,7 +1305,8 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed try { incrementActiveTasks(); - } catch (IgniteDataStreamerTimeoutException e) { + } + catch (IgniteDataStreamerTimeoutException e) { curFut.onDone(e); throw e; } @@ -1574,7 +1573,7 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed if (depCls != null) cls0 = depCls; else { - for (Iterator it = objs.iterator(); (cls0 == null || U.isJdk(cls0)) && it.hasNext();) { + for (Iterator it = objs.iterator(); (cls0 == null || U.isJdk(cls0)) && it.hasNext(); ) { Object o = it.next(); if (o != null) @@ -1696,4 +1695,38 @@ public class DataStreamerImpl implements IgniteDataStreamer, Delayed return PUBLIC_POOL; } } + + /** + * Key object wrapper. Using identity equals prevents slow down in case of hash code collision. + */ + private static class KeyCacheObjectWrapper { + /** key object */ + private final KeyCacheObject key; + + /** + * Constructor + * + * @param key key object + */ + KeyCacheObjectWrapper(KeyCacheObject key) { + assert key != null; + + this.key = key; + } + + /** {@inheritDoc} */ + @Override public boolean equals(Object o) { + return o instanceof KeyCacheObjectWrapper && this.key == ((KeyCacheObjectWrapper)o).key; + } + + /** {@inheritDoc} */ + @Override public int hashCode() { + return key.hashCode(); + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(KeyCacheObjectWrapper.class, this); + } + } }