use SqlCall; remove @nullable

ahmedabu98 · ahmedabu98 · commit f71cf7e32f78 · 2025-11-11T23:02:48.000+03:00
diff --git a/sdks/java/extensions/sql/iceberg/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/iceberg/IcebergCatalog.java b/sdks/java/extensions/sql/iceberg/src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/iceberg/IcebergCatalog.java
@@ -74,7 +74,7 @@ public boolean createDatabase(String database) {
   }
 
   @Override
-  public @Nullable Collection<String> databases() {
+  public Collection<String> databases() {
     return catalogConfig.listNamespaces();
   }
 
diff --git a/sdks/java/extensions/sql/src/main/codegen/config.fmpp b/sdks/java/extensions/sql/src/main/codegen/config.fmpp
@@ -428,10 +428,10 @@ data: {
       # Return type of method implementation should be 'SqlNode'.
       # Example: SqlShowDatabases(), SqlShowTables().
       statementParserMethods: [
-        "SqlShowTables(Span.of(), null)"
-        "SqlShowDatabases(Span.of(), null)"
-        "SqlShowCatalogs(Span.of(), null)"
-        "SqlShowCurrent(Span.of(), null)"
+        "SqlShowTables(Span.of())"
+        "SqlShowDatabases(Span.of())"
+        "SqlShowCatalogs(Span.of())"
+        "SqlShowCurrent(Span.of())"
         "SqlUseCatalog(Span.of(), null)"
         "SqlUseDatabase(Span.of(), null)"
         "SqlSetOptionBeam(Span.of(), null)"
diff --git a/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl b/sdks/java/extensions/sql/src/main/codegen/includes/parserImpls.ftl
@@ -267,15 +267,15 @@ SqlDrop SqlDropCatalog(Span s, boolean replace) :
 /**
  * SHOW CATALOGS [ LIKE regex_pattern ]
  */
-SqlCall SqlShowCatalogs(Span s, String scope) :
+SqlCall SqlShowCatalogs(Span s) :
 {
     SqlNode regex = null;
 }
 {
     <SHOW> <CATALOGS> { s.add(this); }
     [ <LIKE> regex = StringLiteral() ]
     {
-        return new SqlShowCatalogs(s.end(this), scope, false, regex);
+        return new SqlShowCatalogs(s.end(this), false, regex);
     }
 }
 
@@ -350,7 +350,7 @@ SqlDrop SqlDropDatabase(Span s, boolean replace) :
 /**
  * SHOW DATABASES [ ( FROM | IN )? catalog_name ] [LIKE regex_pattern ]
  */
-SqlCall SqlShowDatabases(Span s, String scope) :
+SqlCall SqlShowDatabases(Span s) :
 {
     SqlIdentifier catalogName = null;
     SqlNode regex = null;
@@ -360,22 +360,22 @@ SqlCall SqlShowDatabases(Span s, String scope) :
     [ ( <FROM> | <IN> ) catalogName = SimpleIdentifier() ]
     [ <LIKE> regex = StringLiteral() ]
     {
-        return new SqlShowDatabases(s.end(this), scope, false, catalogName, regex);
+        return new SqlShowDatabases(s.end(this), false, catalogName, regex);
     }
 }
 
-SqlCall SqlShowCurrent(Span s, String scope) :
+SqlCall SqlShowCurrent(Span s) :
 {
 }
 {
     <SHOW> <CURRENT> { s.add(this); }
     (
         <CATALOG> {
-            return new SqlShowCatalogs(s.end(this), scope, true, null);
+            return new SqlShowCatalogs(s.end(this), true, null);
         }
     |
         <DATABASE> {
-            return new SqlShowDatabases(s.end(this), scope, true, null, null);
+            return new SqlShowDatabases(s.end(this), true, null, null);
         }
     )
 }
@@ -508,7 +508,7 @@ SqlDrop SqlDropTable(Span s, boolean replace) :
 /**
  * SHOW TABLES [ ( FROM | IN )? [ catalog_name '.' ] database_name ] [ LIKE regex_pattern ]
  */
-SqlCall SqlShowTables(Span s, String scope) :
+SqlCall SqlShowTables(Span s) :
 {
     SqlIdentifier database = null;
     SqlNode regex = null;
@@ -518,7 +518,7 @@ SqlCall SqlShowTables(Span s, String scope) :
     [ (<FROM> | <IN>) database = CompoundIdentifier() ]
     [ <LIKE> regex = StringLiteral() ]
     {
-        return new SqlShowTables(s.end(this), scope, database, regex);
+        return new SqlShowTables(s.end(this), database, regex);
     }
 }
 
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CatalogSchema.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/CatalogSchema.java
@@ -72,7 +72,7 @@ public Catalog getCatalog() {
     return getSubSchema(catalog.currentDatabase());
   }
 
-  public @Nullable Collection<String> databases() {
+  public Collection<String> databases() {
     return catalog.databases();
   }
 
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlShowCatalogs.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlShowCatalogs.java
@@ -29,26 +29,24 @@
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.jdbc.CalcitePrepare;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.runtime.SqlFunctions;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Schema;
-import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlIdentifier;
+import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlCall;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlKind;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlNode;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlOperator;
-import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSetOption;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSpecialOperator;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlUtil;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.parser.SqlParserPos;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class SqlShowCatalogs extends SqlSetOption implements BeamSqlParser.ExecutableStatement {
+public class SqlShowCatalogs extends SqlCall implements BeamSqlParser.ExecutableStatement {
   private static final SqlOperator OPERATOR =
-      new SqlSpecialOperator("SHOW CATALOGS", SqlKind.OTHER);
+      new SqlSpecialOperator("SHOW CATALOGS", SqlKind.OTHER_DDL);
 
   private final boolean showCurrentOnly;
   private final @Nullable SqlNode regex;
 
-  public SqlShowCatalogs(
-      SqlParserPos pos, String scope, boolean showCurrentOnly, @Nullable SqlNode regex) {
-    super(pos, scope, new SqlIdentifier("", pos), null);
+  public SqlShowCatalogs(SqlParserPos pos, boolean showCurrentOnly, @Nullable SqlNode regex) {
+    super(pos);
     this.showCurrentOnly = showCurrentOnly;
     this.regex = regex;
   }
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlShowDatabases.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlShowDatabases.java
@@ -29,31 +29,30 @@
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.jdbc.CalcitePrepare;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.runtime.SqlFunctions;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Schema;
+import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlCall;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlIdentifier;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlKind;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlNode;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlOperator;
-import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSetOption;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSpecialOperator;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlUtil;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.parser.SqlParserPos;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class SqlShowDatabases extends SqlSetOption implements BeamSqlParser.ExecutableStatement {
+public class SqlShowDatabases extends SqlCall implements BeamSqlParser.ExecutableStatement {
   private static final SqlOperator OPERATOR =
-      new SqlSpecialOperator("SHOW DATABASES", SqlKind.OTHER);
+      new SqlSpecialOperator("SHOW DATABASES", SqlKind.OTHER_DDL);
 
   private final boolean showCurrentOnly;
   private final @Nullable SqlIdentifier catalogName;
   private final @Nullable SqlNode regex;
 
   public SqlShowDatabases(
       SqlParserPos pos,
-      String scope,
       boolean showCurrentOnly,
       @Nullable SqlIdentifier catalogName,
       @Nullable SqlNode regex) {
-    super(pos, scope, new SqlIdentifier("", pos), null);
+    super(pos);
     this.showCurrentOnly = showCurrentOnly;
     this.catalogName = catalogName;
     this.regex = regex;
@@ -100,19 +99,16 @@ public void execute(CalcitePrepare.Context context) {
     print(databases, catalogSchema.getCatalog().name(), SqlDdlNodes.getString(regex));
   }
 
-  private static void print(
-      @Nullable Collection<String> databases, String path, @Nullable String pattern) {
+  private static void print(Collection<String> databases, String path, @Nullable String pattern) {
     SqlFunctions.LikeFunction calciteLike = new SqlFunctions.LikeFunction();
 
     final String headerName = "Databases in " + path;
     final String separatorChar = "-";
 
     int nameWidth = headerName.length();
 
-    if (databases != null) {
-      for (String dbName : databases) {
-        nameWidth = Math.max(nameWidth, dbName.length());
-      }
+    for (String dbName : databases) {
+      nameWidth = Math.max(nameWidth, dbName.length());
     }
 
     nameWidth += 2;
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlShowTables.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlShowTables.java
@@ -32,29 +32,27 @@
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.jdbc.CalcitePrepare;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.runtime.SqlFunctions;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.schema.Schema;
+import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlCall;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlIdentifier;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlKind;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlNode;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlOperator;
-import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSetOption;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlSpecialOperator;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlUtil;
 import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.base.Splitter;
 import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.Lists;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
-public class SqlShowTables extends SqlSetOption implements BeamSqlParser.ExecutableStatement {
-  private static final SqlOperator OPERATOR = new SqlSpecialOperator("SHOW TABLES", SqlKind.OTHER);
+public class SqlShowTables extends SqlCall implements BeamSqlParser.ExecutableStatement {
+  private static final SqlOperator OPERATOR =
+      new SqlSpecialOperator("SHOW TABLES", SqlKind.OTHER_DDL);
   private final @Nullable SqlIdentifier databaseName;
   private final @Nullable SqlNode regex;
 
   public SqlShowTables(
-      SqlParserPos pos,
-      String scope,
-      @Nullable SqlIdentifier databaseName,
-      @Nullable SqlNode regex) {
-    super(pos, scope, new SqlIdentifier("", pos), null);
+      SqlParserPos pos, @Nullable SqlIdentifier databaseName, @Nullable SqlNode regex) {
+    super(pos);
     this.databaseName = databaseName;
     this.regex = regex;
   }
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/catalog/Catalog.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/catalog/Catalog.java
@@ -51,7 +51,6 @@ public interface Catalog {
   @Nullable
   String currentDatabase();
 
-  @Nullable
   Collection<String> databases();
 
   /**
diff --git a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/catalog/InMemoryCatalog.java b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/meta/catalog/InMemoryCatalog.java
@@ -99,7 +99,7 @@ public void useDatabase(String database) {
   }
 
   @Override
-  public @Nullable Collection<String> databases() {
+  public Collection<String> databases() {
     return databases;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public boolean createDatabase(String database) {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`		`- public @Nullable Collection<String> databases() {`
	`77`	`+ public Collection<String> databases() {`
`78`	`78`	`return catalogConfig.listNamespaces();`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -267,15 +267,15 @@ SqlDrop SqlDropCatalog(Span s, boolean replace) :`
`267`	`267`	`/**`
`268`	`268`	`* SHOW CATALOGS [ LIKE regex_pattern ]`
`269`	`269`	`*/`
`270`		`-SqlCall SqlShowCatalogs(Span s, String scope) :`
	`270`	`+SqlCall SqlShowCatalogs(Span s) :`
`271`	`271`	`{`
`272`	`272`	`SqlNode regex = null;`
`273`	`273`	`}`
`274`	`274`	`{`
`275`	`275`	`<SHOW> <CATALOGS> { s.add(this); }`
`276`	`276`	`[ <LIKE> regex = StringLiteral() ]`
`277`	`277`	`{`
`278`		`- return new SqlShowCatalogs(s.end(this), scope, false, regex);`
	`278`	`+ return new SqlShowCatalogs(s.end(this), false, regex);`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`
`@@ -350,7 +350,7 @@ SqlDrop SqlDropDatabase(Span s, boolean replace) :`
`350`	`350`	`/**`
`351`	`351`	`* SHOW DATABASES [ ( FROM \| IN )? catalog_name ] [LIKE regex_pattern ]`
`352`	`352`	`*/`
`353`		`-SqlCall SqlShowDatabases(Span s, String scope) :`
	`353`	`+SqlCall SqlShowDatabases(Span s) :`
`354`	`354`	`{`
`355`	`355`	`SqlIdentifier catalogName = null;`
`356`	`356`	`SqlNode regex = null;`
`@@ -360,22 +360,22 @@ SqlCall SqlShowDatabases(Span s, String scope) :`
`360`	`360`	`[ ( <FROM> \| <IN> ) catalogName = SimpleIdentifier() ]`
`361`	`361`	`[ <LIKE> regex = StringLiteral() ]`
`362`	`362`	`{`
`363`		`- return new SqlShowDatabases(s.end(this), scope, false, catalogName, regex);`
	`363`	`+ return new SqlShowDatabases(s.end(this), false, catalogName, regex);`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`
`367`		`-SqlCall SqlShowCurrent(Span s, String scope) :`
	`367`	`+SqlCall SqlShowCurrent(Span s) :`
`368`	`368`	`{`
`369`	`369`	`}`
`370`	`370`	`{`
`371`	`371`	`<SHOW> <CURRENT> { s.add(this); }`
`372`	`372`	`(`
`373`	`373`	`<CATALOG> {`
`374`		`- return new SqlShowCatalogs(s.end(this), scope, true, null);`
	`374`	`+ return new SqlShowCatalogs(s.end(this), true, null);`
`375`	`375`	`}`
`376`	`376`	`\|`
`377`	`377`	`<DATABASE> {`
`378`		`- return new SqlShowDatabases(s.end(this), scope, true, null, null);`
	`378`	`+ return new SqlShowDatabases(s.end(this), true, null, null);`
`379`	`379`	`}`
`380`	`380`	`)`
`381`	`381`	`}`
`@@ -508,7 +508,7 @@ SqlDrop SqlDropTable(Span s, boolean replace) :`
`508`	`508`	`/**`
`509`	`509`	`* SHOW TABLES [ ( FROM \| IN )? [ catalog_name '.' ] database_name ] [ LIKE regex_pattern ]`
`510`	`510`	`*/`
`511`		`-SqlCall SqlShowTables(Span s, String scope) :`
	`511`	`+SqlCall SqlShowTables(Span s) :`
`512`	`512`	`{`
`513`	`513`	`SqlIdentifier database = null;`
`514`	`514`	`SqlNode regex = null;`
`@@ -518,7 +518,7 @@ SqlCall SqlShowTables(Span s, String scope) :`
`518`	`518`	`[ (<FROM> \| <IN>) database = CompoundIdentifier() ]`
`519`	`519`	`[ <LIKE> regex = StringLiteral() ]`
`520`	`520`	`{`
`521`		`- return new SqlShowTables(s.end(this), scope, database, regex);`
	`521`	`+ return new SqlShowTables(s.end(this), database, regex);`
`522`	`522`	`}`
`523`	`523`	`}`
`524`	`524`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public Catalog getCatalog() {`
`72`	`72`	`return getSubSchema(catalog.currentDatabase());`
`73`	`73`	`}`
`74`	`74`
`75`		`- public @Nullable Collection<String> databases() {`
	`75`	`+ public Collection<String> databases() {`
`76`	`76`	`return catalog.databases();`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public void useDatabase(String database) {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`@Override`
`102`		`- public @Nullable Collection<String> databases() {`
	`102`	`+ public Collection<String> databases() {`
`103`	`103`	`return databases;`
`104`	`104`	`}`
`105`	`105`