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

dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 5a9e2523ee478424afbb75cc9033970c80762965
Merge: e9a531e840 37346850c0
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Oct 3 12:04:44 2024 +0000

    Merge branch '3.1'

 .../accumulo/tserver/memory/LargestFirstMemoryManager.java    | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/memory/LargestFirstMemoryManager.java
index 8a6d1b939c,b1c361f9aa..be5f2a4ed4
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/memory/LargestFirstMemoryManager.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/memory/LargestFirstMemoryManager.java
@@@ -133,10 -135,15 +130,9 @@@ public class LargestFirstMemoryManager 
      maxObserved = 0;
    }
  
 -  @SuppressWarnings("deprecation")
 -  protected long getMinCIdleThreshold(KeyExtent extent) {
 -    return context.getTableConfiguration(extent.tableId())
 -        .getTimeInMillis(Property.TABLE_MINC_COMPACT_IDLETIME);
 -  }
 -
    protected long getMaxAge(KeyExtent extent) {
-     TableId tableId = extent.tableId();
-     return mincAgeThresholds.computeIfAbsent(tableId, tid -> 
context.getTableConfiguration(tid)
-         .getTimeInMillis(Property.TABLE_MINC_COMPACT_MAXAGE));
+     return context.getTableConfiguration(extent.tableId())
+         .getTimeInMillis(Property.TABLE_MINC_COMPACT_MAXAGE);
    }
  
    protected boolean tableExists(TableId tableId) {

Reply via email to