Return-Path: X-Original-To: apmail-apex-dev-archive@minotaur.apache.org Delivered-To: apmail-apex-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63986189EE for ; Mon, 4 Jan 2016 21:40:18 +0000 (UTC) Received: (qmail 82194 invoked by uid 500); 4 Jan 2016 21:40:18 -0000 Delivered-To: apmail-apex-dev-archive@apex.apache.org Received: (qmail 82129 invoked by uid 500); 4 Jan 2016 21:40:18 -0000 Mailing-List: contact dev-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list dev@apex.incubator.apache.org Received: (qmail 82118 invoked by uid 99); 4 Jan 2016 21:40:17 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Jan 2016 21:40:17 +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 500511804C6 for ; Mon, 4 Jan 2016 21:40:17 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.427 X-Spam-Level: X-Spam-Status: No, score=0.427 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554, 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 2qFV07ppLj3q for ; Mon, 4 Jan 2016 21:40:16 +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 CE2F023037 for ; Mon, 4 Jan 2016 21:40:15 +0000 (UTC) Received: (qmail 82109 invoked by uid 99); 4 Jan 2016 21:40:15 -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, 04 Jan 2016 21:40:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A2022E0486; Mon, 4 Jan 2016 21:40:15 +0000 (UTC) From: gauravgopi123 To: dev@apex.incubator.apache.org Reply-To: dev@apex.incubator.apache.org References: In-Reply-To: Subject: [GitHub] incubator-apex-core pull request: APEXCORE-60 Iteration support in... Content-Type: text/plain Message-Id: <20160104214015.A2022E0486@git1-us-west.apache.org> Date: Mon, 4 Jan 2016 21:40:15 +0000 (UTC) Github user gauravgopi123 commented on a diff in the pull request: https://github.com/apache/incubator-apex-core/pull/185#discussion_r48784895 --- Diff: engine/src/main/java/com/datatorrent/stram/engine/GenericNode.java --- @@ -364,29 +413,49 @@ else if (!doCheckpoint) { if (tracker.ports[trackerIndex] == null) { tracker.ports[trackerIndex++] = activePort; break; - } - else if (tracker.ports[trackerIndex] == activePort) { + } else if (tracker.ports[trackerIndex] == activePort) { break; } trackerIndex++; } - if (trackerIndex == totalQueues) { - trackerIterator = resetTupleTracker.iterator(); + if (trackerIndex == regularQueues) { + Iterator trackerIterator = resetTupleTracker.iterator(); while (trackerIterator.hasNext()) { if (trackerIterator.next().tuple.getBaseSeconds() <= baseSeconds) { trackerIterator.remove(); } } - for (int s = sinks.length; s-- > 0; ) { - sinks[s].put(t); + if (!delay) { + for (int s = sinks.length; s-- > 0; ) { + sinks[s].put(t); + } + controlTupleCount++; } - controlTupleCount++; - - assert (activeQueues.isEmpty()); - activeQueues.addAll(inputs.values()); + if (!activeQueues.isEmpty()) { + // make sure they are all queues from DelayOperator + for (Map.Entry entry : activeQueues) { + if (!isInputPortConnectedToDelayOperator(entry.getKey())) { + assert (false); + } + } + activeQueues.clear(); + } + activeQueues.addAll(inputs.entrySet()); expectingBeginWindow = activeQueues.size(); + + if (firstWindowId == -1) { + if (delay) { + for (int s = sinks.length; s-- > 0; ) { + sinks[s].put(t); + } + // if it's a DelayOperator and this is the first RESET_WINDOW (start) or END_STREAM --- End diff -- do we not need to do controlTupleCount++ as happening in `if` loop at line 430? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---