Skip to content

Remove useless variable outputDeviceToQueriedDevicesMap in Analysis #11526

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

Closed
Beyyes wants to merge 1 commit into from
Closed

Remove useless variable outputDeviceToQueriedDevicesMap in Analysis #11526

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
12 changes: 0 additions & 12 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/Analysis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ aggregation results last_value(temperature) and last_value(status), whereas buck
// the list of device names
private List<PartialPath> deviceList;

// map from output device name to queried devices
private Map<String, List<String>> outputDeviceToQueriedDevicesMap;

// map from device name to series/aggregation under this device
private Map<String, Set<Expression>> deviceToSourceExpressions;

Expand Down Expand Up @@ -751,15 +748,6 @@ public void setLastQueryNonWritableViewSourceExpressionMap(
this.lastQueryNonWritableViewSourceExpressionMap = lastQueryNonWritableViewSourceExpressionMap;
}

public Map<String, List<String>> getOutputDeviceToQueriedDevicesMap() {
return outputDeviceToQueriedDevicesMap;
}

public void setOutputDeviceToQueriedDevicesMap(
Map<String, List<String>> outputDeviceToQueriedDevicesMap) {
this.outputDeviceToQueriedDevicesMap = outputDeviceToQueriedDevicesMap;
}

public Map<String, Set<Expression>> getDeviceToOutputExpressions() {
return deviceToOutputExpressions;
}
Expand Down
9 changes: 1 addition & 8 deletions ...e/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/AnalyzeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,9 +1224,7 @@ private void analyzeDeviceToSource(Analysis analysis, QueryStatement queryStatem
}
}

Map<String, List<String>> outputDeviceToQueriedDevicesMap = new LinkedHashMap<>();
for (Map.Entry<String, Set<Expression>> entry : deviceToSourceExpressions.entrySet()) {
String deviceName = entry.getKey();
Set<Expression> sourceExpressionsUnderDevice = entry.getValue();
Set<String> queriedDevices = new HashSet<>();
for (Expression expression : sourceExpressionsUnderDevice) {
Expand All @@ -1236,11 +1234,9 @@ private void analyzeDeviceToSource(Analysis analysis, QueryStatement queryStatem
throw new SemanticException(
"Cross-device queries are not supported in ALIGN BY DEVICE queries.");
}
outputDeviceToQueriedDevicesMap.put(deviceName, new ArrayList<>(queriedDevices));
}

analysis.setDeviceToSourceExpressions(deviceToSourceExpressions);
analysis.setOutputDeviceToQueriedDevicesMap(outputDeviceToQueriedDevicesMap);
}

private void analyzeSource(Analysis analysis, QueryStatement queryStatement) {
Expand Down Expand Up @@ -1789,10 +1785,7 @@ private void analyzeDataPartition(
Analysis analysis, QueryStatement queryStatement, ISchemaTree schemaTree) {
Set<String> deviceSet = new HashSet<>();
if (queryStatement.isAlignByDevice()) {
deviceSet =
Copy link
Copy Markdown
Member Author

@Beyyes Beyyes Nov 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optimize it, it no LogicalView, just use analysis.getDeviceList().

analysis.getOutputDeviceToQueriedDevicesMap().values().stream()
.flatMap(List::stream)
.collect(Collectors.toSet());
deviceSet = analysis.getDeviceToSelectExpressions().keySet();
} else {
for (Expression expression : analysis.getSourceExpressions()) {
deviceSet.add(ExpressionAnalyzer.getDeviceNameInSourceExpression(expression));
Expand Down
10 changes: 3 additions & 7 deletions ...c/main/java/org/apache/iotdb/db/queryengine/plan/planner/distribution/SourceRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,17 +162,13 @@ public List<PlanNode> visitDeviceView(DeviceViewNode node, DistributionPlanConte
Set<TRegionReplicaSet> relatedDataRegions = new HashSet<>();

List<DeviceViewSplit> deviceViewSplits = new ArrayList<>();

// Step 1: constructs DeviceViewSplit
Map<String, List<String>> outputDeviceToQueriedDevicesMap =
analysis.getOutputDeviceToQueriedDevicesMap();
for (int i = 0; i < node.getDevices().size(); i++) {
String outputDevice = node.getDevices().get(i);
PlanNode child = node.getChildren().get(i);
List<TRegionReplicaSet> regionReplicaSets = new ArrayList<>();
for (String queriedDevice : outputDeviceToQueriedDevicesMap.get(outputDevice)) {
Copy link
Copy Markdown
Member Author

@Beyyes Beyyes Nov 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

size of outputDeviceToQueriedDevicesMap.get(outputDevice) can only be 0 or 1;

Can optimize this process, if no LogicalView, does'n need these step.

regionReplicaSets.addAll(
analysis.getPartitionInfo(queriedDevice, analysis.getGlobalTimeFilter()));
}
List<TRegionReplicaSet> regionReplicaSets =
new ArrayList<>(analysis.getPartitionInfo(outputDevice, analysis.getGlobalTimeFilter()));
deviceViewSplits.add(new DeviceViewSplit(outputDevice, child, regionReplicaSets));
relatedDataRegions.addAll(regionReplicaSets);
}
Expand Down