Skip to content

Commit d44d2bb

Browse files
JackieTien97HTHou
authored andcommitted
[To dev/1.3] Fix auto cleaning partition table bug
1 parent 4e62af2 commit d44d2bb

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@
2222
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
2323
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
2424
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
25+
import org.apache.iotdb.commons.conf.CommonDescriptor;
26+
import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
2527
import org.apache.iotdb.commons.utils.ThriftCommonsSerDeUtils;
28+
import org.apache.iotdb.commons.utils.TimePartitionUtils;
2629
import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
2730

2831
import org.apache.thrift.TException;
2932
import org.apache.thrift.protocol.TProtocol;
3033
import org.apache.tsfile.utils.ReadWriteIOUtils;
31-
import org.slf4j.Logger;
32-
import org.slf4j.LoggerFactory;
3334

3435
import java.io.IOException;
3536
import java.io.InputStream;
@@ -49,7 +50,12 @@
4950

5051
public class SeriesPartitionTable {
5152

52-
private static final Logger LOGGER = LoggerFactory.getLogger(SeriesPartitionTable.class);
53+
// should only be used in CN scope, in DN scope should directly use
54+
// TimePartitionUtils.getTimePartitionInterval()
55+
private static final long TIME_PARTITION_INTERVAL =
56+
CommonDateTimeUtils.convertMilliTimeWithPrecision(
57+
TimePartitionUtils.getTimePartitionInterval(),
58+
CommonDescriptor.getInstance().getConfig().getTimestampPrecision());
5359

5460
private final ConcurrentSkipListMap<TTimePartitionSlot, List<TConsensusGroupId>>
5561
seriesPartitionMap;
@@ -255,7 +261,8 @@ public List<TTimePartitionSlot> autoCleanPartitionTable(
255261
while (iterator.hasNext()) {
256262
Map.Entry<TTimePartitionSlot, List<TConsensusGroupId>> entry = iterator.next();
257263
TTimePartitionSlot timePartitionSlot = entry.getKey();
258-
if (timePartitionSlot.getStartTime() + TTL < currentTimeSlot.getStartTime()) {
264+
if (timePartitionSlot.getStartTime() + TIME_PARTITION_INTERVAL + TTL
265+
<= currentTimeSlot.getStartTime()) {
259266
removedTimePartitions.add(timePartitionSlot);
260267
iterator.remove();
261268
}

0 commit comments

Comments
 (0)