Fix database-level time partition precision for writes

Convert database time partition config from milliseconds to the current
timestamp precision before caching it, and avoid double conversion during
partition table cleanup.

Also resolve tree-model write splitting with null session database by deriving
the database from the fetched data partition, so slot calculation and region
lookup stay consistent.

Author: zerolbsony

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java

@@ -32,6 +32,7 @@
 import org.apache.iotdb.db.exception.DataTypeInconsistentException;
 import org.apache.iotdb.db.i18n.DataNodeQueryMessages;
 import org.apache.iotdb.db.pipe.resource.memory.InsertNodeMemoryEstimator;
+import org.apache.iotdb.db.queryengine.plan.analyze.IAnalysis;
 import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDevicePathCache;
 import org.apache.iotdb.db.storageengine.dataregion.memtable.AbstractMemTable;
 import org.apache.iotdb.db.storageengine.dataregion.memtable.DeviceIDFactory;
@@ -228,6 +229,13 @@ public IDeviceID getDeviceID() {
     return deviceID;
   }
 
+  protected String getDatabaseName(final IAnalysis analysis, final IDeviceID deviceID) {
+    final String databaseName = analysis.getDatabaseName();
+    return databaseName != null
+        ? databaseName
+        : analysis.getDataPartitionInfo().getDatabaseNameByDevice(deviceID);
+  }
+
   public void setDeviceID(IDeviceID deviceID) {
     this.deviceID = deviceID;
   }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowNode.java

@@ -43,6 +43,7 @@
 
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.exception.NotImplementedException;
+import org.apache.tsfile.file.metadata.IDeviceID;
 import org.apache.tsfile.read.TimeValuePair;
 import org.apache.tsfile.utils.Binary;
 import org.apache.tsfile.utils.ReadWriteIOUtils;
@@ -127,13 +128,14 @@ public InsertRowNode(
 
   @Override
   public List<WritePlanNode> splitByPartition(IAnalysis analysis) {
+    final IDeviceID deviceID = getDeviceID();
+    final String databaseName = getDatabaseName(analysis, deviceID);
     TTimePartitionSlot timePartitionSlot =
-        TimePartitionUtils.getTimePartitionSlot(time, analysis.getDatabaseName());
+        TimePartitionUtils.getTimePartitionSlot(time, databaseName);
     this.dataRegionReplicaSet =
         analysis
             .getDataPartitionInfo()
-            .getDataRegionReplicaSetForWriting(
-                getDeviceID(), timePartitionSlot, analysis.getDatabaseName());
+            .getDataRegionReplicaSetForWriting(deviceID, timePartitionSlot, databaseName);
     // collect redirectInfo
     analysis.setRedirectNodeList(
         Collections.singletonList(

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsNode.java

@@ -39,6 +39,7 @@
 import org.apache.iotdb.db.storageengine.dataregion.wal.buffer.WALEntryValue;
 
 import org.apache.tsfile.exception.NotImplementedException;
+import org.apache.tsfile.file.metadata.IDeviceID;
 import org.apache.tsfile.utils.ReadWriteIOUtils;
 
 import java.io.DataInputStream;
@@ -273,15 +274,16 @@ public List<WritePlanNode> splitByPartition(IAnalysis analysis) {
     for (int i = 0; i < insertRowNodeList.size(); i++) {
       InsertRowNode insertRowNode = insertRowNodeList.get(i);
       // Data region for insert row node
-      // each row may belong to different database, pass null for auto-detection
+      // Each row may belong to different database.
+      final IDeviceID deviceID = insertRowNode.targetPath.getIDeviceIDAsFullDevice();
+      final String databaseName = getDatabaseName(analysis, deviceID);
       TRegionReplicaSet dataRegionReplicaSet =
           analysis
               .getDataPartitionInfo()
               .getDataRegionReplicaSetForWriting(
-                  insertRowNode.targetPath.getIDeviceIDAsFullDevice(),
-                  TimePartitionUtils.getTimePartitionSlot(
-                      insertRowNode.getTime(), analysis.getDatabaseName()),
-                  null);
+                  deviceID,
+                  TimePartitionUtils.getTimePartitionSlot(insertRowNode.getTime(), databaseName),
+                  databaseName);
       // Collect redirectInfo
       redirectInfo.add(dataRegionReplicaSet.getDataNodeLocations().get(0).getClientRpcEndPoint());
       InsertRowsNode tmpNode = splitMap.get(dataRegionReplicaSet);

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertRowsOfOneDeviceNode.java

@@ -40,6 +40,7 @@
 
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.exception.NotImplementedException;
+import org.apache.tsfile.file.metadata.IDeviceID;
 import org.apache.tsfile.utils.ReadWriteIOUtils;
 
 import java.io.DataOutputStream;
@@ -167,19 +168,17 @@ public List<WritePlanNode> splitByPartition(IAnalysis analysis) {
     Map<TRegionReplicaSet, Map<TTimePartitionSlot, List<InsertRowNode>>> splitMap = new HashMap<>();
     Map<TRegionReplicaSet, Map<TTimePartitionSlot, List<Integer>>> splitMapForIndex =
         new HashMap<>();
+    final IDeviceID deviceID = targetPath.getIDeviceIDAsFullDevice();
+    final String databaseName = getDatabaseName(analysis, deviceID);
 
     for (int i = 0; i < insertRowNodeList.size(); i++) {
       InsertRowNode insertRowNode = insertRowNodeList.get(i);
       TTimePartitionSlot timePartitionSlot =
-          TimePartitionUtils.getTimePartitionSlot(
-              insertRowNode.getTime(), analysis.getDatabaseName());
+          TimePartitionUtils.getTimePartitionSlot(insertRowNode.getTime(), databaseName);
       TRegionReplicaSet dataRegionReplicaSet =
           analysis
               .getDataPartitionInfo()
-              .getDataRegionReplicaSetForWriting(
-                  targetPath.getIDeviceIDAsFullDevice(),
-                  timePartitionSlot,
-                  analysis.getDatabaseName());
+              .getDataRegionReplicaSetForWriting(deviceID, timePartitionSlot, databaseName);
       Map<TTimePartitionSlot, List<InsertRowNode>> tmpMap =
           splitMap.computeIfAbsent(dataRegionReplicaSet, k -> new HashMap<>());
       Map<TTimePartitionSlot, List<Integer>> tmpIndexMap =

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java

@@ -237,10 +237,11 @@ public List<WritePlanNode> splitByPartition(IAnalysis analysis) {
       return Collections.emptyList();
     }
 
+    final String databaseName = getDatabaseName(analysis, getDeviceID(0));
     final Map<IDeviceID, PartitionSplitInfo> deviceIDSplitInfoMap =
-        collectSplitRanges(analysis.getDatabaseName());
+        collectSplitRanges(databaseName);
     final Map<TRegionReplicaSet, List<Integer>> splitMap =
-        splitByReplicaSet(deviceIDSplitInfoMap, analysis);
+        splitByReplicaSet(deviceIDSplitInfoMap, analysis, databaseName);
     return doSplit(splitMap);
   }
 
@@ -284,7 +285,9 @@ private Map<IDeviceID, PartitionSplitInfo> collectSplitRanges(String database) {
   }
 
   protected Map<TRegionReplicaSet, List<Integer>> splitByReplicaSet(
-      Map<IDeviceID, PartitionSplitInfo> deviceIDSplitInfoMap, IAnalysis analysis) {
+      Map<IDeviceID, PartitionSplitInfo> deviceIDSplitInfoMap,
+      IAnalysis analysis,
+      String databaseName) {
     Map<TRegionReplicaSet, List<Integer>> splitMap = new HashMap<>();
 
     for (Entry<IDeviceID, PartitionSplitInfo> entry : deviceIDSplitInfoMap.entrySet()) {
@@ -294,7 +297,7 @@ protected Map<TRegionReplicaSet, List<Integer>> splitByReplicaSet(
           analysis
               .getDataPartitionInfo()
               .getDataRegionReplicaSetForWriting(
-                  deviceID, splitInfo.timePartitionSlots, analysis.getDatabaseName());
+                  deviceID, splitInfo.timePartitionSlots, databaseName);
       splitInfo.replicaSets = replicaSets;
       // collect redirectInfo
       analysis.addEndPointToRedirectNodeList(

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/RelationalInsertTabletNode.java

@@ -201,7 +201,9 @@ protected InsertTabletNode getEmptySplit(int count) {
   }
 
   protected Map<TRegionReplicaSet, List<Integer>> splitByReplicaSet(
-      final Map<IDeviceID, PartitionSplitInfo> deviceIDSplitInfoMap, final IAnalysis analysis) {
+      final Map<IDeviceID, PartitionSplitInfo> deviceIDSplitInfoMap,
+      final IAnalysis analysis,
+      final String databaseName) {
     final Map<TRegionReplicaSet, List<Integer>> splitMap = new HashMap<>();
     final Map<IDeviceID, TEndPoint> endPointMap = new HashMap<>();
 
@@ -212,7 +214,7 @@ protected Map<TRegionReplicaSet, List<Integer>> splitByReplicaSet(
           analysis
               .getDataPartitionInfo()
               .getDataRegionReplicaSetForWriting(
-                  deviceID, splitInfo.timePartitionSlots, analysis.getDatabaseName());
+                  deviceID, splitInfo.timePartitionSlots, databaseName);
       splitInfo.replicaSets = replicaSets;
       // collect redirectInfo
       endPointMap.put(

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/partition/SeriesPartitionTable.java

@@ -22,8 +22,6 @@
 import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
 import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
 import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
-import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
 import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils;
 import org.apache.iotdb.commons.utils.TimePartitionUtils;
 import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
@@ -255,10 +253,7 @@ public TConsensusGroupId getLastConsensusGroupId() {
    */
   public List<TTimePartitionSlot> autoCleanPartitionTable(
       long TTL, TTimePartitionSlot currentTimeSlot, String database) {
-    final long timePartitionInterval =
-        CommonDateTimeUtils.convertMilliTimeWithPrecision(
-            TimePartitionUtils.getTimePartitionInterval(database),
-            CommonDescriptor.getInstance().getConfig().getTimestampPrecision());
+    final long timePartitionInterval = TimePartitionUtils.getTimePartitionInterval(database);
     List<TTimePartitionSlot> removedTimePartitions = new ArrayList<>();
     Iterator<Map.Entry<TTimePartitionSlot, List<TConsensusGroupId>>> iterator =
         seriesPartitionMap.entrySet().iterator();

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/utils/TimePartitionUtils.java

@@ -161,12 +161,17 @@ public BigInteger getBigTimePartitionInterval() {
 
   // Update or add database-specific time partition configuration
   public static void updateDatabaseTimePartitionConfig(String database, TDatabaseSchema schema) {
+    String timestampPrecision = CommonDescriptor.getInstance().getConfig().getTimestampPrecision();
     long interval =
         schema.isSetTimePartitionInterval()
-            ? schema.getTimePartitionInterval()
-            : timePartitionInterval;
+            ? CommonDateTimeUtils.convertMilliTimeWithPrecision(
+                schema.getTimePartitionInterval(), timestampPrecision)
+            : CommonDescriptor.getInstance().getConfig().getTimePartitionInterval();
     long origin =
-        schema.isSetTimePartitionOrigin() ? schema.getTimePartitionOrigin() : timePartitionOrigin;
+        schema.isSetTimePartitionOrigin()
+            ? CommonDateTimeUtils.convertMilliTimeWithPrecision(
+                schema.getTimePartitionOrigin(), timestampPrecision)
+            : CommonDescriptor.getInstance().getConfig().getTimePartitionOrigin();
     databaseConfigCache.put(database, new DatabaseTimePartitionConfig(origin, interval));
   }
 

iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/utils/TimePartitionUtilsTest.java

@@ -36,6 +36,7 @@ public class TimePartitionUtilsTest {
 
   @Before
   public void setUp() {
+    CommonDescriptor.getInstance().getConfig().setTimestampPrecision("ms");
     CommonDescriptor.getInstance().getConfig().setTimePartitionOrigin(TEST_TIME_PARTITION_ORIGIN);
     CommonDescriptor.getInstance()
         .getConfig()
@@ -139,6 +140,23 @@ public void testDatabaseLevelTimePartition() {
     assertEquals(expectedSlot.getStartTime(), actualSlot.getStartTime());
   }
 
+  @Test
+  public void testDatabaseLevelTimePartitionUsesTimestampPrecision() {
+    CommonDescriptor.getInstance().getConfig().setTimestampPrecision("ns");
+    TDatabaseSchema schema = new TDatabaseSchema();
+    schema.setName("test.db");
+    schema.setTimePartitionInterval(7200000L);
+    schema.setTimePartitionOrigin(2000L);
+
+    TimePartitionUtils.updateDatabaseTimePartitionConfig("test.db", schema);
+
+    assertEquals(7200000_000_000L, TimePartitionUtils.getTimePartitionInterval("test.db"));
+    assertEquals(2000_000_000L, TimePartitionUtils.getTimePartitionOrigin("test.db"));
+    assertEquals(
+        2000_000_000L,
+        TimePartitionUtils.getTimePartitionSlot(2000_000_000L + 1, "test.db").getStartTime());
+  }
+
   @Test
   public void testDatabaseLevelTimePartitionFallbackToGlobal() {
     // Test with database that doesn't have custom settings