This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch timep_v2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6166288b3c9dbea7a36b4a3706a7d5756c1b3329 Author: HTHou <[email protected]> AuthorDate: Thu Apr 28 14:32:50 2022 +0800 Move time partition calculation from StorageEngine to StorageEngineV2 --- .../db/mpp/sql/planner/plan/node/write/InsertTabletNode.java | 11 +++++------ .../db/mpp/sql/statement/crud/InsertTabletStatement.java | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java index 0b9c307568..5d739ce684 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/planner/plan/node/write/InsertTabletNode.java @@ -21,7 +21,6 @@ package org.apache.iotdb.db.mpp.sql.planner.plan.node.write; import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.StorageEngineV2; import org.apache.iotdb.db.exception.metadata.DataTypeMismatchException; import org.apache.iotdb.db.exception.metadata.IllegalPathException; @@ -217,9 +216,9 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue { return Collections.emptyList(); } long startTime = - (times[0] / StorageEngine.getTimePartitionInterval()) - * StorageEngine.getTimePartitionInterval(); // included - long endTime = startTime + StorageEngine.getTimePartitionInterval(); // excluded + (times[0] / StorageEngineV2.getTimePartitionInterval()) + * StorageEngineV2.getTimePartitionInterval(); // included + long endTime = startTime + StorageEngineV2.getTimePartitionInterval(); // excluded TTimePartitionSlot timePartitionSlot = StorageEngineV2.getTimePartitionSlot(times[0]); int startLoc = 0; // included @@ -236,8 +235,8 @@ public class InsertTabletNode extends InsertNode implements WALEntryValue { startLoc = i; startTime = endTime; endTime = - (times[i] / StorageEngine.getTimePartitionInterval() + 1) - * StorageEngine.getTimePartitionInterval(); + (times[i] / StorageEngineV2.getTimePartitionInterval() + 1) + * StorageEngineV2.getTimePartitionInterval(); timePartitionSlot = StorageEngineV2.getTimePartitionSlot(times[i]); } } diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java index 612d2f8463..e59ff7715d 100644 --- a/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java +++ b/server/src/main/java/org/apache/iotdb/db/mpp/sql/statement/crud/InsertTabletStatement.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.mpp.sql.statement.crud; import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot; -import org.apache.iotdb.db.engine.StorageEngine; import org.apache.iotdb.db.engine.StorageEngineV2; import org.apache.iotdb.db.mpp.sql.statement.StatementVisitor; import org.apache.iotdb.tsfile.utils.BitMap; @@ -70,17 +69,17 @@ public class InsertTabletStatement extends InsertBaseStatement { public List<TTimePartitionSlot> getTimePartitionSlots() { List<TTimePartitionSlot> result = new ArrayList<>(); long startTime = - (times[0] / StorageEngine.getTimePartitionInterval()) - * StorageEngine.getTimePartitionInterval(); // included - long endTime = startTime + StorageEngine.getTimePartitionInterval(); // excluded + (times[0] / StorageEngineV2.getTimePartitionInterval()) + * StorageEngineV2.getTimePartitionInterval(); // included + long endTime = startTime + StorageEngineV2.getTimePartitionInterval(); // excluded TTimePartitionSlot timePartitionSlot = StorageEngineV2.getTimePartitionSlot(times[0]); for (int i = 1; i < times.length; i++) { // times are sorted in session API. if (times[i] >= endTime) { result.add(timePartitionSlot); // next init endTime = - (times[i] / StorageEngine.getTimePartitionInterval() + 1) - * StorageEngine.getTimePartitionInterval(); + (times[i] / StorageEngineV2.getTimePartitionInterval() + 1) + * StorageEngineV2.getTimePartitionInterval(); timePartitionSlot = StorageEngineV2.getTimePartitionSlot(times[i]); } }
