From 7ef8d3f31edd08b441a16652abe2ac3c61ab10da Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Wed, 16 Jun 2021 17:45:47 +0300 Subject: [PATCH 1/2] CB-1061 SAML configuration and servlet --- .../src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java index fe46f7b23d..f47578b9a1 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebServiceSQL.java @@ -223,7 +223,7 @@ public class WebServiceSQL implements DBWServiceSQL { monitor.beginTask("Explain execution plan", 1); monitor.subTask("Explain query [" + sql + "] execution plan"); WebSQLExecutionPlan executeResults = contextInfo.getProcessor().explainExecutionPlan(monitor, contextInfo, sql, configuration); - this.result = ""; + this.result = "Execution plan explain has been scheduled"; this.extendedResults = executeResults; } catch (Throwable e) { throw new InvocationTargetException(e); From 2d3fb2cec086d9840e8017d96534db82350d6b2c Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Wed, 16 Jun 2021 17:57:37 +0300 Subject: [PATCH 2/2] CB-1058 Explain exec plan API: service bindings --- .../cloudbeaver/service/sql/WebServiceBindingSQL.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java index 4df83e4802..689a061740 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebServiceBindingSQL.java @@ -118,6 +118,16 @@ public class WebServiceBindingSQL extends WebServiceBindingBase i .dataFetcher("asyncSqlExecuteResults", env -> getService(env).asyncGetQueryResults( getWebSession(env), env.getArgument("taskId") + )) + .dataFetcher("asyncSqlExplainExecutionPlan", env -> + getService(env).asyncSqlExplainExecutionPlan( + getSQLContext(env), + env.getArgument("query"), + env.getArgument("configuration") + )) + .dataFetcher("asyncSqlExplainExecutionPlanResult", env -> + getService(env).asyncSqlExplainExecutionPlanResult( + getWebSession(env), env.getArgument("taskId") )); }