This is an automated email from the ASF dual-hosted git repository. yao pushed a commit to branch branch-3.0 in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.0 by this push: new 914b2ff resolve conflicts 914b2ff is described below commit 914b2ff9662e3991775f78f90906a47f6efd08b2 Author: Kent Yao <y...@apache.org> AuthorDate: Wed Mar 23 17:25:47 2022 +0800 resolve conflicts --- .../org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala index 03ec106..77a84e2 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala @@ -673,10 +673,9 @@ class SessionCatalog( } else { requireDbExists(db) if (oldName.database.isDefined || !tempViews.contains(oldTableName)) { - requireTableExists(TableIdentifier(oldTableName, Some(db))) - requireTableNotExists(TableIdentifier(newTableName, Some(db))) validateName(newTableName) - validateNewLocationOfRename(oldName, newName) + validateNewLocationOfRename( + TableIdentifier(oldTableName, Some(db)), TableIdentifier(newTableName, Some(db))) externalCatalog.renameTable(db, oldTableName, newTableName) } else { if (newName.database.isDefined) { @@ -1574,10 +1573,13 @@ class SessionCatalog( private def validateNewLocationOfRename( oldName: TableIdentifier, newName: TableIdentifier): Unit = { + requireTableExists(oldName) + requireTableNotExists(newName) val oldTable = getTableMetadata(oldName) if (oldTable.tableType == CatalogTableType.MANAGED) { + assert(oldName.database.nonEmpty) val databaseLocation = - externalCatalog.getDatabase(oldName.database.getOrElse(currentDb)).locationUri + externalCatalog.getDatabase(oldName.database.get).locationUri val newTableLocation = new Path(new Path(databaseLocation), formatTableName(newName.table)) val fs = newTableLocation.getFileSystem(hadoopConf) if (fs.exists(newTableLocation)) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org