Revert "HBASE-21507 Compaction failed when execute AbstractMultiFileWriter.beforeShipped() method"

This reverts commit 13955ba532.
This commit is contained in:
zhangduo 2018-11-27 20:58:34 +08:00
parent 13955ba532
commit b81cec47ec
1 changed files with 5 additions and 6 deletions

View File

@ -21,10 +21,12 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.regionserver.CellSink;
/** /**
* Base class for cell sink that separates the provided cells into multiple files. * Base class for cell sink that separates the provided cells into multiple files.
@ -117,13 +119,10 @@ public abstract class AbstractMultiFileWriter implements CellSink, ShipperListen
@Override @Override
public void beforeShipped() throws IOException { public void beforeShipped() throws IOException {
Collection<StoreFileWriter> writers = writers(); if (this.writers() != null) {
if (writers != null) { for (StoreFileWriter writer : writers()) {
for (StoreFileWriter writer : writers) {
if (writer != null) {
writer.beforeShipped(); writer.beforeShipped();
} }
} }
} }
}
} }