Skip to content

[HBASE-22520] : Avoid possible NPE while performing seekBefore in Hal… #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saintstack merged 2 commits into from
Jun 6, 2019
Merged

[HBASE-22520] : Avoid possible NPE while performing seekBefore in Hal… #281

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3abe3d9
[HBASE-22520] : Avoid possible NPE while performing seekBefore in Hal…
virajjasani Jun 1, 2019
5cb8374
minor changes
virajjasani Jun 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ public class HalfStoreFileReader extends StoreFileReader {
// i.e. empty column and a timestamp of LATEST_TIMESTAMP.
protected final byte [] splitkey;

protected final Cell splitCell;
private final Cell splitCell;

private Optional<Cell> firstKey = null;
private Optional<Cell> firstKey = Optional.empty();

private boolean firstKeySeeked = false;

Expand Down Expand Up @@ -269,7 +269,8 @@ public int reseekTo(Cell key) throws IOException {
public boolean seekBefore(Cell key) throws IOException {
if (top) {
Optional<Cell> fk = getFirstKey();
if (PrivateCellUtil.compareKeyIgnoresMvcc(getComparator(), key, fk.get()) <= 0) {
if (fk.isPresent() &&
PrivateCellUtil.compareKeyIgnoresMvcc(getComparator(), key, fk.get()) <= 0) {
return false;
}
} else {
Expand Down