Skip to content

Commit d666a4e

Browse files
author
nullccxsy
committed
rename once_flag in schema
1 parent 4f5bd35 commit d666a4e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/iceberg/schema.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ Result<std::optional<std::reference_wrapper<const SchemaField>>> Schema::FindFie
9090
std::string_view name, bool case_sensitive) const {
9191
if (case_sensitive) {
9292
ICEBERG_RETURN_UNEXPECTED(
93-
LazyInitWithCallOnce(name_flag_, [this]() { return InitNameToIdMap(); }));
93+
LazyInitWithCallOnce(name_to_id_flag_, [this]() { return InitNameToIdMap(); }));
9494
auto it = name_to_id_.find(name);
9595
if (it == name_to_id_.end()) return std::nullopt;
9696
return FindFieldById(it->second);
9797
}
9898
ICEBERG_RETURN_UNEXPECTED(LazyInitWithCallOnce(
99-
lowercase_name_flag_, [this]() { return InitLowerCaseNameToIdMap(); }));
99+
lowercase_name_to_id_flag_, [this]() { return InitLowerCaseNameToIdMap(); }));
100100
auto it = lowercase_name_to_id_.find(StringUtils::ToLower(name));
101101
if (it == lowercase_name_to_id_.end()) return std::nullopt;
102102
return FindFieldById(it->second);
@@ -136,7 +136,7 @@ Status Schema::InitLowerCaseNameToIdMap() const {
136136
Result<std::optional<std::reference_wrapper<const SchemaField>>> Schema::FindFieldById(
137137
int32_t field_id) const {
138138
ICEBERG_RETURN_UNEXPECTED(
139-
LazyInitWithCallOnce(id_flag_, [this]() { return InitIdToFieldMap(); }));
139+
LazyInitWithCallOnce(id_to_field_flag_, [this]() { return InitIdToFieldMap(); }));
140140
auto it = id_to_field_.find(field_id);
141141
if (it == id_to_field_.end()) {
142142
return std::nullopt;

src/iceberg/schema.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class ICEBERG_EXPORT Schema : public StructType {
8383
Status InitNameToIdMap() const;
8484
Status InitLowerCaseNameToIdMap() const;
8585

86-
std::optional<int32_t> schema_id_;
86+
const std::optional<int32_t> schema_id_;
8787
/// Mapping from field id to field.
8888
mutable std::unordered_map<int32_t, std::reference_wrapper<const SchemaField>>
8989
id_to_field_;
@@ -94,9 +94,9 @@ class ICEBERG_EXPORT Schema : public StructType {
9494
mutable std::unordered_map<std::string, int32_t, StringHash, std::equal_to<>>
9595
lowercase_name_to_id_;
9696

97-
mutable std::once_flag id_flag_;
98-
mutable std::once_flag name_flag_;
99-
mutable std::once_flag lowercase_name_flag_;
97+
mutable std::once_flag id_to_field_flag_;
98+
mutable std::once_flag name_to_id_flag_;
99+
mutable std::once_flag lowercase_name_to_id_flag_;
100100
};
101101

102102
} // namespace iceberg

0 commit comments

Comments
 (0)