Implemented the "restrict_object_limit" for object restriction (apache#16933)

Caideyipi · web-flow · commit 16965de83a0d · 2025-12-22T08:21:41.000+08:00
diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java
@@ -73,6 +73,7 @@ public class IoTDBTableIT {
   @BeforeClass
   public static void setUp() throws Exception {
     EnvFactory.getEnv().getConfig().getCommonConfig().setEnforceStrongPassword(false);
+    EnvFactory.getEnv().getConfig().getCommonConfig().setRestrictObjectLimit(true);
     EnvFactory.getEnv().initClusterEnvironment();
   }
 
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -316,8 +316,6 @@ public class ConfigNodeConfig {
 
   private long forceWalPeriodForConfigNodeSimpleInMs = 100;
 
-  private boolean restrictObjectLimit = false;
-
   public ConfigNodeConfig() {
     // empty constructor
   }
@@ -1277,12 +1275,4 @@ public long getFailureDetectorPhiAcceptablePauseInMs() {
   public void setFailureDetectorPhiAcceptablePauseInMs(long failureDetectorPhiAcceptablePauseInMs) {
     this.failureDetectorPhiAcceptablePauseInMs = failureDetectorPhiAcceptablePauseInMs;
   }
-
-  public boolean getRestrictObjectLimit() {
-    return restrictObjectLimit;
-  }
-
-  public void setRestrictObjectLimit(boolean restrictObjectLimit) {
-    this.restrictObjectLimit = restrictObjectLimit;
-  }
 }
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -368,11 +368,6 @@ private void loadProperties(TrimProperties properties) throws BadNodeUrlExceptio
               readConsistencyLevel));
     }
 
-    conf.setRestrictObjectLimit(
-        Boolean.parseBoolean(
-            properties.getProperty(
-                "restrict_object_limit", String.valueOf(conf.getRestrictObjectLimit()))));
-
     // commons
     commonDescriptor.loadCommonProps(properties);
     commonDescriptor.initCommonConfigDir(conf.getSystemDir());
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
@@ -217,10 +217,13 @@ public static void checkSystemProperties() throws IOException {
     if (systemProperties.getProperty("restrict_object_limit", null) != null) {
       boolean restrictObjectLimit =
           Boolean.parseBoolean(systemProperties.getProperty("restrict_object_limit"));
-      if (restrictObjectLimit != conf.getRestrictObjectLimit()) {
+      if (restrictObjectLimit != COMMON_CONFIG.isRestrictObjectLimit()) {
         LOGGER.warn(
-            format, "restrict_object_limit", conf.getRestrictObjectLimit(), restrictObjectLimit);
-        conf.setRestrictObjectLimit(restrictObjectLimit);
+            format,
+            "restrict_object_limit",
+            COMMON_CONFIG.isRestrictObjectLimit(),
+            restrictObjectLimit);
+        COMMON_CONFIG.setRestrictObjectLimit(restrictObjectLimit);
       }
     }
   }
@@ -297,7 +300,7 @@ public static void storeSystemParameters() throws IOException {
     systemProperties.setProperty(
         "enable_grant_option", String.valueOf(COMMON_CONFIG.getEnableGrantOption()));
     systemProperties.setProperty(
-        "restrict_object_limit", String.valueOf(conf.getRestrictObjectLimit()));
+        "restrict_object_limit", String.valueOf(COMMON_CONFIG.isRestrictObjectLimit()));
     systemPropertiesHandler.overwrite(systemProperties);
   }
 
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
@@ -179,7 +179,7 @@ private void setGlobalConfig(ConfigurationResp dataSet) {
     globalConfig.setSchemaEngineMode(commonConfig.getSchemaEngineMode());
     globalConfig.setTagAttributeTotalSize(commonConfig.getTagAttributeTotalSize());
     globalConfig.setEnableGrantOption(commonConfig.getEnableGrantOption());
-    globalConfig.setRestrictObjectLimit(configNodeConfig.getRestrictObjectLimit());
+    globalConfig.setRestrictObjectLimit(commonConfig.isRestrictObjectLimit());
     dataSet.setGlobalConfig(globalConfig);
   }
 
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -1209,8 +1209,6 @@ public class IoTDBConfig {
 
   private long maxObjectSizeInByte = 4 * 1024 * 1024 * 1024L;
 
-  private boolean restrictObjectLimit = false;
-
   IoTDBConfig() {}
 
   public int getMaxLogEntriesNumPerBatch() {
@@ -4338,12 +4336,4 @@ public long getMaxObjectSizeInByte() {
   public void setMaxObjectSizeInByte(long maxObjectSizeInByte) {
     this.maxObjectSizeInByte = maxObjectSizeInByte;
   }
-
-  public boolean getRestrictObjectLimit() {
-    return restrictObjectLimit;
-  }
-
-  public void setRestrictObjectLimit(boolean restrictObjectLimit) {
-    this.restrictObjectLimit = restrictObjectLimit;
-  }
 }
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -2752,7 +2752,6 @@ public void loadGlobalConfig(TGlobalConfig globalConfig) {
     conf.setSeriesPartitionExecutorClass(globalConfig.getSeriesPartitionExecutorClass());
     conf.setSeriesPartitionSlotNum(globalConfig.getSeriesPartitionSlotNum());
     conf.setReadConsistencyLevel(globalConfig.getReadConsistencyLevel());
-    conf.setRestrictObjectLimit(globalConfig.isRestrictObjectLimit());
   }
 
   public void loadRatisConfig(TRatisConfig ratisConfig) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java
@@ -19,6 +19,7 @@
 
 package org.apache.iotdb.db.queryengine.plan.relational.metadata.fetcher;
 
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.exception.IoTDBRuntimeException;
 import org.apache.iotdb.commons.schema.table.TsTable;
 import org.apache.iotdb.db.exception.sql.SemanticException;
@@ -251,6 +252,9 @@ private void autoCreateOrUpdateDeviceSchema(
   }
 
   public static void checkObject4DeviceId(final Object[] deviceId) {
+    if (!CommonDescriptor.getInstance().getConfig().isRestrictObjectLimit()) {
+      return;
+    }
     for (final Object part : deviceId) {
       final String value = (String) part;
       if (Objects.nonNull(value) && TsTable.isInvalid4ObjectType(value)) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IObjectPath.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IObjectPath.java
@@ -19,8 +19,8 @@
 
 package org.apache.iotdb.db.storageengine.dataregion;
 
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 
 import org.apache.tsfile.file.metadata.IDeviceID;
 
@@ -31,7 +31,7 @@
 
 public interface IObjectPath {
 
-  IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+  CommonConfig CONFIG = CommonDescriptor.getInstance().getConfig();
 
   int serialize(ByteBuffer byteBuffer);
 
@@ -48,7 +48,7 @@ interface Factory {
     IObjectPath create(int regionId, long time, IDeviceID iDeviceID, String measurement);
 
     Factory FACTORY =
-        CONFIG.getRestrictObjectLimit()
+        CONFIG.isRestrictObjectLimit()
             ? PlainObjectPath.getFACTORY()
             : Base32ObjectPath.getFACTORY();
   }
@@ -63,7 +63,7 @@ interface Deserializer {
   }
 
   static Deserializer getDeserializer() {
-    return CONFIG.getRestrictObjectLimit()
+    return CONFIG.isRestrictObjectLimit()
         ? PlainObjectPath.getDESERIALIZER()
         : Base32ObjectPath.getDESERIALIZER();
   }
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/function/RecordObjectTypeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/function/RecordObjectTypeTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.iotdb.db.queryengine.plan.function;
 
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
 import org.apache.iotdb.db.queryengine.execution.operator.process.function.partition.Slice;
 import org.apache.iotdb.db.queryengine.execution.operator.source.relational.aggregation.RecordIterator;
@@ -56,7 +56,7 @@
 
 public class RecordObjectTypeTest {
 
-  private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+  private final CommonConfig config = CommonDescriptor.getInstance().getConfig();
 
   private File objectDir;
 
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectTypeFunctionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/transformation/dag/column/unary/scalar/ObjectTypeFunctionTest.java
@@ -19,8 +19,8 @@
 
 package org.apache.iotdb.db.queryengine.transformation.dag.column.unary.scalar;
 
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
 import org.apache.iotdb.db.queryengine.transformation.dag.column.ColumnTransformer;
 import org.apache.iotdb.db.storageengine.rescon.disk.TierManager;
@@ -50,7 +50,7 @@
 
 public class ObjectTypeFunctionTest {
 
-  private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+  private final CommonConfig config = CommonDescriptor.getInstance().getConfig();
 
   private File objectDir;
 
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/object/ObjectTypeCompactionTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/object/ObjectTypeCompactionTest.java
@@ -19,13 +19,13 @@
 
 package org.apache.iotdb.db.storageengine.dataregion.compaction.object;
 
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
 import org.apache.iotdb.commons.exception.MetadataException;
 import org.apache.iotdb.commons.schema.table.TsTable;
 import org.apache.iotdb.commons.schema.table.column.FieldColumnSchema;
 import org.apache.iotdb.commons.schema.table.column.TagColumnSchema;
 import org.apache.iotdb.commons.utils.FileUtils;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
 import org.apache.iotdb.db.exception.StorageEngineException;
 import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
@@ -85,7 +85,7 @@ public class ObjectTypeCompactionTest extends AbstractCompactionTest {
   private File objectDir;
   private File regionDir;
 
-  private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+  private final CommonConfig config = CommonDescriptor.getInstance().getConfig();
 
   @Before
   @Override
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -473,6 +473,7 @@ public class CommonConfig {
 
   private String auditableOperationResult = "SUCCESS, FAIL";
   private int pathLogMaxSize = 100;
+  private boolean restrictObjectLimit = false;
 
   CommonConfig() {
     // Empty constructor
@@ -2728,4 +2729,12 @@ public String getAuditableOperationResult() {
   public void setAuditableOperationResult(String auditableOperationResult) {
     this.auditableOperationResult = auditableOperationResult;
   }
+
+  public boolean isRestrictObjectLimit() {
+    return restrictObjectLimit;
+  }
+
+  public void setRestrictObjectLimit(boolean restrictObjectLimit) {
+    this.restrictObjectLimit = restrictObjectLimit;
+  }
 }
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
@@ -281,6 +281,11 @@ public void loadCommonProps(TrimProperties properties) throws IOException {
             properties.getProperty(
                 "path_log_max_size", String.valueOf(config.getPathLogMaxSize()))));
 
+    config.setRestrictObjectLimit(
+        Boolean.parseBoolean(
+            properties.getProperty(
+                "restrict_object_limit", String.valueOf(config.isRestrictObjectLimit()))));
+
     loadRetryProperties(properties);
     loadBinaryAllocatorProps(properties);
   }
@@ -479,6 +484,7 @@ public void loadGlobalConfig(TGlobalConfig globalConfig) {
     config.setTagAttributeTotalSize(globalConfig.tagAttributeTotalSize);
     config.setDiskSpaceWarningThreshold(globalConfig.getDiskSpaceWarningThreshold());
     config.setEnableGrantOption(globalConfig.isEnableGrantOption());
+    config.setRestrictObjectLimit(globalConfig.isRestrictObjectLimit());
   }
 
   public void loadAuditConfig(TAuditConfig auditConfig) {
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
@@ -415,6 +415,9 @@ public void setProps(Map<String, String> props) {
   }
 
   public void checkTableNameAndObjectNames4Object() throws MetadataException {
+    if (!CommonDescriptor.getInstance().getConfig().isRestrictObjectLimit()) {
+      return;
+    }
     if (isInvalid4ObjectType(tableName)) {
       throw new MetadataException(
           getObjectStringError("tableName", tableName),

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ public class IoTDBTableIT {`
`73`	`73`	`@BeforeClass`
`74`	`74`	`public static void setUp() throws Exception {`
`75`	`75`	`EnvFactory.getEnv().getConfig().getCommonConfig().setEnforceStrongPassword(false);`
	`76`	`+ EnvFactory.getEnv().getConfig().getCommonConfig().setRestrictObjectLimit(true);`
`76`	`77`	`EnvFactory.getEnv().initClusterEnvironment();`
`77`	`78`	`}`
`78`	`79`
Original file line number	Diff line number	Diff line change
`@@ -316,8 +316,6 @@ public class ConfigNodeConfig {`
`316`	`316`
`317`	`317`	`private long forceWalPeriodForConfigNodeSimpleInMs = 100;`
`318`	`318`
`319`		`- private boolean restrictObjectLimit = false;`
`320`		`-`
`321`	`319`	`public ConfigNodeConfig() {`
`322`	`320`	`// empty constructor`
`323`	`321`	`}`
`@@ -1277,12 +1275,4 @@ public long getFailureDetectorPhiAcceptablePauseInMs() {`
`1277`	`1275`	`public void setFailureDetectorPhiAcceptablePauseInMs(long failureDetectorPhiAcceptablePauseInMs) {`
`1278`	`1276`	`this.failureDetectorPhiAcceptablePauseInMs = failureDetectorPhiAcceptablePauseInMs;`
`1279`	`1277`	`}`
`1280`		`-`
`1281`		`- public boolean getRestrictObjectLimit() {`
`1282`		`- return restrictObjectLimit;`
`1283`		`- }`
`1284`		`-`
`1285`		`- public void setRestrictObjectLimit(boolean restrictObjectLimit) {`
`1286`		`- this.restrictObjectLimit = restrictObjectLimit;`
`1287`		`- }`
`1288`	`1278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,10 +217,13 @@ public static void checkSystemProperties() throws IOException {`
`217`	`217`	`if (systemProperties.getProperty("restrict_object_limit", null) != null) {`
`218`	`218`	`boolean restrictObjectLimit =`
`219`	`219`	`Boolean.parseBoolean(systemProperties.getProperty("restrict_object_limit"));`
`220`		`- if (restrictObjectLimit != conf.getRestrictObjectLimit()) {`
	`220`	`+ if (restrictObjectLimit != COMMON_CONFIG.isRestrictObjectLimit()) {`
`221`	`221`	`LOGGER.warn(`
`222`		`- format, "restrict_object_limit", conf.getRestrictObjectLimit(), restrictObjectLimit);`
`223`		`- conf.setRestrictObjectLimit(restrictObjectLimit);`
	`222`	`+ format,`
	`223`	`+ "restrict_object_limit",`
	`224`	`+ COMMON_CONFIG.isRestrictObjectLimit(),`
	`225`	`+ restrictObjectLimit);`
	`226`	`+ COMMON_CONFIG.setRestrictObjectLimit(restrictObjectLimit);`
`224`	`227`	`}`
`225`	`228`	`}`
`226`	`229`	`}`
`@@ -297,7 +300,7 @@ public static void storeSystemParameters() throws IOException {`
`297`	`300`	`systemProperties.setProperty(`
`298`	`301`	`"enable_grant_option", String.valueOf(COMMON_CONFIG.getEnableGrantOption()));`
`299`	`302`	`systemProperties.setProperty(`
`300`		`- "restrict_object_limit", String.valueOf(conf.getRestrictObjectLimit()));`
	`303`	`+ "restrict_object_limit", String.valueOf(COMMON_CONFIG.isRestrictObjectLimit()));`
`301`	`304`	`systemPropertiesHandler.overwrite(systemProperties);`
`302`	`305`	`}`
`303`	`306`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ private void setGlobalConfig(ConfigurationResp dataSet) {`
`179`	`179`	`globalConfig.setSchemaEngineMode(commonConfig.getSchemaEngineMode());`
`180`	`180`	`globalConfig.setTagAttributeTotalSize(commonConfig.getTagAttributeTotalSize());`
`181`	`181`	`globalConfig.setEnableGrantOption(commonConfig.getEnableGrantOption());`
`182`		`- globalConfig.setRestrictObjectLimit(configNodeConfig.getRestrictObjectLimit());`
	`182`	`+ globalConfig.setRestrictObjectLimit(commonConfig.isRestrictObjectLimit());`
`183`	`183`	`dataSet.setGlobalConfig(globalConfig);`
`184`	`184`	`}`
`185`	`185`
Original file line number	Diff line number	Diff line change
`@@ -2752,7 +2752,6 @@ public void loadGlobalConfig(TGlobalConfig globalConfig) {`
`2752`	`2752`	`conf.setSeriesPartitionExecutorClass(globalConfig.getSeriesPartitionExecutorClass());`
`2753`	`2753`	`conf.setSeriesPartitionSlotNum(globalConfig.getSeriesPartitionSlotNum());`
`2754`	`2754`	`conf.setReadConsistencyLevel(globalConfig.getReadConsistencyLevel());`
`2755`		`- conf.setRestrictObjectLimit(globalConfig.isRestrictObjectLimit());`
`2756`	`2755`	`}`
`2757`	`2756`
`2758`	`2757`	`public void loadRatisConfig(TRatisConfig ratisConfig) {`