You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2018/12/07 22:29:06 UTC
[23/51] [abbrv] hbase git commit: HBASE-21507 Compaction failed when
execute AbstractMultiFileWriter.beforeShipped() method
HBASE-21507 Compaction failed when execute AbstractMultiFileWriter.beforeShipped() method
Signed-off-by: zhangduo <zh...@apache.org>
Signed-off-by: Anoop Sam John <an...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3133d438
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3133d438
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3133d438
Branch: refs/heads/HBASE-20952
Commit: 3133d4385989ccda3be3aa55c7d8afa798180dd0
Parents: 34e1d74
Author: lixiaobao <ao...@gmail.com>
Authored: Tue Nov 27 20:30:23 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Tue Nov 27 20:31:07 2018 +0800
----------------------------------------------------------------------
.../hbase/regionserver/AbstractMultiFileWriter.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3133d438/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 2fdab81..43d0ad8 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,12 +21,10 @@ 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.
@@ -119,9 +117,12 @@ public abstract class AbstractMultiFileWriter implements CellSink, ShipperListen
@Override
public void beforeShipped() throws IOException {
- if (this.writers() != null) {
- for (StoreFileWriter writer : writers()) {
- writer.beforeShipped();
+ Collection<StoreFileWriter> writers = writers();
+ if (writers != null) {
+ for (StoreFileWriter writer : writers) {
+ if (writer != null) {
+ writer.beforeShipped();
+ }
}
}
}