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 9FF7618657 for ; Sat, 2 Jan 2016 09:21:40 +0000 (UTC) Received: (qmail 67635 invoked by uid 500); 2 Jan 2016 09:21:40 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 67538 invoked by uid 500); 2 Jan 2016 09:21:40 -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 67461 invoked by uid 99); 2 Jan 2016 09:21:40 -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; Sat, 02 Jan 2016 09:21:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 31CD1E08ED; Sat, 2 Jan 2016 09:21:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Sat, 02 Jan 2016 09:21:45 -0000 Message-Id: <4f304f2932ea421290fd8c5bdc7e33ab@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/13] ignite git commit: IGNITE-2263: retain -> manual copy in MemoryEventStorageSpi. IGNITE-2263: retain -> manual copy in MemoryEventStorageSpi. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7cfb386c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7cfb386c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7cfb386c Branch: refs/heads/ignite-2263 Commit: 7cfb386c81e22b183370cd6c728ee73934cb8eff Parents: b3d9a70 Author: thatcoach Authored: Sat Jan 2 11:55:04 2016 +0300 Committer: thatcoach Committed: Sat Jan 2 11:55:04 2016 +0300 ---------------------------------------------------------------------- .../memory/MemoryEventStorageSpi.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7cfb386c/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java index 56a627a..e471561 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/eventstorage/memory/MemoryEventStorageSpi.java @@ -17,10 +17,8 @@ package org.apache.ignite.spi.eventstorage.memory; -import java.util.Collection; import org.apache.ignite.IgniteLogger; import org.apache.ignite.events.Event; -import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.A; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -33,7 +31,10 @@ import org.apache.ignite.spi.IgniteSpiMultipleInstancesSupport; import org.apache.ignite.spi.eventstorage.EventStorageSpi; import org.jsr166.ConcurrentLinkedDeque8; -import static org.apache.ignite.events.EventType.EVT_NODE_METRICS_UPDATED; +import java.util.ArrayList; +import java.util.Collection; + +import static org.apache.ignite.events.EventType.*; /** * In-memory {@link org.apache.ignite.spi.eventstorage.EventStorageSpi} implementation. All events are @@ -222,7 +223,18 @@ public class MemoryEventStorageSpi extends IgniteSpiAdapter implements EventStor cleanupQueue(); - return F.retain((Collection)evts, true, p); + if (p == null) + return (Collection)new ArrayList<>(evts); + else { + ArrayList res = new ArrayList<>(evts.sizex()); + + for (Event evt : evts) { + if (p.apply((T)evt)) + res.add((T)evt); + } + + return res; + } } /** {@inheritDoc} */