You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2015/12/15 21:36:23 UTC

[2/2] flink git commit: [FLINK-3147] Expose HadoopOutputFormatBase fields as protected

[FLINK-3147] Expose HadoopOutputFormatBase fields as protected

This closes #1442


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/19cbc787
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/19cbc787
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/19cbc787

Branch: refs/heads/master
Commit: 19cbc787b9f53dd494d77899e00111f437e907b6
Parents: b9ce8ab
Author: Nick Dimiduk <nd...@apache.org>
Authored: Tue Dec 8 10:20:58 2015 -0800
Committer: Fabian Hueske <fh...@apache.org>
Committed: Tue Dec 15 21:15:34 2015 +0100

----------------------------------------------------------------------
 .../java/hadoop/mapred/HadoopOutputFormatBase.java  | 14 +++++++-------
 .../hadoop/mapreduce/HadoopOutputFormatBase.java    | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/19cbc787/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
index 40214f2..eef0905 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapred/HadoopOutputFormatBase.java
@@ -58,15 +58,15 @@ public abstract class HadoopOutputFormatBase<K, V, T> extends HadoopOutputFormat
 	// Hadoop parallelizes tasks across JVMs which is why they might rely on this JVM isolation.
 	// In contrast, Flink parallelizes using Threads, so multiple Hadoop OutputFormat instances
 	// might be used in the same JVM.
-	private static final Object OPEN_MUTEX = new Object();
-	private static final Object CONFIGURE_MUTEX = new Object();
-	private static final Object CLOSE_MUTEX = new Object();
+	protected static final Object OPEN_MUTEX = new Object();
+	protected static final Object CONFIGURE_MUTEX = new Object();
+	protected static final Object CLOSE_MUTEX = new Object();
 
-	private JobConf jobConf;
-	private org.apache.hadoop.mapred.OutputFormat<K,V> mapredOutputFormat;
+	protected JobConf jobConf;
+	protected org.apache.hadoop.mapred.OutputFormat<K,V> mapredOutputFormat;
 	protected transient RecordWriter<K,V> recordWriter;
-	private transient OutputCommitter outputCommitter;
-	private transient TaskAttemptContext context;
+	protected transient OutputCommitter outputCommitter;
+	protected transient TaskAttemptContext context;
 
 	public HadoopOutputFormatBase(org.apache.hadoop.mapred.OutputFormat<K, V> mapredOutputFormat, JobConf job) {
 		super(job.getCredentials());

http://git-wip-us.apache.org/repos/asf/flink/blob/19cbc787/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
index dc475e8..d2bb310 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/HadoopOutputFormatBase.java
@@ -53,16 +53,16 @@ public abstract class HadoopOutputFormatBase<K, V, T> extends HadoopOutputFormat
 	// Hadoop parallelizes tasks across JVMs which is why they might rely on this JVM isolation.
 	// In contrast, Flink parallelizes using Threads, so multiple Hadoop OutputFormat instances
 	// might be used in the same JVM.
-	private static final Object OPEN_MUTEX = new Object();
-	private static final Object CONFIGURE_MUTEX = new Object();
-	private static final Object CLOSE_MUTEX = new Object();
+	protected static final Object OPEN_MUTEX = new Object();
+	protected static final Object CONFIGURE_MUTEX = new Object();
+	protected static final Object CLOSE_MUTEX = new Object();
 
-	private org.apache.hadoop.conf.Configuration configuration;
-	private org.apache.hadoop.mapreduce.OutputFormat<K,V> mapreduceOutputFormat;
+	protected org.apache.hadoop.conf.Configuration configuration;
+	protected org.apache.hadoop.mapreduce.OutputFormat<K,V> mapreduceOutputFormat;
 	protected transient RecordWriter<K,V> recordWriter;
-	private transient OutputCommitter outputCommitter;
-	private transient TaskAttemptContext context;
-	private transient int taskNumber;
+	protected transient OutputCommitter outputCommitter;
+	protected transient TaskAttemptContext context;
+	protected transient int taskNumber;
 
 	public HadoopOutputFormatBase(org.apache.hadoop.mapreduce.OutputFormat<K, V> mapreduceOutputFormat, Job job) {
 		super(job.getCredentials());