Remove unused code

pingcap · Nov 23, 2023 · 86e899a · 86e899a
1 parent 781dfd4
commit 86e899a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 344 deletions.
diff --git a/dbms/src/Storages/tests/gtest_filter_parser.cpp b/dbms/src/Storages/tests/gtest_filter_parser.cpp
@@ -29,7 +29,6 @@
 #include <Storages/DeltaMerge/Index/RSResult.h>
 #include <Storages/KVStore/TMTContext.h>
 #include <TestUtils/TiFlashTestBasic.h>
-#include <TiDB/Schema/SchemaBuilder-internal.h>
 #include <TiDB/Schema/SchemaNameMapper.h>
 #include <common/logger_useful.h>
 

diff --git a/dbms/src/Storages/tests/gtests_parse_push_down_filter.cpp b/dbms/src/Storages/tests/gtests_parse_push_down_filter.cpp
@@ -25,7 +25,6 @@
 #include <Storages/StorageDeltaMerge.h>
 #include <TestUtils/FunctionTestUtils.h>
 #include <TestUtils/TiFlashTestBasic.h>
-#include <TiDB/Schema/SchemaBuilder-internal.h>
 #include <common/logger_useful.h>
 
 #include <regex>

diff --git a/dbms/src/TiDB/Schema/SchemaBuilder-internal.h b/dbms/src/TiDB/Schema/SchemaBuilder-internal.h
diff --git a/dbms/src/TiDB/Schema/SchemaBuilder.cpp b/dbms/src/TiDB/Schema/SchemaBuilder.cpp
@@ -39,7 +39,6 @@
 #include <Storages/KVStore/TMTContext.h>
 #include <Storages/MutableSupport.h>
 #include <TiDB/Decode/TypeMapping.h>
-#include <TiDB/Schema/SchemaBuilder-internal.h>
 #include <TiDB/Schema/SchemaBuilder.h>
 #include <TiDB/Schema/SchemaNameMapper.h>
 #include <TiDB/Schema/TiDB.h>
@@ -367,7 +366,10 @@ void SchemaBuilder<Getter, NameMapper>::applySetTiFlashReplica(DatabaseID databa
         auto storage = tmt_context.getStorages().get(keyspace_id, table_info->id);
         if (unlikely(storage == nullptr))
         {
-            LOG_ERROR(log, "table is not exist in TiFlash, applySetTiFlashReplica is ignored, table_id={}", table_id);
+            LOG_ERROR(
+                log,
+                "Storage instance is not exist in TiFlash, applySetTiFlashReplica is ignored, table_id={}",
+                table_id);
             return;
         }
 
@@ -492,7 +494,10 @@ void SchemaBuilder<Getter, NameMapper>::applyPartitionDiff(DatabaseID database_i
     auto storage = tmt_context.getStorages().get(keyspace_id, table_info->id);
     if (storage == nullptr)
     {
-        LOG_ERROR(log, "table is not exist in TiFlash, table_id={}", table_id);
+        LOG_ERROR(
+            log,
+            "logical_table storage instance is not exist in TiFlash, applyPartitionDiff is ignored, table_id={}",
+            table_id);
         return;
     }
 
@@ -608,7 +613,10 @@ void SchemaBuilder<Getter, NameMapper>::applyRenameTable(DatabaseID database_id,
     auto storage = tmt_context.getStorages().get(keyspace_id, table_id);
     if (storage == nullptr)
     {
-        LOG_WARNING(log, "table is not exist in TiFlash, applyRenameTable is ignored, table_id={}", table_id);
+        LOG_WARNING(
+            log,
+            "Storage instance is not exist in TiFlash, applyRenameTable is ignored, table_id={}",
+            table_id);
         return;
     }
 
@@ -633,7 +641,8 @@ void SchemaBuilder<Getter, NameMapper>::applyRenameLogicalTable(
             {
                 LOG_ERROR(
                     log,
-                    "table is not exist in TiFlash, applyRenamePhysicalTable is ignored, physical_table_id={}",
+                    "Storage instance is not exist in TiFlash, applyRenamePhysicalTable is ignored, "
+                    "physical_table_id={}",
                     part_def.id);
                 return;
             }
@@ -1165,24 +1174,27 @@ void SchemaBuilder<Getter, NameMapper>::syncAllSchema()
     for (const auto & db : all_schemas)
     {
         auto task = [this, db, &created_db_set, &created_db_set_mutex] {
+            do
             {
-                std::shared_lock<std::shared_mutex> shared_lock(shared_mutex_for_databases);
-                if (databases.find(db->id) == databases.end())
                 {
-                    shared_lock.unlock();
-                    applyCreateSchema(db);
+                    std::shared_lock<std::shared_mutex> shared_lock(shared_mutex_for_databases);
+                    if (databases.find(db->id) != databases.end())
                     {
-                        std::unique_lock<std::mutex> created_db_set_lock(created_db_set_mutex);
-                        created_db_set.emplace(name_mapper.mapDatabaseName(*db));
+                        break;
                     }
-
-                    LOG_INFO(
-                        log,
-                        "Database {} created during sync all schemas, database_id={}",
-                        name_mapper.debugDatabaseName(*db),
-                        db->id);
+                } // release lock on `databases`
+                applyCreateSchema(db);
+                {
+                    std::unique_lock<std::mutex> created_db_set_lock(created_db_set_mutex);
+                    created_db_set.emplace(name_mapper.mapDatabaseName(*db));
                 }
-            }
+
+                LOG_INFO(
+                    log,
+                    "Database {} created during sync all schemas, database_id={}",
+                    name_mapper.debugDatabaseName(*db),
+                    db->id);
+            } while (false);
 
             std::vector<TableInfoPtr> tables = getter.listTables(db->id);
             for (auto & table : tables)