From eeddf193f1cff087752cdb4c8978b7fa6ee322b9 Mon Sep 17 00:00:00 2001 From: Abhishek Balaji Radhakrishnan Date: Wed, 12 Apr 2023 12:34:42 -0700 Subject: [PATCH] review comment: add Nullable annotations --- .../org/apache/druid/sql/calcite/planner/IngestHandler.java | 3 +++ .../org/apache/druid/sql/calcite/planner/PlannerContext.java | 5 +++-- .../org/apache/druid/sql/calcite/planner/QueryHandler.java | 1 + .../druid/sql/calcite/planner/SqlStatementHandler.java | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java index f5c95defbb60..f74bd19a6284 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/IngestHandler.java @@ -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; @@ -280,6 +281,7 @@ public String statementKind() return DruidSqlInsert.OPERATOR.getName(); } + @Nullable @Override public SqlNode targetDataSource() { @@ -350,6 +352,7 @@ public String statementKind() return DruidSqlReplace.OPERATOR.getName(); } + @Nullable @Override public SqlNode targetDataSource() { diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java index d7a7e342d699..378f849f16e4 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/PlannerContext.java @@ -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() { return this.targetDataSource; diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java index 4b237965a442..7e2889c0b3a8 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/QueryHandler.java @@ -234,6 +234,7 @@ public String statementKind() return "SELECT"; } + @Nullable @Override public SqlNode targetDataSource() { diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java b/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java index d3733552a4c4..d9bfcf8dcd6c 100644 --- a/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java +++ b/sql/src/main/java/org/apache/druid/sql/calcite/planner/SqlStatementHandler.java @@ -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; @@ -43,7 +44,7 @@ public interface SqlStatementHandler PrepareResult prepareResult(); PlannerResult plan() throws ValidationException; String statementKind(); - SqlNode targetDataSource(); + @Nullable SqlNode targetDataSource(); /** * Context available to statement handlers.