Repository: hbase Updated Branches: refs/heads/branch-2.1 13955ba53 -> a53b85ec2
Revert "HBASE-21507 Compaction failed when execute AbstractMultiFileWriter.beforeShipped() method" This reverts commit 13955ba532e05fb2f811f2835c0a78d99fa2adf1. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b81cec47 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b81cec47 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b81cec47 Branch: refs/heads/branch-2.1 Commit: b81cec47ec921faa5afc4cb9e882450a0a4e72a0 Parents: 13955ba Author: zhangduo <zhang...@apache.org> Authored: Tue Nov 27 20:58:34 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Tue Nov 27 20:58:34 2018 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/AbstractMultiFileWriter.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b81cec47/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(); } } }
