Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-19067 Do not expose getHDFSBlockDistribution in StoreFile.

This commit is contained in:
anoopsamjohn 2017-10-23 17:04:05 +05:30
parent 4c43ef2683
commit df71eeff1b
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/RegionObserver.java
View File

@ -958,6 +958,8 @@ public interface RegionObserver {
* @deprecated For Phoenix only, StoreFileReader is not a stable interface. * @deprecated For Phoenix only, StoreFileReader is not a stable interface.
*/ */
@Deprecated @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, default StoreFileReader preStoreFileReaderOpen(ObserverContext<RegionCoprocessorEnvironment> ctx,
FileSystem fs, Path p, FSDataInputStreamWrapper in, long size, CacheConfig cacheConf, FileSystem fs, Path p, FSDataInputStreamWrapper in, long size, CacheConfig cacheConf,
Reference r, StoreFileReader reader) throws IOException { Reference r, StoreFileReader reader) throws IOException {
@ -979,6 +981,8 @@ public interface RegionObserver {
* @deprecated For Phoenix only, StoreFileReader is not a stable interface. * @deprecated For Phoenix only, StoreFileReader is not a stable interface.
*/ */
@Deprecated @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, default StoreFileReader postStoreFileReaderOpen(ObserverContext<RegionCoprocessorEnvironment> ctx,
FileSystem fs, Path p, FSDataInputStreamWrapper in, long size, CacheConfig cacheConf, FileSystem fs, Path p, FSDataInputStreamWrapper in, long size, CacheConfig cacheConf,
Reference r, StoreFileReader reader) throws IOException { Reference r, StoreFileReader reader) throws IOException {

5
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java
View File

@ -331,7 +331,10 @@ public class HStoreFile implements StoreFile {
: OptionalLong.of(Bytes.toLong(bulkLoadTimestamp)); : 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() { public HDFSBlocksDistribution getHDFSBlockDistribution() {
return this.fileInfo.getHDFSBlockDistribution(); return this.fileInfo.getHDFSBlockDistribution();
} }

7
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
View File

@ -25,7 +25,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.CellComparator;
import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.HDFSBlocksDistribution;
import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability; import org.apache.yetus.audience.InterfaceStability;
@ -117,12 +116,6 @@ public interface StoreFile {
*/ */
OptionalLong getBulkLoadTimestamp(); 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 * @return a length description of this StoreFile, suitable for debug output
*/ */