fix conflict

Author: shuwenwei

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionUtils.java

@@ -30,7 +30,6 @@
 import org.apache.iotdb.commons.service.metric.enums.Tag;
 import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
 import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.schemaengine.table.DataNodeTableCache;
 import org.apache.iotdb.db.service.metrics.CompactionMetrics;
 import org.apache.iotdb.db.service.metrics.FileMetrics;
@@ -516,7 +515,7 @@ public static void executeTTLCheckObjectFilesForTableModel(
       return;
     }
     boolean restrictObjectLimit =
-        IoTDBDescriptor.getInstance().getConfig().getRestrictObjectLimit();
+        CommonDescriptor.getInstance().getConfig().isRestrictObjectLimit();
     for (File tableDir : tableDirs) {
       if (!tableDir.isDirectory()) {
         continue;