avoid clang-tidy issue

Tishj · Oct 26, 2023 · 1463eb5 · 1463eb5
1 parent c584eb9
commit 1463eb5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/src/catalog/catalog_set.cpp b/src/catalog/catalog_set.cpp
@@ -31,7 +31,7 @@ class EntryDropper {
 	}
 
 	~EntryDropper() {
-		entry_index.GetEntry().deleted = old_deleted;
+		entry_index.GetEntry<true>().deleted = old_deleted;
 	}
 
 private:

diff --git a/src/include/duckdb/catalog/catalog_set.hpp b/src/include/duckdb/catalog/catalog_set.hpp
@@ -53,8 +53,13 @@ struct EntryValue {
 		Swap(other);
 		return *this;
 	}
+	template <bool UNSAFE = false>
 	CatalogEntry &Entry() {
-		return *entry;
+		if (UNSAFE) {
+			return *entry.get();
+		} else {
+			return *entry;
+		}
 	}
 	unique_ptr<CatalogEntry> TakeEntry() {
 		return std::move(entry);

diff --git a/src/include/duckdb/catalog/mapping_value.hpp b/src/include/duckdb/catalog/mapping_value.hpp
@@ -55,18 +55,22 @@ struct EntryIndex {
 	}
 
 private:
+	template <bool UNSAFE = false>
 	EntryValue &GetEntryInternal(catalog_entry_t index) {
 		auto entry = catalog->entries.find(index);
-		if (entry == catalog->entries.end()) {
+		if (UNSAFE) {
+			D_ASSERT(entry != catalog->entries.end());
+		} else if (entry == catalog->entries.end()) {
 			throw InternalException("EntryIndex - Catalog entry not found!?");
 		}
 		return entry->second;
 	}
 
 public:
+	template <bool UNSAFE = false>
 	CatalogEntry &GetEntry() {
-		auto &entry_value = GetEntryInternal(index);
-		return entry_value.Entry();
+		auto &entry_value = GetEntryInternal<UNSAFE>(index);
+		return entry_value.template Entry<UNSAFE>();
 	}
 	unique_ptr<CatalogEntry> TakeEntry() {
 		auto &entry_value = GetEntryInternal(index);