From 7c0dc224d7b77dfe16b3988b1ba18c5b691687fd Mon Sep 17 00:00:00 2001
From: David Phillips <david@acz.org>
Date: Tue, 11 Jan 2022 15:21:24 -0800
Subject: [PATCH] Rename parameter for setSchemaAuthorization

---
 .../src/test/java/io/trino/connector/MockConnector.java       | 2 +-
 .../main/java/io/trino/spi/connector/ConnectorMetadata.java   | 2 +-
 .../base/classloader/ClassLoaderSafeConnectorMetadata.java    | 4 ++--
 .../src/main/java/io/trino/plugin/hive/HiveMetadata.java      | 4 ++--
 .../main/java/io/trino/plugin/iceberg/IcebergMetadata.java    | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/trino-main/src/test/java/io/trino/connector/MockConnector.java b/core/trino-main/src/test/java/io/trino/connector/MockConnector.java
index 3643d2f4bdb6..74c4fc508e06 100644
--- a/core/trino-main/src/test/java/io/trino/connector/MockConnector.java
+++ b/core/trino-main/src/test/java/io/trino/connector/MockConnector.java
@@ -317,7 +317,7 @@ public void createSchema(ConnectorSession session, String schemaName, Map<String
         public void renameSchema(ConnectorSession session, String source, String target) {}
 
         @Override
-        public void setSchemaAuthorization(ConnectorSession session, String source, TrinoPrincipal principal) {}
+        public void setSchemaAuthorization(ConnectorSession session, String schemaName, TrinoPrincipal principal) {}
 
         @Override
         public void dropSchema(ConnectorSession session, String schemaName) {}
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
index 6d9685f722f1..ae45f763b0e6 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/ConnectorMetadata.java
@@ -349,7 +349,7 @@ default void renameSchema(ConnectorSession session, String source, String target
     /**
      * Sets the user/role on the specified schema.
      */
-    default void setSchemaAuthorization(ConnectorSession session, String source, TrinoPrincipal principal)
+    default void setSchemaAuthorization(ConnectorSession session, String schemaName, TrinoPrincipal principal)
     {
         throw new TrinoException(NOT_SUPPORTED, "This connector does not support setting an owner on a schema");
     }
diff --git a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
index ca713cecdc4e..173eb60f66c9 100644
--- a/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
+++ b/lib/trino-plugin-toolkit/src/main/java/io/trino/plugin/base/classloader/ClassLoaderSafeConnectorMetadata.java
@@ -391,10 +391,10 @@ public void renameSchema(ConnectorSession session, String source, String target)
     }
 
     @Override
-    public void setSchemaAuthorization(ConnectorSession session, String source, TrinoPrincipal principal)
+    public void setSchemaAuthorization(ConnectorSession session, String schemaName, TrinoPrincipal principal)
     {
         try (ThreadContextClassLoader ignored = new ThreadContextClassLoader(classLoader)) {
-            delegate.setSchemaAuthorization(session, source, principal);
+            delegate.setSchemaAuthorization(session, schemaName, principal);
         }
     }
 
diff --git a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
index ad560f86cee0..79081a900fff 100644
--- a/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
+++ b/plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveMetadata.java
@@ -829,9 +829,9 @@ public void renameSchema(ConnectorSession session, String source, String target)
     }
 
     @Override
-    public void setSchemaAuthorization(ConnectorSession session, String source, TrinoPrincipal principal)
+    public void setSchemaAuthorization(ConnectorSession session, String schemaName, TrinoPrincipal principal)
     {
-        metastore.setDatabaseOwner(new HiveIdentity(session), source, HivePrincipal.from(principal));
+        metastore.setDatabaseOwner(new HiveIdentity(session), schemaName, HivePrincipal.from(principal));
     }
 
     @Override
diff --git a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
index a10d807fcd9f..437260fa8fc5 100644
--- a/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
+++ b/plugin/trino-iceberg/src/main/java/io/trino/plugin/iceberg/IcebergMetadata.java
@@ -397,9 +397,9 @@ public void renameSchema(ConnectorSession session, String source, String target)
     }
 
     @Override
-    public void setSchemaAuthorization(ConnectorSession session, String source, TrinoPrincipal principal)
+    public void setSchemaAuthorization(ConnectorSession session, String schemaName, TrinoPrincipal principal)
     {
-        catalog.setNamespacePrincipal(session, source, principal);
+        catalog.setNamespacePrincipal(session, schemaName, principal);
     }
 
     @Override