address comments

apache · Mar 30, 2021 · 3ef5b5f · 3ef5b5f
1 parent f50d87b
commit 3ef5b5f
Showing 1 changed file with 12 additions and 11 deletions.
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
@@ -511,21 +511,17 @@ case class ShowTables(
   override def children: Seq[LogicalPlan] = Seq(namespace)
 }
 
-trait ShowTablesLegacyHelper {
-  def getOutputAttrs: Seq[Attribute]
-
-  def getLegacyOutputAttrs: Seq[Attribute] = {
-    val output = getOutputAttrs
-    output.head.withName("database") +: output.slice(1, output.length - 1)
-  }
-}
-
-object ShowTables extends ShowTablesLegacyHelper {
+object ShowTables {
   def getOutputAttrs: Seq[Attribute] = Seq(
     AttributeReference("namespace", StringType, nullable = false)(),
     AttributeReference("tableName", StringType, nullable = false)(),
     AttributeReference("isTemporary", BooleanType, nullable = false)(),
     AttributeReference("tableType", StringType, nullable = false)())
+
+  def getLegacyOutputAttrs: Seq[Attribute] = {
+    val output = getOutputAttrs
+    output.head.withName("database") +: output.slice(1, output.length - 1)
+  }
 }
 
 /**
@@ -539,13 +535,18 @@ case class ShowTableExtended(
   override def children: Seq[LogicalPlan] = namespace :: Nil
 }
 
-object ShowTableExtended extends ShowTablesLegacyHelper {
+object ShowTableExtended {
   def getOutputAttrs: Seq[Attribute] = Seq(
     AttributeReference("namespace", StringType, nullable = false)(),
     AttributeReference("tableName", StringType, nullable = false)(),
     AttributeReference("isTemporary", BooleanType, nullable = false)(),
     AttributeReference("information", StringType, nullable = false)(),
     AttributeReference("tableType", StringType, nullable = false)())
+
+  def getLegacyOutputAttrs: Seq[Attribute] = {
+    val output = getOutputAttrs
+    output.head.withName("database") +: output.slice(1, output.length - 1)
+  }
 }
 
 /**