topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 11:07:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(fix)(headless) preserve model join order by using LinkedHashSet in probeRelatedModels (#2299)
Some checks failed
supersonic CentOS CI / build (21) (push) Has been cancelled
Details
supersonic mac CI / build (21) (push) Has been cancelled
Details
supersonic ubuntu CI / build (21) (push) Has been cancelled
Details
supersonic windows CI / build (21) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Willy-J
2025-07-09 17:22:44 +08:00
committed by GitHub
parent 9bddd4457e
commit 47c2595fb8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/SqlBuilder.java
View File

@@ -88,7 +88,7 @@ public class SqlBuilder {
GraphPath<String, DefaultEdge> selectedGraphPath = null; GraphPath<String, DefaultEdge> selectedGraphPath = null;
for (String fromModel : queryModels) { for (String fromModel : queryModels) {
for (String toModel : queryModels) { for (String toModel : queryModels) {
if (fromModel != toModel) { if (!fromModel.equals(toModel)) {
GraphPath<String, DefaultEdge> path = dijkstraAlg.getPath(fromModel, toModel); GraphPath<String, DefaultEdge> path = dijkstraAlg.getPath(fromModel, toModel);
if (isGraphPathContainsAll(path, queryModels)) { if (isGraphPathContainsAll(path, queryModels)) {
selectedGraphPath = path; selectedGraphPath = path;
@@ -100,13 +100,13 @@ public class SqlBuilder {
if (selectedGraphPath == null) { if (selectedGraphPath == null) {
return dataModels; return dataModels;
} }
Set<String> modelNames = Sets.newHashSet(); Set<String> modelNames = Sets.newLinkedHashSet();
for (DefaultEdge edge : selectedGraphPath.getEdgeList()) { for (DefaultEdge edge : selectedGraphPath.getEdgeList()) {
modelNames.add(selectedGraphPath.getGraph().getEdgeSource(edge)); modelNames.add(selectedGraphPath.getGraph().getEdgeSource(edge));
modelNames.add(selectedGraphPath.getGraph().getEdgeTarget(edge)); modelNames.add(selectedGraphPath.getGraph().getEdgeTarget(edge));
} }
return modelNames.stream().map(m -> ontology.getModelMap().get(m)) return modelNames.stream().map(m -> ontology.getModelMap().get(m))
.collect(Collectors.toSet()); .collect(Collectors.toCollection(LinkedHashSet::new));
} }
private boolean isGraphPathContainsAll(GraphPath<String, DefaultEdge> graphPath, private boolean isGraphPathContainsAll(GraphPath<String, DefaultEdge> graphPath,