Skip to content

Follow up pipe schema snapshot database creation fix #17964

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
Jun 17, 2026
Merged

Follow up pipe schema snapshot database creation fix #17964

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
37 changes: 30 additions & 7 deletions ...rc/main/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,16 @@ private TSStatus loadSchemaSnapShot(
throws IllegalPathException, IOException {
final String databaseName = parameters.get(ColumnHeaderConstant.DATABASE);
final PartialPath databasePath = PartialPath.getQualifiedDatabasePartialPath(databaseName);
final boolean isTreeModelDataAllowedToBeCaptured =
PipeTransferFileSealReqV2.isTreeModelDataAllowedToBeCaptured(parameters);
final TreePattern treePattern =
parseTreePattern(
parameters.get(ColumnHeaderConstant.PATH_PATTERN), isTreeModelDataAllowedToBeCaptured);

if (!PathUtils.isTableModelDatabase(databaseName)) {
if (!shouldLoadTreeSchemaSnapshotDatabase(treePattern, databaseName)) {
return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
}
final TSStatus createDatabaseStatus = createSchemaSnapshotDatabaseIfNecessary(databasePath);
if (createDatabaseStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return createDatabaseStatus;
Expand All @@ -650,13 +658,6 @@ private TSStatus loadSchemaSnapShot(
final Set<StatementType> executionTypes =
PipeSchemaRegionSnapshotEvent.getStatementTypeSet(
parameters.get(ColumnHeaderConstant.TYPE));
final boolean isTreeModelDataAllowedToBeCaptured =
PipeTransferFileSealReqV2.isTreeModelDataAllowedToBeCaptured(parameters);
final TreePattern treePattern =
TreePattern.parsePatternFromString(
parameters.get(ColumnHeaderConstant.PATH_PATTERN),
isTreeModelDataAllowedToBeCaptured,
p -> new IoTDBTreePattern(isTreeModelDataAllowedToBeCaptured, p));
final TablePattern tablePattern =
new TablePattern(
PipeTransferFileSealReqV2.isTableModelDataAllowedToBeCaptured(parameters),
Expand Down Expand Up @@ -707,6 +708,28 @@ private TSStatus loadSchemaSnapShot(
return PipeReceiverStatusHandler.getPriorStatus(results);
}

static boolean shouldLoadTreeSchemaSnapshotDatabase(
final String pathPattern,
final boolean isTreeModelDataAllowedToBeCaptured,
final String databaseName) {
return shouldLoadTreeSchemaSnapshotDatabase(
parseTreePattern(pathPattern, isTreeModelDataAllowedToBeCaptured), databaseName);
}

private static TreePattern parseTreePattern(
final String pathPattern, final boolean isTreeModelDataAllowedToBeCaptured) {
return TreePattern.parsePatternFromString(
pathPattern,
isTreeModelDataAllowedToBeCaptured,
p -> new IoTDBTreePattern(isTreeModelDataAllowedToBeCaptured, p));
}

private static boolean shouldLoadTreeSchemaSnapshotDatabase(
final TreePattern treePattern, final String databaseName) {
return treePattern.isTreeModelDataAllowedToBeCaptured()
&& treePattern.mayOverlapWithDb(databaseName);
}

private TSStatus createSchemaSnapshotDatabaseIfNecessary(final PartialPath databasePath) {
final DatabaseSchemaStatement statement =
new DatabaseSchemaStatement(DatabaseSchemaStatement.DatabaseSchemaStatementType.CREATE);
Expand Down
10 changes: 10 additions & 0 deletions ...est/java/org/apache/iotdb/db/pipe/receiver/protocol/thrift/IoTDBDataNodeReceiverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,16 @@ public void testRepeatedStatementExceptionLogIsReduced() throws Exception {
}
}

@Test
public void testTreeSchemaSnapshotDatabaseIsFilteredByPattern() {
Assert.assertTrue(
IoTDBDataNodeReceiver.shouldLoadTreeSchemaSnapshotDatabase("root.ln.**", true, "root.ln"));
Assert.assertFalse(
IoTDBDataNodeReceiver.shouldLoadTreeSchemaSnapshotDatabase("root.ln.**", true, "root.db"));
Assert.assertFalse(
IoTDBDataNodeReceiver.shouldLoadTreeSchemaSnapshotDatabase("root.ln.**", false, "root.ln"));
}

@Test
public void testLoadTsFileSyncStatementVerifiesSchemaWhenConvertingType() throws Exception {
final Path tsFile = Files.createTempFile("pipe-load-convert-verify-schema", ".tsfile");
Expand Down
Loading