Skip to content

Refactor some method and PlanNodeType #17918

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
JackieTien97 merged 3 commits into from
Jun 11, 2026
Merged

Refactor some method and PlanNodeType #17918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b928e1c
fix
Wei-hao-Li Jun 11, 2026
641f4e4
fix
Wei-hao-Li Jun 11, 2026
e25555c
fix
Wei-hao-Li Jun 11, 2026
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
25 changes: 14 additions & 11 deletions ...rc/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,17 +343,7 @@
final ImmutableList.Builder<Symbol> outputSymbolsBuilder = ImmutableList.builder();
final ImmutableMap.Builder<Symbol, ColumnSchema> symbolToColumnSchema = ImmutableMap.builder();
final Collection<Field> fields = scope.getRelationType().getAllFields();
final QualifiedName qualifiedName = analysis.getRelationName(table);

if (!qualifiedName.getPrefix().isPresent()) {
throw new IllegalStateException(
DataNodeQueryMessages.TABLE + table.getName() + " has no prefix!");
}

final QualifiedObjectName qualifiedObjectName =
new QualifiedObjectName(
qualifiedName.getPrefix().map(QualifiedName::toString).orElse(null),
qualifiedName.getSuffix());
final QualifiedObjectName qualifiedObjectName = getQualifiedObjectName(table, analysis);

// on the basis of that the order of fields is same with the column category order of segments
// in DeviceEntry
Expand Down Expand Up @@ -411,6 +401,19 @@
return new RelationPlan(tableScanNode, scope, outputSymbols, outerContext);
}

public static QualifiedObjectName getQualifiedObjectName(Table table, Analysis analysis) {
final QualifiedName qualifiedName = analysis.getRelationName(table);
if (!qualifiedName.getPrefix().isPresent()) {
throw new IllegalStateException("Table " + table.getName() + " has no prefix!");
}

final QualifiedObjectName qualifiedObjectName =
new QualifiedObjectName(
qualifiedName.getPrefix().map(QualifiedName::toString).orElse(null),
qualifiedName.getSuffix());

Check warning on line 413 in iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Immediately return this expression instead of assigning it to the temporary variable "qualifiedObjectName". 


See more on https://sonarcloud.io/project/issues?id=apache_iotdb&issues=AZ62NlemsvfB9vMHqJiX&open=AZ62NlemsvfB9vMHqJiX&pullRequest=17918
return qualifiedObjectName;
}

@Override
public RelationPlan visitQuerySpecification(final QuerySpecification node, final Void context) {
return new QueryPlanner(
Expand Down
2 changes: 2 additions & 0 deletions ...c/main/java/org/apache/iotdb/commons/queryengine/plan/planner/plan/node/PlanNodeType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ public enum PlanNodeType {
ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1041),
NON_ALIGNED_AGGREGATION_TREE_DEVICE_VIEW_SCAN_NODE((short) 1042),
TABLE_NEXT_FILL_NODE((short) 1043),
SESSION_SCAN_NODE((short) 1044),
EVENT_SCAN_NODE((short) 1045),

RELATIONAL_INSERT_TABLET((short) 2000),
RELATIONAL_INSERT_ROW((short) 2001),
Expand Down
Loading