Remove useless func

pingcap · Aug 13, 2024 · ff13cae · ff13cae
1 parent 6458415
commit ff13cae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/dbms/src/Storages/S3/FileCache.cpp b/dbms/src/Storages/S3/FileCache.cpp
@@ -333,22 +333,18 @@ void FileCache::removeDiskFile(const String & local_fname, bool update_fsize_met
     }
 }
 
-void FileCache::remove(std::unique_lock<std::mutex> &, const String & s3_key, bool force)
+void FileCache::remove(const String & s3_key, bool force)
 {
     auto file_type = getFileType(s3_key);
     auto & table = tables[static_cast<UInt64>(file_type)];
+
+    std::unique_lock lock(mtx);
     auto f = table.get(s3_key, /*update_lru*/ false);
     if (f == nullptr)
         return;
     std::ignore = removeImpl(table, s3_key, f, force);
 }
 
-void FileCache::remove(const String & s3_key, bool force)
-{
-    std::unique_lock lock(mtx);
-    remove(lock, s3_key, force);
-}
-
 std::pair<Int64, std::list<String>::iterator> FileCache::removeImpl(
     LRUFileTable & table,
     const String & s3_key,

diff --git a/dbms/src/Storages/S3/FileCache.h b/dbms/src/Storages/S3/FileCache.h
@@ -270,7 +270,6 @@ class FileCache
     void restoreTable(const std::filesystem::directory_entry & table_entry);
     void restoreDMFile(const std::filesystem::directory_entry & dmfile_entry);
 
-    void remove(std::unique_lock<std::mutex> & cache_lock, const String & s3_key, bool force = false);
     void remove(const String & s3_key, bool force = false);
     std::pair<Int64, std::list<String>::iterator> removeImpl(
         LRUFileTable & table,

diff --git a/dbms/src/TiDB/Schema/TiDB.cpp b/dbms/src/TiDB/Schema/TiDB.cpp
@@ -28,13 +28,13 @@
 #include <TiDB/Decode/Vector.h>
 #include <TiDB/Schema/SchemaNameMapper.h>
 #include <TiDB/Schema/TiDB.h>
+#include <TiDB/Schema/VectorIndex.h>
 #include <common/logger_useful.h>
 #include <tipb/executor.pb.h>
 
 #include <algorithm>
 #include <cmath>
 #include <magic_enum.hpp>
-#include "TiDB/Schema/VectorIndex.h"
 
 namespace DB
 {

diff --git a/dbms/src/TiDB/Schema/VectorIndex.h b/dbms/src/TiDB/Schema/VectorIndex.h
@@ -31,7 +31,7 @@ struct VectorIndexDefinition
     UInt64 dimension = 0;
     tipb::VectorDistanceMetric distance_metric = tipb::VectorDistanceMetric::INVALID_DISTANCE_METRIC;
 
-    // TODO: There are possibly more fields, like efConstruct.
+    // TODO(vector-index): There are possibly more fields, like efConstruct.
     // Will be added later.
 };