Return-Path: X-Original-To: apmail-giraph-commits-archive@www.apache.org Delivered-To: apmail-giraph-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 78402FEF1 for ; Thu, 21 Mar 2013 17:20:58 +0000 (UTC) Received: (qmail 55335 invoked by uid 500); 21 Mar 2013 17:20:58 -0000 Delivered-To: apmail-giraph-commits-archive@giraph.apache.org Received: (qmail 55299 invoked by uid 500); 21 Mar 2013 17:20:58 -0000 Mailing-List: contact commits-help@giraph.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@giraph.apache.org Delivered-To: mailing list commits@giraph.apache.org Received: (qmail 55292 invoked by uid 99); 21 Mar 2013 17:20:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Mar 2013 17:20:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2E8FE5233A; Thu, 21 Mar 2013 17:20:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nitay@apache.org To: commits@giraph.apache.org Message-Id: <6c1436b785234561ad944d57e79a2e47@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: GIRAPH-: Remove munge. Date: Thu, 21 Mar 2013 17:20:58 +0000 (UTC) Updated Branches: refs/heads/hadoops-485 [created] cf6cc3e12 GIRAPH-: Remove munge. Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/cf6cc3e1 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/cf6cc3e1 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/cf6cc3e1 Branch: refs/heads/hadoops-485 Commit: cf6cc3e124791e61cd21e77ba92dd6b39961b2bb Parents: 9251743 Author: Nitay Joffe Authored: Mon Feb 25 17:05:18 2013 -0800 Committer: Nitay Joffe Committed: Mon Feb 25 17:05:18 2013 -0800 ---------------------------------------------------------------------- .../giraph/bsp/ImmutableOutputCommitter.java | 4 +--- .../java/org/apache/giraph/hadoop/HadoopShims.java | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/cf6cc3e1/giraph-core/src/main/java/org/apache/giraph/bsp/ImmutableOutputCommitter.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/bsp/ImmutableOutputCommitter.java b/giraph-core/src/main/java/org/apache/giraph/bsp/ImmutableOutputCommitter.java index e5480cc..dd7d3a3 100644 --- a/giraph-core/src/main/java/org/apache/giraph/bsp/ImmutableOutputCommitter.java +++ b/giraph-core/src/main/java/org/apache/giraph/bsp/ImmutableOutputCommitter.java @@ -53,11 +53,9 @@ class ImmutableOutputCommitter extends OutputCommitter { } @Override - /*if[HADOOP_NON_SECURE] public void cleanupJob(JobContext jobContext) throws IOException { } - else[HADOOP_NON_SECURE]*/ - /*end[HADOOP_NON_SECURE]*/ + @Override public void commitJob(JobContext jobContext) throws IOException { } } http://git-wip-us.apache.org/repos/asf/giraph/blob/cf6cc3e1/giraph-core/src/main/java/org/apache/giraph/hadoop/HadoopShims.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/hadoop/HadoopShims.java b/giraph-core/src/main/java/org/apache/giraph/hadoop/HadoopShims.java new file mode 100644 index 0000000..fa5d495 --- /dev/null +++ b/giraph-core/src/main/java/org/apache/giraph/hadoop/HadoopShims.java @@ -0,0 +1,7 @@ +package org.apache.giraph.hadoop; + +import org.apache.hadoop.mapreduce.OutputCommitter; + +public interface HadoopShims { + OutputCommitter getImmutableOutputCommitter(); +}