opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-1058 EEP API: use flat node list instead of hierarchy

Browse Source
This commit is contained in:
Serge Rider
2021-06-16 15:15:41 +03:00
parent 0ff4e78b61
commit dbbb3fdea2
3 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls
+3 -2
View File
@@ -148,14 +148,15 @@ type SQLExecutionPlan {
}
type SQLExecutionPlanNode {
id: ID!
parentId: ID
kind: String!
name: String
type: String!
condition: String
description: String
properties: [ObjectPropertyInfo!]!
nested: [SQLExecutionPlanNode!]!
}
####################################################
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLExecutionPlan.java
+24 -6
View File
@@ -19,9 +19,9 @@ package io.cloudbeaver.service.sql;
import io.cloudbeaver.model.session.WebSession;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.exec.plan.DBCPlan;
import org.jkiss.dbeaver.model.exec.plan.DBCPlanNode;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.*;
/**
* WebSQLExecutionPlan.
@@ -44,10 +44,28 @@ public class WebSQLExecutionPlan {
public WebSQLExecutionPlanNode[] getNodes() {
Map<String, Object> options = new LinkedHashMap<>();
return plan.getPlanNodes(options)
.stream()
.map(node -> new WebSQLExecutionPlanNode(webSession, node))
.toArray(WebSQLExecutionPlanNode[]::new);
Map<DBCPlanNode, String> idMap = new IdentityHashMap<>();
List<WebSQLExecutionPlanNode> result = new ArrayList<>();
for (DBCPlanNode node : plan.getPlanNodes(options)) {
addNodeWithNested(result, null, node, idMap);
}
return result.toArray(new WebSQLExecutionPlanNode[0]);
}
private void addNodeWithNested(List<WebSQLExecutionPlanNode> result, DBCPlanNode parentNode, DBCPlanNode node, Map<DBCPlanNode, String> idMap) {
String parentId = idMap.get(parentNode);
String nodeId = String.valueOf(idMap.size());
idMap.put(node, nodeId);
result.add(new WebSQLExecutionPlanNode(webSession, node, nodeId, parentId));
Collection<? extends DBCPlanNode> nested = node.getNested();
if (nested != null) {
for (DBCPlanNode nn : nested) {
addNodeWithNested(result, node, nn, idMap);
}
}
}
}
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLExecutionPlanNode.java
+13 -14
View File
@@ -23,10 +23,8 @@ import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.exec.plan.DBCPlanNode;
import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor;
import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
import org.jkiss.utils.CommonUtils;
import java.util.Arrays;
import java.util.Collection;
/**
* WebSQLExecutionPlanNode.
@@ -37,10 +35,22 @@ public class WebSQLExecutionPlanNode {
private final WebSession webSession;
private final DBCPlanNode node;
private final String id;
private final String parentId;
public WebSQLExecutionPlanNode(WebSession webSession, DBCPlanNode node) {
public WebSQLExecutionPlanNode(WebSession webSession, DBCPlanNode node, String id, String parentId) {
this.webSession = webSession;
this.node = node;
this.id = id;
this.parentId = parentId;
}
public String getId() {
return id;
}
public String getParentId() {
return parentId;
}
public String getKind() {
@@ -72,15 +82,4 @@ public class WebSQLExecutionPlanNode {
.map(p -> new WebPropertyInfo(webSession, p, propertyCollector)).toArray(WebPropertyInfo[]::new);
}
public WebSQLExecutionPlanNode[] getNested() {
Collection<? extends DBCPlanNode> nestedNodes = node.getNested();
if (CommonUtils.isEmpty(nestedNodes)) {
return null;
}
return nestedNodes
.stream()
.map(node1 -> new WebSQLExecutionPlanNode(webSession, node1))
.toArray(WebSQLExecutionPlanNode[]::new);
}
}