You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by "luoluoyuyu (via GitHub)" <gi...@apache.org> on 2026/07/22 02:49:58 UTC
[PR] feat(load): reject managed TsFile directories [iotdb]
luoluoyuyu opened a new pull request, #18271:
URL: https://github.com/apache/iotdb/pull/18271
## Description
as the title said
<!--
In each section, please describe design decisions made, including:
- Choice of algorithms
- Behavioral aspects. What configuration values are acceptable? How are corner cases and error
conditions handled, such as when there are insufficient resources?
- Class organization and design (how the logic is split between classes, inheritance, composition,
design patterns)
- Method organization and design (how the logic is split between methods, parameters and return types)
- Naming (class, method, API, configuration, HTTP endpoint, names of emitted metrics)
-->
<!-- It's good to describe an alternative design (or mention an alternative name) for every design
(or naming) decision point and compare the alternatives with the designs that you've implemented
(or the names you've chosen) to highlight the advantages of the chosen designs and names. -->
<!-- If there was a discussion of the design of the feature implemented in this PR elsewhere
(e. g. a "Proposal" issue, any other issue, or a thread in the development mailing list),
link to that discussion from this PR description and explain what have changed in your final design
compared to your original proposal or the consensus version in the end of the discussion.
If something hasn't changed since the original discussion, you can omit a detailed discussion of
those aspects of the design here, perhaps apart from brief mentioning for the sake of readability
of this PR description. -->
<!-- Some of the aspects mentioned above may be omitted for simple and small changes. -->
<hr>
This PR has:
- [ ] been self-reviewed.
- [ ] concurrent read
- [ ] concurrent write
- [ ] concurrent read and write
- [ ] added documentation for new or modified features or behaviors.
- [ ] added Javadocs for most classes and all non-trivial methods.
- [ ] added or updated version, __license__, or notice information
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious
for an unfamiliar reader.
- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold
for code coverage.
- [ ] added integration tests.
- [ ] been tested in a test IoTDB cluster.
<!-- Check the items by putting "x" in the brackets for the done things. Not all of these items
apply to every PR. Remove the items which are not done or not relevant to the PR. None of the items
from the checklist above are strictly necessary, but it would be very helpful if you at least
self-review the PR. -->
<hr>
##### Key changed/added classes (or packages if there are too many classes) in this PR
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "jt2594838 (via GitHub)" <gi...@apache.org>.
jt2594838 commented on code in PR #18271:
URL: https://github.com/apache/iotdb/pull/18271#discussion_r3687525350
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java:
##########
@@ -103,8 +109,11 @@ private LoadTsFile(
try {
this.tsFiles =
- org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement.processTsFile(
- new File(filePath), validateSourcePath);
+ validateInternalDataDir
+ ? org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
+ .processTsFile(new File(filePath), validateSourcePath)
+ : org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
Review Comment:
I mean the import
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "luoluoyuyu (via GitHub)" <gi...@apache.org>.
luoluoyuyu commented on code in PR #18271:
URL: https://github.com/apache/iotdb/pull/18271#discussion_r3679665296
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java:
##########
@@ -103,8 +109,11 @@ private LoadTsFile(
try {
this.tsFiles =
- org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement.processTsFile(
- new File(filePath), validateSourcePath);
+ validateInternalDataDir
+ ? org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
+ .processTsFile(new File(filePath), validateSourcePath)
+ : org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
Review Comment:
Thanks for the reminder. processTsFileForPipe intentionally bypasses the managed-directory check because Pipe receiver/hardlink sources can be placed under IoTDB-managed paths. We have restricted this branch to createForPipe() call sites guarded by an existing isGeneratedByPipe context; normal table-model LOAD still uses processTsFile(...) and keeps the managed-directory validation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "luoluoyuyu (via GitHub)" <gi...@apache.org>.
luoluoyuyu commented on code in PR #18271:
URL: https://github.com/apache/iotdb/pull/18271#discussion_r3670481389
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java:
##########
@@ -195,6 +201,31 @@ private static void validateLoadSourcePath(final File file) throws FileNotFoundE
Arrays.toString(allowedDirs)));
}
+ private static Path[] getInternalTsFileDirCanonicalPaths() throws FileNotFoundException {
+ final String[] localDataDirs = IoTDBDescriptor.getInstance().getConfig().getLocalDataDirs();
+ final Path[] internalTsFileDirCanonicalPaths = new Path[localDataDirs.length * 2];
+ for (int i = 0; i < localDataDirs.length; i++) {
+ internalTsFileDirCanonicalPaths[i * 2] =
+ canonicalPath(new File(localDataDirs[i], SEQUENCE_FOLDER_NAME));
+ internalTsFileDirCanonicalPaths[i * 2 + 1] =
+ canonicalPath(new File(localDataDirs[i], UNSEQUENCE_FOLDER_NAME));
+ }
+ return internalTsFileDirCanonicalPaths;
+ }
Review Comment:
fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "Caideyipi (via GitHub)" <gi...@apache.org>.
Caideyipi commented on code in PR #18271:
URL: https://github.com/apache/iotdb/pull/18271#discussion_r3627205266
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java:
##########
@@ -195,6 +199,18 @@ private static void validateLoadSourcePath(final File file) throws FileNotFoundE
Arrays.toString(allowedDirs)));
}
+ private static void validateNotLoadingInternalTsFile(final File file)
+ throws FileNotFoundException {
+ final Path sourcePath = canonicalPath(file);
+ for (final String dataDir : IoTDBDescriptor.getInstance().getConfig().getLocalDataDirs()) {
Review Comment:
[P2] Hoist managed-directory canonicalization out of the recursive traversal
`findAllTsFile` calls this method for every file and directory it encounters, and every call re-canonicalizes both `sequence` and `unsequence` under every local data directory. Directory loading therefore performs `1 + 2 * dataDirCount` canonical-path resolutions per entry, even though the managed roots are invariant during one traversal.
On Windows/JDK 17, traversing 5,000 TsFiles with this PR took about 3.24 s with 1 local data directory, 9.68 s with 4, and 37.31 s with 16, before LOAD analysis or execution began. This makes large directory LOADs increasingly expensive for the supported multi-directory configuration.
Please compute the canonical managed roots once at the start of `processTsFile` and pass that snapshot through the recursion, or cache them alongside the data-directory configuration.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "jt2594838 (via GitHub)" <gi...@apache.org>.
jt2594838 commented on code in PR #18271:
URL: https://github.com/apache/iotdb/pull/18271#discussion_r3637470801
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java:
##########
@@ -195,6 +201,31 @@ private static void validateLoadSourcePath(final File file) throws FileNotFoundE
Arrays.toString(allowedDirs)));
}
+ private static Path[] getInternalTsFileDirCanonicalPaths() throws FileNotFoundException {
+ final String[] localDataDirs = IoTDBDescriptor.getInstance().getConfig().getLocalDataDirs();
+ final Path[] internalTsFileDirCanonicalPaths = new Path[localDataDirs.length * 2];
+ for (int i = 0; i < localDataDirs.length; i++) {
+ internalTsFileDirCanonicalPaths[i * 2] =
+ canonicalPath(new File(localDataDirs[i], SEQUENCE_FOLDER_NAME));
+ internalTsFileDirCanonicalPaths[i * 2 + 1] =
+ canonicalPath(new File(localDataDirs[i], UNSEQUENCE_FOLDER_NAME));
+ }
+ return internalTsFileDirCanonicalPaths;
+ }
Review Comment:
Pipe hardlink dir, region snapshot dir, etc., should also be excluded.
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java:
##########
@@ -195,6 +201,31 @@ private static void validateLoadSourcePath(final File file) throws FileNotFoundE
Arrays.toString(allowedDirs)));
}
+ private static Path[] getInternalTsFileDirCanonicalPaths() throws FileNotFoundException {
+ final String[] localDataDirs = IoTDBDescriptor.getInstance().getConfig().getLocalDataDirs();
+ final Path[] internalTsFileDirCanonicalPaths = new Path[localDataDirs.length * 2];
+ for (int i = 0; i < localDataDirs.length; i++) {
+ internalTsFileDirCanonicalPaths[i * 2] =
+ canonicalPath(new File(localDataDirs[i], SEQUENCE_FOLDER_NAME));
+ internalTsFileDirCanonicalPaths[i * 2 + 1] =
+ canonicalPath(new File(localDataDirs[i], UNSEQUENCE_FOLDER_NAME));
+ }
+ return internalTsFileDirCanonicalPaths;
+ }
Review Comment:
This does not need to be initialized for each load.
You may cache it in IoTDBConfig.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "luoluoyuyu (via GitHub)" <gi...@apache.org>.
luoluoyuyu commented on code in PR #18271:
URL: https://github.com/apache/iotdb/pull/18271#discussion_r3687912421
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java:
##########
@@ -103,8 +109,11 @@ private LoadTsFile(
try {
this.tsFiles =
- org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement.processTsFile(
- new File(filePath), validateSourcePath);
+ validateInternalDataDir
+ ? org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
+ .processTsFile(new File(filePath), validateSourcePath)
+ : org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
Review Comment:
fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "jt2594838 (via GitHub)" <gi...@apache.org>.
jt2594838 merged PR #18271:
URL: https://github.com/apache/iotdb/pull/18271
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] feat(load): reject managed TsFile directories [iotdb]
Posted by "jt2594838 (via GitHub)" <gi...@apache.org>.
jt2594838 commented on code in PR #18271:
URL: https://github.com/apache/iotdb/pull/18271#discussion_r3679412730
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LoadTsFile.java:
##########
@@ -103,8 +109,11 @@ private LoadTsFile(
try {
this.tsFiles =
- org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement.processTsFile(
- new File(filePath), validateSourcePath);
+ validateInternalDataDir
+ ? org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
+ .processTsFile(new File(filePath), validateSourcePath)
+ : org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement
Review Comment:
Mind this
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org