This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 5ae37285acf [To/dev 1.3]Get correct TTL in tree model (#15256) (#15298)
5ae37285acf is described below
commit 5ae37285acf2ddfe070d0fc2e9484cb02afc46f4
Author: Yongzao <[email protected]>
AuthorDate: Wed Apr 9 09:58:18 2025 +0800
[To/dev 1.3]Get correct TTL in tree model (#15256) (#15298)
* Get correct TTL in tree model (#15256)
* Finish
* remove debug log
* Update IoTDBPartitionTableAutoCleanIT.java
* Update IoTDBPartitionTableAutoCleanIT.java
* Update IoTDBPartitionTableAutoCleanIT.java
---------
Co-authored-by: Potato <[email protected]>
* Update IoTDBPartitionTableAutoCleanIT.java
* spotless
---------
Co-authored-by: Potato <[email protected]>
Co-authored-by: chenrongzhao.yzd <[email protected]>
---
.../partition/IoTDBPartitionTableAutoCleanIT.java | 67 +++++++++++-----------
.../apache/iotdb/commons/schema/ttl/TTLCache.java | 23 +++++++-
2 files changed, 54 insertions(+), 36 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionTableAutoCleanIT.java
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionTableAutoCleanIT.java
index 6cad5508316..c62739cdc13 100644
---
a/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionTableAutoCleanIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionTableAutoCleanIT.java
@@ -45,6 +45,8 @@ import java.util.concurrent.TimeUnit;
@Category({ClusterIT.class})
public class IoTDBPartitionTableAutoCleanIT {
+ private static final String TREE_DATABASE_PREFIX = "root.db.g_";
+
private static final int TEST_REPLICATION_FACTOR = 1;
private static final long TEST_TIME_PARTITION_INTERVAL = 604800000;
private static final long TEST_TTL_CHECK_INTERVAL = 5_000;
@@ -73,46 +75,41 @@ public class IoTDBPartitionTableAutoCleanIT {
}
@Test
- public void testAutoCleanPartitionTable() throws Exception {
+ public void testAutoCleanPartitionTableForTreeModel() throws Exception {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
- // Create db1
- statement.execute("CREATE DATABASE root.db1");
- statement.execute("CREATE TIMESERIES root.db1.s WITH
DATATYPE=INT64,ENCODING=PLAIN");
- // Insert expired data
- statement.execute(
- String.format(
- "INSERT INTO root.db1(timestamp, s) VALUES (%d, %d)",
- TEST_CURRENT_TIME_SLOT.getStartTime() - TEST_TTL * 2, -1));
- // Insert existed data
- statement.execute(
- String.format(
- "INSERT INTO root.db1(timestamp, s) VALUES (%d, %d)",
- TEST_CURRENT_TIME_SLOT.getStartTime(), 1));
- // Let db.TTL > device.TTL, the valid TTL should be the bigger one
- statement.execute("SET TTL TO root.db1 " + TEST_TTL);
- statement.execute("SET TTL TO root.db1.s " + 10);
- // Create db2
- statement.execute("CREATE DATABASE root.db2");
- statement.execute("CREATE TIMESERIES root.db2.s WITH
DATATYPE=INT64,ENCODING=PLAIN");
- // Insert expired data
- statement.execute(
- String.format(
- "INSERT INTO root.db2(timestamp, s) VALUES (%d, %d)",
- TEST_CURRENT_TIME_SLOT.getStartTime() - TEST_TTL * 2, -1));
- // Insert existed data
- statement.execute(
- String.format(
- "INSERT INTO root.db2(timestamp, s) VALUES (%d, %d)",
- TEST_CURRENT_TIME_SLOT.getStartTime(), 1));
- // Let db.TTL < device.TTL, the valid TTL should be the bigger one
- statement.execute("SET TTL TO root.db2 " + 10);
- statement.execute("SET TTL TO root.db2.s " + TEST_TTL);
+ // Create databases and insert test data
+ for (int i = 0; i < 3; i++) {
+ String databaseName = String.format("%s%d", TREE_DATABASE_PREFIX, i);
+ statement.execute(String.format("CREATE DATABASE %s", databaseName));
+ statement.execute(
+ String.format(
+ "CREATE TIMESERIES %s.s WITH DATATYPE=INT64,ENCODING=PLAIN",
databaseName));
+ // Insert expired data
+ statement.execute(
+ String.format(
+ "INSERT INTO %s(timestamp, s) VALUES (%d, %d)",
+ databaseName, TEST_CURRENT_TIME_SLOT.getStartTime() - TEST_TTL
* 2, -1));
+ // Insert existed data
+ statement.execute(
+ String.format(
+ "INSERT INTO %s(timestamp, s) VALUES (%d, %d)",
+ databaseName, TEST_CURRENT_TIME_SLOT.getStartTime(), 1));
+ }
+ // Let db0.TTL > device.TTL, the valid TTL should be the bigger one
+ statement.execute(String.format("SET TTL TO %s0 %d",
TREE_DATABASE_PREFIX, TEST_TTL));
+ statement.execute(String.format("SET TTL TO %s0.s %d",
TREE_DATABASE_PREFIX, 10));
+ // Let db1.TTL < device.TTL, the valid TTL should be the bigger one
+ statement.execute(String.format("SET TTL TO %s1 %d",
TREE_DATABASE_PREFIX, 10));
+ statement.execute(String.format("SET TTL TO %s1.s %d",
TREE_DATABASE_PREFIX, TEST_TTL));
+ // Set TTL to path db2.**
+ statement.execute(String.format("SET TTL TO %s2.** %d",
TREE_DATABASE_PREFIX, TEST_TTL));
}
TDataPartitionReq req = new TDataPartitionReq();
- req.putToPartitionSlotsMap("root.db1", new TreeMap<>());
- req.putToPartitionSlotsMap("root.db2", new TreeMap<>());
+ for (int i = 0; i < 3; i++) {
+ req.putToPartitionSlotsMap(String.format("%s%d", TREE_DATABASE_PREFIX,
i), new TreeMap<>());
+ }
try (SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient)
EnvFactory.getEnv().getLeaderConfigNodeConnection()) {
for (int retry = 0; retry < 120; retry++) {
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/ttl/TTLCache.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/ttl/TTLCache.java
index f7305074a95..de9ef054a64 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/ttl/TTLCache.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/ttl/TTLCache.java
@@ -178,7 +178,7 @@ public class TTLCache {
* TTL is not set or the database does not exist.
*/
public long getDatabaseMaxTTL(String database) {
- CacheNode node = ttlCacheTree.getChild(database);
+ CacheNode node = ttlCacheTree.searchChild(database);
if (node == null) {
return NULL_TTL;
}
@@ -296,6 +296,27 @@ public class TTLCache {
return children.get(name);
}
+ /**
+ * Search the child node by name.
+ *
+ * @param name the name corresponding to the child node, use '.' to
separate each node
+ * @return the child node if it exists, otherwise return null
+ */
+ public CacheNode searchChild(String name) {
+ String[] nodeNames = name.split("\\.");
+ CacheNode current = this;
+ for (String nodeName : nodeNames) {
+ if (nodeName.equals("root")) {
+ continue;
+ }
+ current = current.getChild(nodeName);
+ if (current == null) {
+ return null;
+ }
+ }
+ return current;
+ }
+
public Map<String, CacheNode> getChildren() {
return children;
}
