ttlgras

Author: Caideyipi

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TTLInfo.java

@@ -71,13 +71,14 @@ public TSStatus setTTL(SetTTLPlan plan) {
       // check ttl rule capacity
       final int tTlRuleCapacity = CommonDescriptor.getInstance().getConfig().getTTlRuleCapacity();
       final int newTTLRuleCount = calculateNewTTLRuleCount(plan);
-      if (newTTLRuleCount > 0 && ttlCache.getTtlCount() + newTTLRuleCount > tTlRuleCapacity) {
+      final int requestedTTLRuleCount = ttlCache.getTtlCount() + newTTLRuleCount;
+      if (newTTLRuleCount > 0 && requestedTTLRuleCount > tTlRuleCapacity) {
         TSStatus errorStatus = new TSStatus(TSStatusCode.OVERSIZE_TTL.getStatusCode());
         errorStatus.setMessage(
             String.format(
-                "The number of TTL rules has reached the limit (%d). Please delete "
-                    + "some existing rules first.",
-                tTlRuleCapacity));
+                "The number of TTL rules has reached the limit "
+                    + "(capacity: %d, requested total: %d). Please delete some existing rules first.",
+                tTlRuleCapacity, requestedTTLRuleCount));
         return errorStatus;
       }
       ttlCache.setTTL(plan.getPathPattern(), plan.getTTL());
@@ -94,17 +95,17 @@ public TSStatus setTTL(SetTTLPlan plan) {
   }
 
   private int calculateNewTTLRuleCount(SetTTLPlan plan) {
-    int newTTLRuleCount = getNewTTLRuleCount(plan.getPathPattern());
+    int newTTLRuleCount = isNewTTLRule(plan.getPathPattern()) ? 1 : 0;
     if (plan.isDataBase()) {
       String[] pathNodes = Arrays.copyOf(plan.getPathPattern(), plan.getPathPattern().length + 1);
       pathNodes[pathNodes.length - 1] = IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD;
-      newTTLRuleCount += getNewTTLRuleCount(pathNodes);
+      newTTLRuleCount += isNewTTLRule(pathNodes) ? 1 : 0;
     }
     return newTTLRuleCount;
   }
 
-  private int getNewTTLRuleCount(String[] pathNodes) {
-    return ttlCache.getLastNodeTTL(pathNodes) == TTLCache.NULL_TTL ? 1 : 0;
+  private boolean isNewTTLRule(String[] pathNodes) {
+    return ttlCache.getLastNodeTTL(pathNodes) == TTLCache.NULL_TTL;
   }
 
   /** Only used for upgrading from database level ttl to device level ttl. */

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/schema/SetTTLProcedure.java

@@ -56,6 +56,7 @@
 
 public class SetTTLProcedure extends StateMachineProcedure<ConfigNodeProcedureEnv, SetTTLState> {
   private static final Logger LOGGER = LoggerFactory.getLogger(SetTTLProcedure.class);
+  // Distinguishes no previous TTL from TTLCache.NULL_TTL, the explicit unset marker for rollback.
   private static final long TTL_NOT_EXIST = Long.MIN_VALUE;
 
   private SetTTLPlan plan;

iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/persistence/TTLInfoTest.java

@@ -244,7 +244,8 @@ public void testTooManyTTL() {
     final TSStatus status = ttlInfo.setTTL(setTTLPlan);
     assertEquals(TSStatusCode.OVERSIZE_TTL.getStatusCode(), status.code);
     assertEquals(
-        "The number of TTL rules has reached the limit (1000). Please delete some existing rules first.",
+        "The number of TTL rules has reached the limit "
+            + "(capacity: 1000, requested total: 1001). Please delete some existing rules first.",
         status.message);
   }