hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [1/2] hbase git commit: Revert "guard against NPE while reading FileTrailer and HFileBlock"
Date Thu, 16 Mar 2017 21:56:51 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 094e9a311 -> d1ea718e4


Revert "guard against NPE while reading FileTrailer and HFileBlock"

This reverts commit c97905a962b88a0c68ca8a51c2e507daec81ca6d.

This is a revert just so I can add the JIRA number to the commit
message.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e92a147e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e92a147e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e92a147e

Branch: refs/heads/branch-1
Commit: e92a147e1961366e36a39577816994566e1e21c5
Parents: 094e9a3
Author: Michael Stack <stack@apache.org>
Authored: Thu Mar 16 14:55:41 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Thu Mar 16 14:55:41 2017 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/io/hfile/FixedFileTrailer.java |  3 +-
 .../hadoop/hbase/io/hfile/HFileBlock.java       |  2 +-
 .../apache/hadoop/hbase/io/hfile/HFileUtil.java | 43 --------------------
 3 files changed, 2 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e92a147e/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
index ade67b5..f6ae291 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
@@ -385,8 +385,7 @@ public class FixedFileTrailer {
       bufferSize = (int) fileSize;
     }
 
-    HFileUtil.seekOnMultipleSources(istream, seekPoint);
-
+    istream.seek(seekPoint);
     ByteBuffer buf = ByteBuffer.allocate(bufferSize);
     istream.readFully(buf.array(), buf.arrayOffset(),
         buf.arrayOffset() + buf.limit());

http://git-wip-us.apache.org/repos/asf/hbase/blob/e92a147e/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
index 78cabcb..21ea5e8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
@@ -1450,7 +1450,7 @@ public class HFileBlock implements Cacheable {
       if (!pread && streamLock.tryLock()) {
         // Seek + read. Better for scanning.
         try {
-          HFileUtil.seekOnMultipleSources(istream, fileOffset);
+          istream.seek(fileOffset);
 
           long realOffset = istream.getPos();
           if (realOffset != fileOffset) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/e92a147e/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileUtil.java
deleted file mode 100644
index 835450c..0000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileUtil.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.io.hfile;
-
-import java.io.IOException;
-
-import org.apache.hadoop.fs.FSDataInputStream;
-
-public class HFileUtil {
-
-  /** guards against NullPointer
-   * utility which tries to seek on the DFSIS and will try an alternative source
-   * if the FSDataInputStream throws an NPE HBASE-17501
-   * @param istream
-   * @param offset
-   * @throws IOException
-   */
-  static public void seekOnMultipleSources(FSDataInputStream istream, long offset) throws
IOException {
-    try {
-      // attempt to seek inside of current blockReader
-      istream.seek(offset);
-    } catch (NullPointerException e) {
-      // retry the seek on an alternate copy of the data
-      // this can occur if the blockReader on the DFSInputStream is null
-      istream.seekToNewSource(offset);
-    }
-  }
-}


Mime
View raw message