You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2017/10/23 11:34:32 UTC
hbase git commit: HBASE-19067 Do not expose getHDFSBlockDistribution
in StoreFile.
Repository: hbase
Updated Branches:
refs/heads/master c9fdbec77 -> 880b26d7d
HBASE-19067 Do not expose getHDFSBlockDistribution in StoreFile.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/880b26d7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/880b26d7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/880b26d7
Branch: refs/heads/master
Commit: 880b26d7d8678c688d741d991f55bd2245bee345
Parents: c9fdbec
Author: anoopsamjohn <an...@gmail.com>
Authored: Mon Oct 23 17:04:05 2017 +0530
Committer: anoopsamjohn <an...@gmail.com>
Committed: Mon Oct 23 17:04:05 2017 +0530
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/coprocessor/RegionObserver.java | 4 ++++
.../java/org/apache/hadoop/hbase/regionserver/HStoreFile.java | 5 ++++-
.../java/org/apache/hadoop/hbase/regionserver/StoreFile.java | 7 -------
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/880b26d7/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java
index ba96a5b..815daf1 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java
@@ -958,6 +958,8 @@ public interface RegionObserver {
* @deprecated For Phoenix only, StoreFileReader is not a stable interface.
*/
@Deprecated
+ // Passing InterfaceAudience.Private args FSDataInputStreamWrapper, CacheConfig and Reference.
+ // This is fine as the hook is deprecated any way.
default StoreFileReader preStoreFileReaderOpen(ObserverContext<RegionCoprocessorEnvironment> ctx,
FileSystem fs, Path p, FSDataInputStreamWrapper in, long size, CacheConfig cacheConf,
Reference r, StoreFileReader reader) throws IOException {
@@ -979,6 +981,8 @@ public interface RegionObserver {
* @deprecated For Phoenix only, StoreFileReader is not a stable interface.
*/
@Deprecated
+ // Passing InterfaceAudience.Private args FSDataInputStreamWrapper, CacheConfig and Reference.
+ // This is fine as the hook is deprecated any way.
default StoreFileReader postStoreFileReaderOpen(ObserverContext<RegionCoprocessorEnvironment> ctx,
FileSystem fs, Path p, FSDataInputStreamWrapper in, long size, CacheConfig cacheConf,
Reference r, StoreFileReader reader) throws IOException {
http://git-wip-us.apache.org/repos/asf/hbase/blob/880b26d7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java
index 5301922..0ca01a5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java
@@ -331,7 +331,10 @@ public class HStoreFile implements StoreFile {
: OptionalLong.of(Bytes.toLong(bulkLoadTimestamp));
}
- @Override
+ /**
+ * @return the cached value of HDFS blocks distribution. The cached value is calculated when store
+ * file is opened.
+ */
public HDFSBlocksDistribution getHDFSBlockDistribution() {
return this.fileInfo.getHDFSBlockDistribution();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/880b26d7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
index 9e318cd..4f4cfcc 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparator;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
-import org.apache.hadoop.hbase.HDFSBlocksDistribution;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
@@ -118,12 +117,6 @@ public interface StoreFile {
OptionalLong getBulkLoadTimestamp();
/**
- * @return the cached value of HDFS blocks distribution. The cached value is calculated when store
- * file is opened.
- */
- HDFSBlocksDistribution getHDFSBlockDistribution();
-
- /**
* @return a length description of this StoreFile, suitable for debug output
*/
String toStringDetailed();