Revert "HBASE-21507 Compaction failed when execute AbstractMultiFileWriter.beforeShipped() method"
Email address is broken. This reverts commit 3133d4385989ccda3be3aa55c7d8afa798180dd0. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/39bc458e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/39bc458e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/39bc458e Branch: refs/heads/HBASE-20952 Commit: 39bc458eabe805d300183803ab715707e62d6096 Parents: 3133d43 Author: zhangduo <zhang...@apache.org> Authored: Tue Nov 27 20:54:51 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Tue Nov 27 20:55:04 2018 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/AbstractMultiFileWriter.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/39bc458e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java index 43d0ad8..2fdab81 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AbstractMultiFileWriter.java @@ -21,10 +21,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import org.apache.hadoop.fs.Path; import org.apache.yetus.audience.InterfaceAudience; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hadoop.hbase.regionserver.CellSink; /** * Base class for cell sink that separates the provided cells into multiple files. @@ -117,12 +119,9 @@ public abstract class AbstractMultiFileWriter implements CellSink, ShipperListen @Override public void beforeShipped() throws IOException { - Collection<StoreFileWriter> writers = writers(); - if (writers != null) { - for (StoreFileWriter writer : writers) { - if (writer != null) { - writer.beforeShipped(); - } + if (this.writers() != null) { + for (StoreFileWriter writer : writers()) { + writer.beforeShipped(); } } }
