Skip to content

Commit b961eb2

Browse files
committed
Revert "HBASE-27794: Tooling for parsing/reading the prefetch files list file (#5468)"
This reverts commit c37fba6.
1 parent c37fba6 commit b961eb2

File tree

18 files changed

+6
-140
lines changed

18 files changed

+6
-140
lines changed

hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2629,9 +2629,4 @@ List<LogEntry> getLogEntries(Set<ServerName> serverNames, String logType, Server
26292629
* Flush master local region
26302630
*/
26312631
void flushMasterStore() throws IOException;
2632-
2633-
/**
2634-
* Get the list of cached files
2635-
*/
2636-
List<String> getCachedFilesList(ServerName serverName) throws IOException;
26372632
}

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AdminOverAsyncAdmin.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,9 +1125,4 @@ public List<LogEntry> getLogEntries(Set<ServerName> serverNames, String logType,
11251125
public void flushMasterStore() throws IOException {
11261126
get(admin.flushMasterStore());
11271127
}
1128-
1129-
@Override
1130-
public List<String> getCachedFilesList(ServerName serverName) throws IOException {
1131-
return get(admin.getCachedFilesList(serverName));
1132-
}
11331128
}

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncAdmin.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1843,9 +1843,4 @@ CompletableFuture<List<LogEntry>> getLogEntries(Set<ServerName> serverNames, Str
18431843
* Flush master local region
18441844
*/
18451845
CompletableFuture<Void> flushMasterStore();
1846-
1847-
/**
1848-
* Get the list of cached files
1849-
*/
1850-
CompletableFuture<List<String>> getCachedFilesList(ServerName serverName);
18511846
}

hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncHBaseAdmin.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -995,9 +995,4 @@ public CompletableFuture<List<LogEntry>> getLogEntries(Set<ServerName> serverNam
995995
public CompletableFuture<Void> flushMasterStore() {
996996
return wrap(rawAdmin.flushMasterStore());
997997
}
998-
999-
@Override
1000-
public CompletableFuture<List<String>> getCachedFilesList(ServerName serverName) {
1001-
return wrap(rawAdmin.getCachedFilesList(serverName));
1002-
}
1003998
}

hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@
132132
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CompactionSwitchResponse;
133133
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionRequest;
134134
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.FlushRegionResponse;
135-
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetCachedFilesListRequest;
136-
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetCachedFilesListResponse;
137135
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionRequest;
138136
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse;
139137
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoRequest;
@@ -4521,15 +4519,4 @@ Void> call(controller, stub, request.build(),
45214519
(s, c, req, done) -> s.flushMasterStore(c, req, done), resp -> null))
45224520
.call();
45234521
}
4524-
4525-
@Override
4526-
public CompletableFuture<List<String>> getCachedFilesList(ServerName serverName) {
4527-
GetCachedFilesListRequest.Builder request = GetCachedFilesListRequest.newBuilder();
4528-
return this.<List<String>> newAdminCaller()
4529-
.action((controller, stub) -> this.<GetCachedFilesListRequest, GetCachedFilesListResponse,
4530-
List<String>> adminCall(controller, stub, request.build(),
4531-
(s, c, req, done) -> s.getCachedFilesList(c, req, done),
4532-
resp -> resp.getCachedFilesList()))
4533-
.serverName(serverName).call();
4534-
}
45354522
}

hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,6 @@
153153
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.AdminService;
154154
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.ClearSlowLogResponses;
155155
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CloseRegionRequest;
156-
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetCachedFilesListRequest;
157-
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetCachedFilesListResponse;
158156
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionRequest;
159157
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetOnlineRegionResponse;
160158
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.GetRegionInfoRequest;
@@ -1782,21 +1780,6 @@ public static List<org.apache.hadoop.hbase.client.RegionInfo> getOnlineRegions(
17821780
return getRegionInfos(response);
17831781
}
17841782

1785-
/**
1786-
* Get the list of cached files
1787-
*/
1788-
public static List<String> getCachedFilesList(final RpcController controller,
1789-
final AdminService.BlockingInterface admin) throws IOException {
1790-
GetCachedFilesListRequest request = GetCachedFilesListRequest.newBuilder().build();
1791-
GetCachedFilesListResponse response = null;
1792-
try {
1793-
response = admin.getCachedFilesList(controller, request);
1794-
} catch (ServiceException se) {
1795-
throw getRemoteException(se);
1796-
}
1797-
return new ArrayList<>(response.getCachedFilesList());
1798-
}
1799-
18001783
/**
18011784
* Get the list of region info from a GetOnlineRegionResponse
18021785
* @param proto the GetOnlineRegionResponse

hbase-protocol-shaded/src/main/protobuf/server/region/Admin.proto

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,6 @@ message ExecuteProceduresRequest {
283283
message ExecuteProceduresResponse {
284284
}
285285

286-
message GetCachedFilesListRequest {
287-
}
288-
289-
message GetCachedFilesListResponse {
290-
repeated string cached_files = 1;
291-
}
292-
293286
/**
294287
* Slow/Large log (LogRequest) use-case specific RPC request. This request payload will be
295288
* converted in bytes and sent to generic RPC API: GetLogEntries
@@ -412,7 +405,4 @@ service AdminService {
412405
rpc GetLogEntries(LogRequest)
413406
returns(LogEntry);
414407

415-
rpc GetCachedFilesList(GetCachedFilesListRequest)
416-
returns(GetCachedFilesListResponse);
417-
418408
}

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/BlockCache.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
package org.apache.hadoop.hbase.io.hfile;
1919

2020
import java.util.Iterator;
21-
import java.util.Map;
22-
import java.util.Optional;
2321
import org.apache.yetus.audience.InterfaceAudience;
2422

2523
/**
@@ -163,11 +161,4 @@ default Cacheable getBlock(BlockCacheKey cacheKey, boolean caching, boolean repe
163161
default boolean isMetaBlock(BlockType blockType) {
164162
return blockType != null && blockType.getCategory() != BlockType.BlockCategory.DATA;
165163
}
166-
167-
/**
168-
* Returns the list of fully cached files
169-
*/
170-
default Optional<Map<String, Boolean>> getFullyCachedFiles() {
171-
return Optional.empty();
172-
}
173164
}

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CombinedBlockCache.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
package org.apache.hadoop.hbase.io.hfile;
1919

2020
import java.util.Iterator;
21-
import java.util.Map;
22-
import java.util.Optional;
2321
import org.apache.hadoop.hbase.io.HeapSize;
2422
import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache;
2523
import org.apache.yetus.audience.InterfaceAudience;
@@ -384,14 +382,6 @@ public BlockCache[] getBlockCaches() {
384382
return new BlockCache[] { this.l1Cache, this.l2Cache };
385383
}
386384

387-
/**
388-
* Returns the list of fully cached files
389-
*/
390-
@Override
391-
public Optional<Map<String, Boolean>> getFullyCachedFiles() {
392-
return this.l2Cache.getFullyCachedFiles();
393-
}
394-
395385
@Override
396386
public void setMaxSize(long size) {
397387
this.l1Cache.setMaxSize(size);

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePreadReader.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ public HFilePreadReader(ReaderContext context, HFileInfo fileInfo, CacheConfig c
4242
final MutableBoolean fileAlreadyCached = new MutableBoolean(false);
4343
Optional<BucketCache> bucketCacheOptional =
4444
BucketCache.getBucketCacheFromCacheConfig(cacheConf);
45-
bucketCacheOptional.flatMap(BucketCache::getFullyCachedFiles).ifPresent(fcf -> {
46-
fileAlreadyCached.setValue(fcf.get(path.getName()) == null ? false : true);
47-
});
45+
bucketCacheOptional.ifPresent(bc -> fileAlreadyCached
46+
.setValue(bc.getFullyCachedFiles().get(path.getName()) == null ? false : true));
4847
// Prefetch file blocks upon open if requested
4948
if (
5049
cacheConf.shouldPrefetchOnOpen() && cacheIfCompactionsOff()

0 commit comments

Comments
 (0)