HBASE-28467: Fixed unit test.

jhungund · jhungund · commit e25913790eb0 · 2024-05-22T12:54:19.000+05:30
Change-Id: I924b06e94c83502b39418097813da06d000dc336
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java
@@ -279,7 +279,10 @@ public boolean shouldCacheBlockOnRead(BlockCategory category, HFileInfo hFileInf
     Configuration conf) {
     Optional<Boolean> cacheFileBlock = Optional.of(true);
     if (getBlockCache().isPresent()) {
-      cacheFileBlock = getBlockCache().get().shouldCacheFile(hFileInfo, conf);
+      Optional<Boolean> result = getBlockCache().get().shouldCacheFile(hFileInfo, conf);
+      if (result.isPresent()) {
+        cacheFileBlock = result;
+      }
     }
     return shouldCacheBlockOnRead(category) && cacheFileBlock.get();
   }

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,10 @@ public boolean shouldCacheBlockOnRead(BlockCategory category, HFileInfo hFileInf`
`279`	`279`	`Configuration conf) {`
`280`	`280`	`Optional<Boolean> cacheFileBlock = Optional.of(true);`
`281`	`281`	`if (getBlockCache().isPresent()) {`
`282`		`- cacheFileBlock = getBlockCache().get().shouldCacheFile(hFileInfo, conf);`
	`282`	`+ Optional<Boolean> result = getBlockCache().get().shouldCacheFile(hFileInfo, conf);`
	`283`	`+ if (result.isPresent()) {`
	`284`	`+ cacheFileBlock = result;`
	`285`	`+ }`
`283`	`286`	`}`
`284`	`287`	`return shouldCacheBlockOnRead(category) && cacheFileBlock.get();`
`285`	`288`	`}`