[phoenix] branch master updated: PHOENIX-7060 Compilation fails on 5.1 with Hbase 2.1 or 2.2

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 23607a3695 PHOENIX-7060 Compilation fails on 5.1 with Hbase 2.1 or 2.2
23607a3695 is described below

commit 23607a369579307dd507cc51e9e1ea2f0967197b
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Oct 18 15:11:52 2023 +0200

    PHOENIX-7060 Compilation fails on 5.1 with Hbase 2.1 or 2.2
    
    remove HConstants reference to allow compilation with 2.4.0-2.4.5
---
 .../src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
index 2cefbece00..dee9e299ab 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/SnapshotScanner.java
@@ -136,8 +136,11 @@ public class SnapshotScanner extends AbstractClientScanner 
{
     // create one for MapReduce jobs to cache the INDEX block by setting to use
     // IndexOnlyLruBlockCache and set a value to 
HBASE_CLIENT_SCANNER_BLOCK_CACHE_SIZE_KEY
     conf.set(BlockCacheFactory.BLOCKCACHE_POLICY_KEY, "IndexOnlyLRU");
-    conf.setIfUnset(HConstants.HFILE_ONHEAP_BLOCK_CACHE_FIXED_SIZE_KEY,
-            
String.valueOf(HConstants.HBASE_CLIENT_SCANNER_ONHEAP_BLOCK_CACHE_FIXED_SIZE_DEFAULT));
+    // HConstants.HFILE_ONHEAP_BLOCK_CACHE_FIXED_SIZE_KEY is only available 
from 2.4.6
+    // We are using the string directly here to let Phoenix compile with 
earlier versions.
+    // Note that it won't do anything before HBase 2.4.6
+    conf.setIfUnset("hfile.onheap.block.cache.fixed.size",
+            String.valueOf(32 * 1024 * 1024L));
     // don't allow L2 bucket cache for non RS process to avoid unexpected disk 
usage.
     conf.unset(HConstants.BUCKET_CACHE_IOENGINE_KEY);
     region.setBlockCache(BlockCacheFactory.createBlockCache(conf));