From e85f495d59648d25021afd84871903f5f4429ace Mon Sep 17 00:00:00 2001
From: Wenchen Fan <wenchen@databricks.com>
Date: Wed, 7 Aug 2019 16:36:03 +0800
Subject: [PATCH] address comments

---
 .../org/apache/spark/sql/catalog/v2/CatalogManager.scala  | 6 +++---
 .../org/apache/spark/sql/catalog/v2/LookupCatalog.scala   | 4 ++--
 .../sql/catalyst/catalog/v2/LookupCatalogSuite.scala      | 4 ++--
 .../spark/sql/execution/command/PlanResolutionSuite.scala | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/CatalogManager.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/CatalogManager.scala
index 652f17a05d2a2..26444261d4d27 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/CatalogManager.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/CatalogManager.scala
@@ -44,7 +44,7 @@ class CatalogManager(conf: SQLConf) extends Logging {
   /**
    * Returns the default catalog specified by config.
    */
-  def defaultCatalog(): Option[CatalogPlugin] = {
+  def defaultCatalog: Option[CatalogPlugin] = {
     conf.defaultV2Catalog.flatMap { catalogName =>
       try {
         Some(catalog(catalogName))
@@ -56,7 +56,7 @@ class CatalogManager(conf: SQLConf) extends Logging {
     }
   }
 
-  def v2SessionCatalog(): Option[CatalogPlugin] = {
+  def v2SessionCatalog: Option[CatalogPlugin] = {
     try {
       Some(catalog(CatalogManager.SESSION_CATALOG_NAME))
     } catch {
@@ -67,7 +67,7 @@ class CatalogManager(conf: SQLConf) extends Logging {
   }
 
   // Clear all the registered catalogs. Only used in tests.
-  def reset(): Unit = catalogs.clear()
+  private[sql] def reset(): Unit = catalogs.clear()
 }
 
 object CatalogManager {
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/LookupCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/LookupCatalog.scala
index 9d378c10c0431..fe2b320e5d46c 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/LookupCatalog.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalog/v2/LookupCatalog.scala
@@ -37,7 +37,7 @@ trait LookupCatalog extends Logging {
    * If this is None and a table's provider (source) is a v2 provider, the v2 session catalog will
    * be used.
    */
-  def defaultCatalog: Option[CatalogPlugin] = catalogManager.defaultCatalog()
+  def defaultCatalog: Option[CatalogPlugin] = catalogManager.defaultCatalog
 
   /**
    * This catalog is a v2 catalog that delegates to the v1 session catalog. it is used when the
@@ -45,7 +45,7 @@ trait LookupCatalog extends Logging {
    * This happens when the source implementation extends the v2 TableProvider API and is not listed
    * in the fallback configuration, spark.sql.sources.write.useV1SourceList
    */
-  def sessionCatalog: Option[CatalogPlugin] = catalogManager.v2SessionCatalog()
+  def sessionCatalog: Option[CatalogPlugin] = catalogManager.v2SessionCatalog
 
   /**
    * Extract catalog plugin and remaining identifier names.
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/v2/LookupCatalogSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/v2/LookupCatalogSuite.scala
index ef9c124f61d15..229ed22b507a3 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/v2/LookupCatalogSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/catalog/v2/LookupCatalogSuite.scala
@@ -44,7 +44,7 @@ class LookupCatalogSuite extends SparkFunSuite with LookupCatalog with Inside {
       val name = invocation.getArgument[String](0)
       catalogs.getOrElse(name, throw new CatalogNotFoundException(s"$name not found"))
     })
-    when(manager.defaultCatalog()).thenReturn(None)
+    when(manager.defaultCatalog).thenReturn(None)
     manager
   }
 
@@ -136,7 +136,7 @@ class LookupCatalogWithDefaultSuite extends SparkFunSuite with LookupCatalog wit
       val name = invocation.getArgument[String](0)
       catalogs.getOrElse(name, throw new CatalogNotFoundException(s"$name not found"))
     })
-    when(manager.defaultCatalog()).thenReturn(catalogs.get("prod"))
+    when(manager.defaultCatalog).thenReturn(catalogs.get("prod"))
     manager
   }
 
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/PlanResolutionSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/PlanResolutionSuite.scala
index afc64009015d0..646d665ab63e7 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/PlanResolutionSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/PlanResolutionSuite.scala
@@ -67,8 +67,8 @@ class PlanResolutionSuite extends AnalysisTest {
             throw new CatalogNotFoundException(s"No such catalog: $name")
         }
       })
-      when(manager.defaultCatalog()).thenReturn(Some(testCat))
-      when(manager.v2SessionCatalog()).thenCallRealMethod()
+      when(manager.defaultCatalog).thenReturn(Some(testCat))
+      when(manager.v2SessionCatalog).thenCallRealMethod()
       manager
     }
   }
@@ -86,8 +86,8 @@ class PlanResolutionSuite extends AnalysisTest {
             throw new CatalogNotFoundException(s"No such catalog: $name")
         }
       })
-      when(manager.defaultCatalog()).thenReturn(None)
-      when(manager.v2SessionCatalog()).thenCallRealMethod()
+      when(manager.defaultCatalog).thenReturn(None)
+      when(manager.v2SessionCatalog).thenCallRealMethod()
       manager
     }
   }