You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/04/04 01:58:52 UTC
svn commit: r1584476 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
Author: tedyu
Date: Thu Apr 3 23:58:52 2014
New Revision: 1584476
URL: http://svn.apache.org/r1584476
Log:
HBASE-10705 CompactionRequest#toString() may throw NullPointerException (Rekha Joshi)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java?rev=1584476&r1=1584475&r2=1584476&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java Thu Apr 3 23:58:52 2014
@@ -27,6 +27,7 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.hbase.regionserver.Store;
import org.apache.hadoop.hbase.regionserver.StoreFile;
+import org.apache.hadoop.hbase.regionserver.StoreFile.Reader;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.util.StringUtils;
@@ -210,7 +211,8 @@ public class CompactionRequest implement
}
}), new Function<StoreFile, String>() {
public String apply(StoreFile sf) {
- return StringUtils.humanReadableInt(sf.getReader().length());
+ return StringUtils.humanReadableInt(
+ (sf.getReader() == null) ? 0 : sf.getReader().length());
}
}));
@@ -228,7 +230,8 @@ public class CompactionRequest implement
private void recalculateSize() {
long sz = 0;
for (StoreFile sf : this.filesToCompact) {
- sz += sf.getReader().length();
+ Reader r = sf.getReader();
+ sz += r == null ? 0 : r.length();
}
this.totalSize = sz;
}