Skip to content
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

Jump to bottom

Include statement attributes in EXPLAIN PLAN output #14074

Merged
merged 17 commits into from
Apr 17, 2023
Merged

Include statement attributes in EXPLAIN PLAN output #14074

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7a5131c
Add statementKind and targetDataSource to EXPLAIN PLAN output.
abhishekrb19 Apr 12, 2023
2103087
add call to run the native explanation for insert and replace queries…
abhishekrb19 Apr 12, 2023
5cb1719
quote the nulls
abhishekrb19 Apr 12, 2023
108c0df
Add new planner config for legacy explanation.
abhishekrb19 Apr 12, 2023
c3b92b2
Remove statementKind and targetDataSource from legacy explanation as …
abhishekrb19 Apr 12, 2023
24a1ee0
remove comment
abhishekrb19 Apr 12, 2023
a4ee381
other test fixes.
abhishekrb19 Apr 12, 2023
fba9e43
make static analysis happy happy
abhishekrb19 Apr 12, 2023
eeddf19
review comment: add Nullable annotations
abhishekrb19 Apr 12, 2023
73fc9de
Javadoc
abhishekrb19 Apr 12, 2023
6666799
Add StatementAttributes model class to contain the metadata info.
abhishekrb19 Apr 14, 2023
14ba102
doc updates.
abhishekrb19 Apr 14, 2023
9894710
UT fixes
abhishekrb19 Apr 14, 2023
86ef0a7
Remove unused imports, test fix, whitespace change
abhishekrb19 Apr 14, 2023
15cf607
Remove unused methods
abhishekrb19 Apr 14, 2023
16729cf
review comment: Rename statementKind -> statementType.
abhishekrb19 Apr 17, 2023
09fb4e8
rename STATEMENT_ATTRIBUTES -> ATTRIBUTES.
abhishekrb19 Apr 17, 2023
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
3 changes: 3 additions & 0 deletions sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import org.apache.druid.sql.calcite.run.EngineFeature;
import org.apache.druid.sql.calcite.run.QueryMaker;

import javax.annotation.Nullable;
import java.util.List;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -280,6 +281,7 @@ public String statementKind()
return DruidSqlInsert.OPERATOR.getName();
}

@Nullable
abhishekrb19 marked this conversation as resolved.
Show resolved Hide resolved
@Override
public SqlNode targetDataSource()
{
Expand Down Expand Up @@ -350,6 +352,7 @@ public String statementKind()
return DruidSqlReplace.OPERATOR.getName();
}

@Nullable
abhishekrb19 marked this conversation as resolved.
Show resolved Hide resolved
@Override
public SqlNode targetDataSource()
{
Expand Down
5 changes: 3 additions & 2 deletions sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,14 +513,15 @@ public String getStatementKind()
return this.statementKind;
}

public void setStatementKind(String sqlKind)
public void setStatementKind(String statementKind)
{
if (this.statementKind != null) {
throw new ISE("StatementKind has already been set");
}
this.statementKind = sqlKind;
this.statementKind = statementKind;
}

@Nullable
public SqlNode getTargetDataSource()
abhishekrb19 marked this conversation as resolved.
Show resolved Hide resolved
{
return this.targetDataSource;
Expand Down
1 change: 1 addition & 0 deletions sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ public String statementKind()
return "SELECT";
}

@Nullable
@Override
public SqlNode targetDataSource()
{
Expand Down
3 changes: 2 additions & 1 deletion sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.druid.sql.calcite.run.SqlEngine;
import org.joda.time.DateTimeZone;

import javax.annotation.Nullable;
import java.util.Map;
import java.util.Set;

Expand All @@ -43,7 +44,7 @@ public interface SqlStatementHandler
PrepareResult prepareResult();
PlannerResult plan() throws ValidationException;
String statementKind();
SqlNode targetDataSource();
@Nullable SqlNode targetDataSource();
abhishekrb19 marked this conversation as resolved.
Show resolved Hide resolved

/**
* Context available to statement handlers.
Expand Down