Skip to content

[Test] Speed up schema, pipe and subscription integration tests #18943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 1 commit into from
Oct 21, 2026
+109 −90
Merged

[Test] Speed up schema, pipe and subscription integration tests #18943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 47 additions & 44 deletions integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAlterTimeSeriesTypeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,14 @@ private void doWriteAndAlterWriteForAccumulatorQuery(TSDataType from, TSDataType
Collections.singletonList("s1"),
Collections.singletonList(from),
Collections.singletonList(ColumnCategory.FIELD));
// Batch fixture writes without crossing data type changes or flush boundaries.
for (int i = 1; i <= 512; i++) {
tablet.addTimestamp(0, i);
tablet.addValue("s1", 0, genValue(from, i));
session.insertTablet(tablet);
tablet.reset();
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
}
session.insertTablet(tablet);
tablet.reset();
session.executeNonQueryStatement("FLUSH");

// alter the type to "to"
Expand Down Expand Up @@ -413,11 +415,12 @@ private void doWriteAndAlterWriteForAccumulatorQuery(TSDataType from, TSDataType
Collections.singletonList(to),
Collections.singletonList(ColumnCategory.FIELD));
for (int i = 513; i <= 1024; i++) {
tablet.addTimestamp(0, i);
tablet.addValue("s1", 0, genValue(to, i));
session.insertTablet(tablet);
tablet.reset();
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(to, i));
}
session.insertTablet(tablet);
tablet.reset();
session.executeNonQueryStatement("FLUSH");

standardAccumulatorQueryByTimeOnlyInvolveOldDataTypeTest(session, from, to);
Expand Down Expand Up @@ -1186,23 +1189,23 @@ public void testNonAlignDeviceSequenceDataQuery(TSDataType from, TSDataType to)
// session.executeNonQueryStatement("FLUSH");
for (int i = 1; i <= 512; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

session.executeNonQueryStatement("FLUSH");

for (int i = 513; i <= 1024; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

String columns;
if (UNSUPPORT_MIN_AND_MAX_QUERY_DATA_TYPE_LIST.contains(from)
Expand Down Expand Up @@ -1323,23 +1326,23 @@ public void testAlignDeviceSequenceDataQuery(TSDataType from, TSDataType to) thr
// session.executeNonQueryStatement("FLUSH");
for (int i = 1; i <= 512; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

session.executeNonQueryStatement("FLUSH");

for (int i = 513; i <= 1024; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

String columns;
if (UNSUPPORT_MIN_AND_MAX_QUERY_DATA_TYPE_LIST.contains(from)
Expand Down Expand Up @@ -1452,23 +1455,23 @@ public void testNonAlignDeviceUnSequenceDataQuery(TSDataType from, TSDataType to

for (int i = 513; i <= 1024; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

session.executeNonQueryStatement("FLUSH");

for (int i = 1; i <= 512; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();
// session.executeNonQueryStatement("FLUSH");

String columns;
Expand Down Expand Up @@ -1585,23 +1588,23 @@ public void testAlignDeviceUnSequenceDataQuery(TSDataType from, TSDataType to) t

for (int i = 513; i <= 1024; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

session.executeNonQueryStatement("FLUSH");

for (int i = 1; i <= 512; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();
// session.executeNonQueryStatement("FLUSH");

String columns;
Expand Down Expand Up @@ -1715,23 +1718,23 @@ public void testNonAlignDeviceUnSequenceOverlappedDataQuery(TSDataType from, TSD

for (int i = 513; i <= 1024; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

session.executeNonQueryStatement("FLUSH");

for (int i = 1; i <= 520; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();
// session.executeNonQueryStatement("FLUSH");

String columns;
Expand Down Expand Up @@ -1849,23 +1852,23 @@ public void testAlignDeviceUnSequenceOverlappedDataQuery(TSDataType from, TSData

for (int i = 513; i <= 1024; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();

session.executeNonQueryStatement("FLUSH");

for (int i = 1; i <= 520; i++) {
int rowIndex = tablet.getRowSize();
tablet.addTimestamp(0, i);
tablet.addTimestamp(rowIndex, i);
tablet.addValue("s1", rowIndex, genValue(from, i));
tablet.addValue("s2", rowIndex, genValue(from, i * 2));
session.insertTablet(tablet);
tablet.reset();
}
session.insertTablet(tablet);
tablet.reset();
// session.executeNonQueryStatement("FLUSH");

String columns;
Expand Down
14 changes: 7 additions & 7 deletions integration-test/src/test/java/org/apache/iotdb/db/it/utils/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,7 +1697,7 @@ public static void assertDataEventuallyOnEnv(
// Keep retrying if there are execution failures
await()
.pollInSameThread()
.pollDelay(1L, TimeUnit.SECONDS)
.pollDelay(0L, TimeUnit.SECONDS)
.pollInterval(1L, TimeUnit.SECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)
.untilAsserted(
Expand Down Expand Up @@ -1741,7 +1741,7 @@ public static void assertDataEventuallyOnEnv(
// Keep retrying if there are execution failures
await()
.pollInSameThread()
.pollDelay(1L, TimeUnit.SECONDS)
.pollDelay(0L, TimeUnit.SECONDS)
.pollInterval(1L, TimeUnit.SECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)
.untilAsserted(
Expand Down Expand Up @@ -1777,7 +1777,7 @@ public static void assertDataSizeEventuallyOnEnv(
// Keep retrying if there are execution failures
await()
.pollInSameThread()
.pollDelay(1L, TimeUnit.SECONDS)
.pollDelay(0L, TimeUnit.SECONDS)
.pollInterval(1L, TimeUnit.SECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)
.untilAsserted(
Expand Down Expand Up @@ -1821,7 +1821,7 @@ public static void assertDataEventuallyOnEnv(
// Keep retrying if there are execution failures
await()
.pollInSameThread()
.pollDelay(1L, TimeUnit.SECONDS)
.pollDelay(0L, TimeUnit.SECONDS)
.pollInterval(1L, TimeUnit.SECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)
.untilAsserted(
Expand Down Expand Up @@ -1902,7 +1902,7 @@ public static void assertDataEventuallyOnEnv(
// Keep retrying if there are execution failures
await()
.pollInSameThread()
.pollDelay(1L, TimeUnit.SECONDS)
.pollDelay(0L, TimeUnit.SECONDS)
.pollInterval(1L, TimeUnit.SECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)
.untilAsserted(
Expand Down Expand Up @@ -1983,7 +1983,7 @@ public static void assertDataEventuallyOnEnv(
// Keep retrying if there are execution failures
await()
.pollInSameThread()
.pollDelay(1L, TimeUnit.SECONDS)
.pollDelay(0L, TimeUnit.SECONDS)
.pollInterval(1L, TimeUnit.SECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)
.untilAsserted(
Expand Down Expand Up @@ -2027,7 +2027,7 @@ public static void assertDataEventuallyOnEnv(
// Keep retrying if there are execution failures
await()
.pollInSameThread()
.pollDelay(1L, TimeUnit.SECONDS)
.pollDelay(0L, TimeUnit.SECONDS)
.pollInterval(1L, TimeUnit.SECONDS)
.atMost(timeoutSeconds, TimeUnit.SECONDS)
.untilAsserted(
Expand Down
5 changes: 2 additions & 3 deletions ...est/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeClusterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,8 @@ private void testMachineDowntime(String sink) {

TableModelUtils.assertCountData("test", "test", 1, receiverEnv);
receiverEnv.getDataNodeWrapper(0).stop();

// Ensure that the kill -9 operation is completed
Thread.sleep(5000);
// stop() waits for process exit; verify it succeeded before checking failover.
Assert.assertFalse(receiverEnv.getDataNodeWrapper(0).isAlive());
TableModelUtils.insertData("test", "test", 1, 2, senderEnv);
} catch (Exception e) {
fail(e.getMessage());
Expand Down
5 changes: 2 additions & 3 deletions ...c/test/java/org/apache/iotdb/pipe/it/dual/treemodel/auto/enhanced/IoTDBPipeClusterIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,8 @@ private void testMachineDowntime(String sink) {
Assert.assertEquals(TSStatusCode.SUCCESS_STATUS.getStatusCode(), status.getCode());

receiverEnv.getDataNodeWrapper(0).stop();

// Ensure that the kill -9 operation is completed
Thread.sleep(5000);
// stop() waits for process exit; verify it succeeded before checking failover.
Assert.assertFalse(receiverEnv.getDataNodeWrapper(0).isAlive());
for (DataNodeWrapper nodeWrapper : receiverEnv.getDataNodeWrapperList()) {
if (!nodeWrapper.isAlive()) {
continue;
Expand Down
Loading
Loading