You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by jo...@apache.org on 2021/03/24 00:21:36 UTC
[druid] branch master updated: Add resources used to EXPLAIN PLAN
FOR output (#11024)
This is an automated email from the ASF dual-hosted git repository.
jonwei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 8296123 Add resources used to EXPLAIN PLAN FOR output (#11024)
8296123 is described below
commit 8296123d895db7d06bc4517db5e767afb7862b83
Author: Jonathan Wei <jo...@users.noreply.github.com>
AuthorDate: Tue Mar 23 17:21:15 2021 -0700
Add resources used to EXPLAIN PLAN FOR output (#11024)
---
.../druid/sql/calcite/planner/DruidPlanner.java | 28 ++++++++++++++++++----
.../druid/sql/calcite/planner/PlannerFactory.java | 6 +++--
.../druid/sql/avatica/DruidAvaticaHandlerTest.java | 4 +++-
.../apache/druid/sql/calcite/CalciteQueryTest.java | 17 +++++++++----
.../org/apache/druid/sql/http/SqlResourceTest.java | 4 +++-
5 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidPlanner.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidPlanner.java
index 772f650..6c91673 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidPlanner.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidPlanner.java
@@ -19,6 +19,8 @@
package org.apache.druid.sql.calcite.planner;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
@@ -62,6 +64,7 @@ import org.apache.calcite.util.Pair;
import org.apache.druid.java.util.common.guava.BaseSequence;
import org.apache.druid.java.util.common.guava.Sequence;
import org.apache.druid.java.util.common.guava.Sequences;
+import org.apache.druid.java.util.emitter.EmittingLogger;
import org.apache.druid.segment.DimensionHandlerUtils;
import org.apache.druid.sql.calcite.rel.DruidConvention;
import org.apache.druid.sql.calcite.rel.DruidRel;
@@ -75,19 +78,24 @@ import java.util.Properties;
public class DruidPlanner implements Closeable
{
+ private static final EmittingLogger log = new EmittingLogger(DruidPlanner.class);
+
private final FrameworkConfig frameworkConfig;
private final Planner planner;
private final PlannerContext plannerContext;
+ private final ObjectMapper jsonMapper;
private RexBuilder rexBuilder;
public DruidPlanner(
final FrameworkConfig frameworkConfig,
- final PlannerContext plannerContext
+ final PlannerContext plannerContext,
+ final ObjectMapper jsonMapper
)
{
this.frameworkConfig = frameworkConfig;
this.planner = Frameworks.getPlanner(frameworkConfig);
this.plannerContext = plannerContext;
+ this.jsonMapper = jsonMapper;
}
/**
@@ -358,8 +366,17 @@ public class DruidPlanner implements Closeable
)
{
final String explanation = RelOptUtil.dumpPlan("", rel, explain.getFormat(), explain.getDetailLevel());
+ String resources;
+ try {
+ resources = jsonMapper.writeValueAsString(plannerContext.getResources());
+ }
+ catch (JsonProcessingException jpe) {
+ // this should never happen, we create the Resources here, not a user
+ log.error(jpe, "Encountered exception while serializing Resources for explain output");
+ resources = null;
+ }
final Supplier<Sequence<Object[]>> resultsSupplier = Suppliers.ofInstance(
- Sequences.simple(ImmutableList.of(new Object[]{explanation})));
+ Sequences.simple(ImmutableList.of(new Object[]{explanation, resources})));
return new PlannerResult(resultsSupplier, getExplainStructType(rel.getCluster().getTypeFactory()));
}
@@ -414,8 +431,11 @@ public class DruidPlanner implements Closeable
private static RelDataType getExplainStructType(RelDataTypeFactory typeFactory)
{
return typeFactory.createStructType(
- ImmutableList.of(Calcites.createSqlType(typeFactory, SqlTypeName.VARCHAR)),
- ImmutableList.of("PLAN")
+ ImmutableList.of(
+ Calcites.createSqlType(typeFactory, SqlTypeName.VARCHAR),
+ Calcites.createSqlType(typeFactory, SqlTypeName.VARCHAR)
+ ),
+ ImmutableList.of("PLAN", "RESOURCES")
);
}
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
index fc584d7..9f86eda 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerFactory.java
@@ -107,7 +107,8 @@ public class PlannerFactory
return new DruidPlanner(
frameworkConfig,
- plannerContext
+ plannerContext,
+ jsonMapper
);
}
@@ -121,7 +122,8 @@ public class PlannerFactory
return new DruidPlanner(
frameworkConfig,
- plannerContext
+ plannerContext,
+ jsonMapper
);
}
diff --git a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
index 909287e..3587aa2 100644
--- a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
@@ -347,7 +347,9 @@ public class DruidAvaticaHandlerTest extends CalciteTestBase
"PLAN",
StringUtils.format("DruidQueryRel(query=[{\"queryType\":\"timeseries\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"descending\":false,\"virtualColumns\":[],\"filter\":null,\"granularity\":{\"type\":\"all\"},\"aggregations\":[{\"type\":\"count\",\"name\":\"a0\"}],\"postAggregations\":[],\"limit\":2147483647,\"context\":{\"skipEmptyBuckets\":tru [...]
DUMMY_SQL_QUERY_ID
- )
+ ),
+ "RESOURCES",
+ "[{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]"
)
),
getRows(resultSet)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
index 35641cf..125dc38 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
@@ -839,7 +839,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
"EXPLAIN PLAN FOR SELECT 1 + 1",
ImmutableList.of(),
ImmutableList.of(
- new Object[]{"BindableValues(tuples=[[{ 2 }]])\n"}
+ new Object[]{"BindableValues(tuples=[[{ 2 }]])\n", "[]"}
)
);
}
@@ -1021,6 +1021,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
+ " BindableFilter(condition=[AND(=($1, 'druid'), =($2, 'foo'))])\n"
+ " BindableTableScan(table=[[INFORMATION_SCHEMA, COLUMNS]])\n";
+ final String resources = "[]";
+
testQuery(
"EXPLAIN PLAN FOR\n"
+ "SELECT COLUMN_NAME, DATA_TYPE\n"
@@ -1028,7 +1030,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
+ "WHERE TABLE_SCHEMA = 'druid' AND TABLE_NAME = 'foo'",
ImmutableList.of(),
ImmutableList.of(
- new Object[]{explanation}
+ new Object[]{explanation, resources}
)
);
}
@@ -1249,7 +1251,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
ImmutableList.of(),
ImmutableList.of(
new Object[]{
- "DruidQueryRel(query=[{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[],\"resultFormat\":\"compactedList\",\"batchSize\":20480,\"order\":\"none\",\"filter\":null,\"columns\":[\"__time\",\"cnt\",\"dim1\",\"dim2\",\"dim3\",\"m1\",\"m2\",\"unique_dim1\"],\"legacy\":false,\"context\":{\"defaultTimeout\":300000 [...]
+ "DruidQueryRel(query=[{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[],\"resultFormat\":\"compactedList\",\"batchSize\":20480,\"order\":\"none\",\"filter\":null,\"columns\":[\"__time\",\"cnt\",\"dim1\",\"dim2\",\"dim3\",\"m1\",\"m2\",\"unique_dim1\"],\"legacy\":false,\"context\":{\"defaultTimeout\":300000 [...]
+ "[{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]"
}
)
);
@@ -5562,11 +5565,13 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
+ "\"context\":{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"skipEmptyBuckets\":true,\"sqlCurrentTimestamp\":\"2000-01-01T00:00:00Z\",\"sqlQueryId\":\"dummy\",\"vectorize\":\"false\",\"vectorizeVirtualColumns\":\"false\"}}]"
+ ", signature=[{a0:LONG}])\n";
+ final String resources = "[{\"name\":\"aview\",\"type\":\"VIEW\"}]";
+
testQuery(
"EXPLAIN PLAN FOR SELECT COUNT(*) FROM view.aview WHERE dim1_firstchar <> 'z'",
ImmutableList.of(),
ImmutableList.of(
- new Object[]{explanation}
+ new Object[]{explanation, resources}
)
);
}
@@ -8399,6 +8404,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
+ " DruidQueryRel(query=[{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[],\"resultFormat\":\"compactedList\",\"batchSize\":20480,\"order\":\"none\",\"filter\":null,\"columns\":[\"__time\",\"cnt\",\"dim1\",\"dim2\",\"dim3\",\"m1\",\"m2\",\"unique_dim1\"],\"legacy\":false,\"context\":{\"defaultTimeout\":300000,\ [...]
+ " DruidQueryRel(query=[{\"queryType\":\"groupBy\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[],\"filter\":{\"type\":\"not\",\"field\":{\"type\":\"selector\",\"dimension\":\"dim1\",\"value\":null,\"extractionFn\":null}},\"granularity\":{\"type\":\"all\"},\"dimensions\":[{\"type\":\"extraction\",\"dimension\":\"dim1\",\"outputNam [...]
+ final String resources = "[{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]";
+
testQuery(
"EXPLAIN PLAN FOR SELECT COUNT(*)\n"
+ "FROM (\n"
@@ -8409,7 +8416,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
+ " )\n"
+ ")",
ImmutableList.of(),
- ImmutableList.of(new Object[]{explanation})
+ ImmutableList.of(new Object[]{explanation, resources})
);
}
diff --git a/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java b/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
index a73c759..27130e6 100644
--- a/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/http/SqlResourceTest.java
@@ -698,7 +698,9 @@ public class SqlResourceTest extends CalciteTestBase
StringUtils.format(
"DruidQueryRel(query=[{\"queryType\":\"timeseries\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"descending\":false,\"virtualColumns\":[],\"filter\":null,\"granularity\":{\"type\":\"all\"},\"aggregations\":[{\"type\":\"count\",\"name\":\"a0\"}],\"postAggregations\":[],\"limit\":2147483647,\"context\":{\"skipEmptyBuckets\":true,\"sqlQueryId\ [...]
DUMMY_SQL_QUERY_ID
- )
+ ),
+ "RESOURCES",
+ "[{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]"
)
),
rows
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org