(accumulo) branch 3.1 updated: Removed cached configuration times (#4936)

[dlmarion]

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

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


The following commit(s) were added to refs/heads/3.1 by this push:
     new 37346850c0 Removed cached configuration times (#4936)
37346850c0 is described below

commit 37346850c05ebab07647e90412b6959c14554f7e
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Oct 3 07:45:38 2024 -0400

    Removed cached configuration times (#4936)
    
    Removed maps in LargestFirstMemoryManager that cached time duration
    property values by table id. #4890 implemented caching for calls
    to AccumuloConfiguration.getTimeInMillis, so this higher level
    caching can be removed.
    
    Closes #4860
---
 .../tserver/memory/LargestFirstMemoryManager.java        | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git 
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
index 42623f7027..b1c361f9aa 100644
--- 
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
@@ -19,7 +19,6 @@
 package org.apache.accumulo.tserver.memory;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.TreeMap;
@@ -56,8 +55,6 @@ public class LargestFirstMemoryManager {
   // The fraction of memory that needs to be used before we begin flushing.
   private double compactionThreshold;
   private long maxObserved;
-  private final HashMap<TableId,Long> mincIdleThresholds = new HashMap<>();
-  private final HashMap<TableId,Long> mincAgeThresholds = new HashMap<>();
   private ServerContext context = null;
 
   private static class TabletInfo {
@@ -140,15 +137,13 @@ public class LargestFirstMemoryManager {
 
   @SuppressWarnings("deprecation")
   protected long getMinCIdleThreshold(KeyExtent extent) {
-    TableId tableId = extent.tableId();
-    return mincIdleThresholds.computeIfAbsent(tableId, tid -> 
context.getTableConfiguration(tid)
-        .getTimeInMillis(Property.TABLE_MINC_COMPACT_IDLETIME));
+    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) {
@@ -168,9 +163,6 @@ public class LargestFirstMemoryManager {
 
     final int maxMinCs = maxConcurrentMincs * numWaitingMultiplier;
 
-    mincIdleThresholds.clear();
-    mincAgeThresholds.clear();
-
     final List<KeyExtent> tabletsToMinorCompact = new ArrayList<>();
 
     LargestMap largestMemTablets = new LargestMap(maxMinCs);