Return-Path: X-Original-To: apmail-flink-commits-archive@minotaur.apache.org Delivered-To: apmail-flink-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 E529211992 for ; Wed, 9 Jul 2014 10:21:50 +0000 (UTC) Received: (qmail 47759 invoked by uid 500); 9 Jul 2014 10:21:50 -0000 Delivered-To: apmail-flink-commits-archive@flink.apache.org Received: (qmail 47741 invoked by uid 500); 9 Jul 2014 10:21:50 -0000 Mailing-List: contact commits-help@flink.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.incubator.apache.org Delivered-To: mailing list commits@flink.incubator.apache.org Received: (qmail 47732 invoked by uid 99); 9 Jul 2014 10:21:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2014 10:21:50 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 09 Jul 2014 10:21:48 +0000 Received: (qmail 45953 invoked by uid 99); 9 Jul 2014 10:21:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jul 2014 10:21:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5E26D9A92A3; Wed, 9 Jul 2014 10:21:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sewen@apache.org To: commits@flink.incubator.apache.org Date: Wed, 09 Jul 2014 10:21:36 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [09/12] git commit: Fix missing strategy constants in JSON dump generator X-Virus-Checked: Checked by ClamAV on apache.org Fix missing strategy constants in JSON dump generator Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/a9b1daa1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/a9b1daa1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/a9b1daa1 Branch: refs/heads/master Commit: a9b1daa125f109280027f9df3029bb4c49a0f326 Parents: 03c6160 Author: Stephan Ewen Authored: Wed Jul 9 03:07:21 2014 +0200 Committer: Stephan Ewen Committed: Wed Jul 9 03:10:18 2014 +0200 ---------------------------------------------------------------------- .../stratosphere/compiler/plandump/PlanJSONDumpGenerator.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/a9b1daa1/stratosphere-compiler/src/main/java/eu/stratosphere/compiler/plandump/PlanJSONDumpGenerator.java ---------------------------------------------------------------------- diff --git a/stratosphere-compiler/src/main/java/eu/stratosphere/compiler/plandump/PlanJSONDumpGenerator.java b/stratosphere-compiler/src/main/java/eu/stratosphere/compiler/plandump/PlanJSONDumpGenerator.java index a1baff1..849da33 100644 --- a/stratosphere-compiler/src/main/java/eu/stratosphere/compiler/plandump/PlanJSONDumpGenerator.java +++ b/stratosphere-compiler/src/main/java/eu/stratosphere/compiler/plandump/PlanJSONDumpGenerator.java @@ -436,6 +436,13 @@ public class PlanJSONDumpGenerator { case HYBRIDHASH_BUILD_SECOND: locString = "Hybrid Hash (build: " + child2name + ")"; break; + + case HYBRIDHASH_BUILD_FIRST_CACHED: + locString = "Hybrid Hash (CACHED) (build: " + child1name + ")"; + break; + case HYBRIDHASH_BUILD_SECOND_CACHED: + locString = "Hybrid Hash (CACHED) (build: " + child2name + ")"; + break; case NESTEDLOOP_BLOCKED_OUTER_FIRST: locString = "Nested Loops (Blocked Outer: " + child1name + ")";