You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2015/11/05 09:56:57 UTC

tez git commit: TEZ-1976. Findbug warning: Unread field: org.apache.hadoop.mapreduce.split.TezGroupedSplitsInputFormat.split (Chetna Chaudhari via bikas)

Repository: tez
Updated Branches:
  refs/heads/master 69a69d73f -> f8b480e6f


TEZ-1976. Findbug warning: Unread field: org.apache.hadoop.mapreduce.split.TezGroupedSplitsInputFormat.split (Chetna Chaudhari via bikas)


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

Branch: refs/heads/master
Commit: f8b480e6f360e4945ffdb451710a0461084c14d0
Parents: 69a69d7
Author: Bikas Saha <bi...@apache.org>
Authored: Thu Nov 5 00:56:42 2015 -0800
Committer: Bikas Saha <bi...@apache.org>
Committed: Thu Nov 5 00:56:42 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 tez-mapreduce/findbugs-exclude.xml              |  7 -----
 .../split/TezGroupedSplitsInputFormat.java      | 32 --------------------
 3 files changed, 2 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/f8b480e6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6e27fb5..3ad0e36 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ INCOMPATIBLE CHANGES
   TEZ-2679. Admin forms of launch env settings
 
 ALL CHANGES:
+  TEZ-1976. Findbug warning: Unread field:
+  org.apache.hadoop.mapreduce.split.TezGroupedSplitsInputFormat$SplitHolder.split
   TEZ-2927. Tez UI: Graciously fail when system-metrics-publisher is disabled
   TEZ-2915. Tez UI: Getting back to the DAG details page is difficult
   TEZ-2895. Tez UI: Add option to enable and disable in-progress

http://git-wip-us.apache.org/repos/asf/tez/blob/f8b480e6/tez-mapreduce/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/tez-mapreduce/findbugs-exclude.xml b/tez-mapreduce/findbugs-exclude.xml
index ec64739..07b4acd 100644
--- a/tez-mapreduce/findbugs-exclude.xml
+++ b/tez-mapreduce/findbugs-exclude.xml
@@ -164,11 +164,4 @@
     <Bug pattern="WA_AWAIT_NOT_IN_LOOP"/>
   </Match>
 
-  <!-- TEZ-1976 -->
-  <Match>
-    <Class name="org.apache.hadoop.mapreduce.split.TezGroupedSplitsInputFormat$SplitHolder"/>
-    <Field name="split"/>
-    <Bug pattern="URF_UNREAD_FIELD"/>
-  </Match>
-
 </FindBugsFilter>

http://git-wip-us.apache.org/repos/asf/tez/blob/f8b480e6/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
index 8aabbf6..49dc70c 100644
--- a/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
+++ b/tez-mapreduce/src/main/java/org/apache/hadoop/mapreduce/split/TezGroupedSplitsInputFormat.java
@@ -81,38 +81,6 @@ public class TezGroupedSplitsInputFormat<K, V> extends InputFormat<K, V>
       LOG.debug("Split size estimator : " + estimator);
     }
   }
-
-  class SplitHolder {
-    InputSplit split;
-    boolean isProcessed = false;
-    SplitHolder(InputSplit split) {
-      this.split = split;
-    }
-  }
-  
-  class LocationHolder {
-    List<SplitHolder> splits;
-    int headIndex = 0;
-    LocationHolder(int capacity) {
-      splits = new ArrayList<SplitHolder>(capacity);
-    }
-    boolean isEmpty() {
-      return (headIndex == splits.size());
-    }
-    SplitHolder getUnprocessedHeadSplit() {
-      while (!isEmpty()) {
-        SplitHolder holder = splits.get(headIndex);
-        if (!holder.isProcessed) {
-          return holder;
-        }
-        incrementHeadIndex();
-      }
-      return null;
-    }
-    void incrementHeadIndex() {
-      headIndex++;
-    }
-  }
   
   @Override
   public List<InputSplit> getSplits(JobContext context) throws IOException,