From 92b58f8b9158d8dc3d347fe8df91b1c9940805c8 Mon Sep 17 00:00:00 2001
From: elijah <f1renze.142857@gmail.com>
Date: Wed, 18 Jan 2023 00:57:50 +0800
Subject: [PATCH] fix: create table after rename table

---
 src/datanode/src/tests/instance_test.rs | 53 +++++++++++++++++++++++++
 src/mito/src/engine.rs                  |  7 ++--
 2 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/datanode/src/tests/instance_test.rs b/src/datanode/src/tests/instance_test.rs
index 89e7f3c4067d..cf72679ccea0 100644
--- a/src/datanode/src/tests/instance_test.rs
+++ b/src/datanode/src/tests/instance_test.rs
@@ -343,6 +343,7 @@ pub async fn test_execute_create() {
 }
 
 #[tokio::test]
+#[should_panic]
 async fn test_rename_table() {
     let instance = MockInstance::new("test_rename_table_local").await;
 
@@ -392,6 +393,58 @@ async fn test_rename_table() {
 "
     .to_string();
     check_output_stream(output, expected).await;
+
+    execute_sql_in_db(&instance, "select * from demo", "db").await;
+}
+
+#[tokio::test]
+async fn test_create_table_after_rename_table() {
+    let instance = MockInstance::new("test_rename_table_local").await;
+
+    let output = execute_sql(&instance, "create database db").await;
+    assert!(matches!(output, Output::AffectedRows(1)));
+
+    // create test table
+    let table_name = "demo";
+    let output = execute_sql_in_db(
+        &instance,
+        &format!("create table {table_name}(host string, cpu double, memory double, ts timestamp, time index(ts))"),
+        "db",
+    )
+        .await;
+    assert!(matches!(output, Output::AffectedRows(0)));
+
+    // rename table
+    let new_table_name = "test_table";
+    let output = execute_sql_in_db(
+        &instance,
+        &format!("alter table {table_name} rename {new_table_name}"),
+        "db",
+    )
+    .await;
+    assert!(matches!(output, Output::AffectedRows(0)));
+
+    // create table with same name
+    // create test table
+    let output = execute_sql_in_db(
+        &instance,
+        &format!("create table {table_name}(host string, cpu double, memory double, ts timestamp, time index(ts))"),
+        "db",
+    )
+        .await;
+    assert!(matches!(output, Output::AffectedRows(0)));
+
+    let expect = "\
++------------+
+| Tables     |
++------------+
+| demo       |
+| test_table |
++------------+\
+"
+    .to_string();
+    let output = execute_sql_in_db(&instance, "show tables", "db").await;
+    check_output_stream(output, expect).await;
 }
 
 #[tokio::test(flavor = "multi_thread")]
diff --git a/src/mito/src/engine.rs b/src/mito/src/engine.rs
index b837f168808d..757cb6196be9 100644
--- a/src/mito/src/engine.rs
+++ b/src/mito/src/engine.rs
@@ -524,11 +524,10 @@ impl<S: StorageEngine> MitoEngineInner<S> {
             .context(error::AlterTableSnafu { table_name })?;
 
         if let AlterKind::RenameTable { new_table_name } = &req.alter_kind {
-            table_ref.table = new_table_name.as_str();
-            let full_table_name = table_ref.to_string();
             let mut tables = self.tables.write().unwrap();
-            tables.remove(&full_table_name);
-            tables.insert(full_table_name, table.clone());
+            tables.remove(&table_ref.to_string());
+            table_ref.table = new_table_name.as_str();
+            tables.insert(table_ref.to_string(), table.clone());
         }
         Ok(table)
     }