Review comments

szehon-ho · Jul 9, 2024 · 7125656 · 7125656
1 parent 8278aeb
commit 7125656
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4 b/sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4
@@ -832,7 +832,7 @@ relationPrimary
     ;
 
 optionsClause
-    : WITH OPTIONS options=propertyList
+    : WITH options=propertyList
     ;
 
 inlineTable

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala
@@ -2969,16 +2969,16 @@ class AstBuilder extends DataTypeAstBuilder with SQLConfHelper with Logging {
   }
 
   /**
-   * Create an [[UnresolvedRelation]] from an identifier reference.
-   */
-  private def createUnresolvedRelation(identifier: IdentifierReferenceContext,
-      optionsClause: Option[OptionsClauseContext] = None): LogicalPlan =
-    withOrigin(identifier) {
-      val options = optionsClause.map{clause =>
-        new CaseInsensitiveStringMap(visitPropertyKeyValues(clause.options).asJava)
-      }.getOrElse(CaseInsensitiveStringMap.empty)
-      withIdentClause(identifier, parts =>
-        new UnresolvedRelation(parts, options, isStreaming = false))
+   * Create an [[UnresolvedRelation]] from an identifier reference and an options clause.
+   */
+  private def createUnresolvedRelation(
+      ctx: IdentifierReferenceContext,
+      optionsClause: Option[OptionsClauseContext] = None): LogicalPlan = withOrigin(ctx) {
+    val options = optionsClause.map{ clause =>
+      new CaseInsensitiveStringMap(visitPropertyKeyValues(clause.options).asJava)
+    }.getOrElse(CaseInsensitiveStringMap.empty)
+    withIdentClause(ctx, parts =>
+      new UnresolvedRelation(parts, options, isStreaming = false))
   }
 
   /**

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala
@@ -3522,7 +3522,7 @@ class DataSourceV2SQLSuiteV1Filter
       assert (collected.size == 1)
       checkAnswer(df, Seq(Row(1, "a"), Row(2, "b")))
 
-      df = sql(s"SELECT * FROM $t1 WITH OPTIONS (`split-size` = 5)")
+      df = sql(s"SELECT * FROM $t1 WITH (`split-size` = 5)")
       collected = df.queryExecution.optimizedPlan.collect {
         case scan: DataSourceV2ScanRelation =>
           assert(scan.relation.options.get("split-size") == "5")
@@ -3531,7 +3531,7 @@ class DataSourceV2SQLSuiteV1Filter
       checkAnswer(df, Seq(Row(1, "a"), Row(2, "b")))
 
       val noValues = intercept[AnalysisException](
-        sql(s"SELECT * FROM $t1 WITH OPTIONS (`split-size`)"))
+        sql(s"SELECT * FROM $t1 WITH (`split-size`)"))
       assert(noValues.message.contains(
         "Operation not allowed: Values must be specified for key(s): [split-size]"))
     }