From 9e09875bcb0d9481c9da216723dbb150312ca178 Mon Sep 17 00:00:00 2001 From: ulysses Date: Wed, 17 Jun 2020 18:47:19 +0800 Subject: [PATCH] fix mistake --- .../apache/spark/sql/catalyst/parser/AstBuilder.scala | 2 +- .../spark/sql/catalyst/plans/logical/v2Commands.scala | 2 +- .../spark/sql/catalyst/parser/DDLParserSuite.scala | 9 +++------ .../sql/catalyst/analysis/ResolveSessionCatalog.scala | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) 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 index 8c24129a7f656..5d9b127205717 100644 --- 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 @@ -3652,7 +3652,7 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging override def visitRefreshFunction(ctx: RefreshFunctionContext): LogicalPlan = withOrigin(ctx) { val functionIdentifier = visitMultipartIdentifier(ctx.multipartIdentifier) - RefreshFunction(UnresolvedNamespace(functionIdentifier)) + RefreshFunction(functionIdentifier) } override def visitCommentNamespace(ctx: CommentNamespaceContext): LogicalPlan = withOrigin(ctx) { diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala index d1529cf9ab5d3..3a674b7ac073e 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/v2Commands.scala @@ -520,4 +520,4 @@ case class CommentOnTable(child: LogicalPlan, comment: String) extends Command { /** * The logical plan of the REFRESH FUNCTION command that works for v2 catalogs. */ -case class RefreshFunction(func: LogicalPlan) extends Command +case class RefreshFunction(func: Seq[String]) extends Command diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala index 7efbc509b1c73..5c1c5f60d6e56 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala @@ -2114,12 +2114,9 @@ class DDLParserSuite extends AnalysisTest { } test("REFRESH FUNCTION") { - parseCompare("REFRESH FUNCTION c", - RefreshFunction(UnresolvedNamespace(Seq("c")))) - parseCompare("REFRESH FUNCTION b.c", - RefreshFunction(UnresolvedNamespace(Seq("b", "c")))) - parseCompare("REFRESH FUNCTION a.b.c", - RefreshFunction(UnresolvedNamespace(Seq("a", "b", "c")))) + parseCompare("REFRESH FUNCTION c", RefreshFunction(Seq("c"))) + parseCompare("REFRESH FUNCTION b.c", RefreshFunction(Seq("b", "c"))) + parseCompare("REFRESH FUNCTION a.b.c", RefreshFunction(Seq("a", "b", "c"))) } private case class TableSpec( diff --git a/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala b/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala index dff63337f99d5..7272eb8daa047 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveSessionCatalog.scala @@ -612,9 +612,9 @@ class ResolveSessionCatalog( replace) } - case RefreshFunction(ResolvedNamespace(_, ns)) => + case RefreshFunction(func) => val FunctionIdentifier(function, database) = - parseSessionCatalogFunctionIdentifier(ns, "REFRESH FUNCTION") + parseSessionCatalogFunctionIdentifier(func, "REFRESH FUNCTION") // Fallback to v1 command RefreshFunctionCommand(database, function) }