fix comments

Author: nullccxsy

src/iceberg/schema.cc

@@ -45,7 +45,7 @@ class IdToFieldVisitor {
 class NameToIdVisitor {
  public:
   explicit NameToIdVisitor(
-      std::unordered_map<std::string, int32_t, string_hash, std::equal_to<>>& name_to_id,
+      std::unordered_map<std::string, int32_t, StringHash, std::equal_to<>>& name_to_id,
       bool case_sensitive = true,
       std::function<std::string(std::string_view)> quoting_func = {});
   Status Visit(const ListType& type, const std::string& path,
@@ -64,9 +64,8 @@ class NameToIdVisitor {
 
  private:
   bool case_sensitive_;
-  std::unordered_map<std::string, int32_t, string_hash, std::equal_to<>>& name_to_id_;
-  std::unordered_map<std::string, int32_t, string_hash, std::equal_to<>>
-      short_name_to_id_;
+  std::unordered_map<std::string, int32_t, StringHash, std::equal_to<>>& name_to_id_;
+  std::unordered_map<std::string, int32_t, StringHash, std::equal_to<>> short_name_to_id_;
   std::function<std::string(std::string_view)> quoting_func_;
 };
 
@@ -150,7 +149,7 @@ IdToFieldVisitor::IdToFieldVisitor(
 Status IdToFieldVisitor::Visit(const PrimitiveType& type) { return {}; }
 
 Status IdToFieldVisitor::Visit(const NestedType& type) {
-  const auto& nested = iceberg::internal::checked_cast<const NestedType&>(type);
+  const auto& nested = internal::checked_cast<const NestedType&>(type);
   const auto& fields = nested.fields();
   for (const auto& field : fields) {
     auto it = id_to_field_.try_emplace(field.field_id(), std::cref(field));
@@ -163,7 +162,7 @@ Status IdToFieldVisitor::Visit(const NestedType& type) {
 }
 
 NameToIdVisitor::NameToIdVisitor(
-    std::unordered_map<std::string, int32_t, string_hash, std::equal_to<>>& name_to_id,
+    std::unordered_map<std::string, int32_t, StringHash, std::equal_to<>>& name_to_id,
     bool case_sensitive, std::function<std::string(std::string_view)> quoting_func)
     : name_to_id_(name_to_id),
       case_sensitive_(case_sensitive),

src/iceberg/schema.h

@@ -74,28 +74,26 @@ class ICEBERG_EXPORT Schema : public StructType {
 
   friend bool operator==(const Schema& lhs, const Schema& rhs) { return lhs.Equals(rhs); }
 
- private:
-  /// Mapping from field id to field.
-  mutable std::unordered_map<int32_t, std::reference_wrapper<const SchemaField>>
-      id_to_field_;
-  /// Mapping from field name to field id.
-  mutable std::unordered_map<std::string, int32_t, string_hash, std::equal_to<>>
-      name_to_id_;
-  /// Mapping from lowercased field name to field id
-  mutable std::unordered_map<std::string, int32_t, string_hash, std::equal_to<>>
-      lowercase_name_to_id_;
-
  private:
   /// \brief Compare two schemas for equality.
   [[nodiscard]] bool Equals(const Schema& other) const;
 
-  const std::optional<int32_t> schema_id_;
-
   // TODO(nullccxsy): Address potential concurrency issues in lazy initialization (e.g.,
   // use std::call_once)
   Status InitIdToFieldMap() const;
   Status InitNameToIdMap() const;
   Status InitLowerCaseNameToIdMap() const;
+
+  const std::optional<int32_t> schema_id_;
+  /// Mapping from field id to field.
+  mutable std::unordered_map<int32_t, std::reference_wrapper<const SchemaField>>
+      id_to_field_;
+  /// Mapping from field name to field id.
+  mutable std::unordered_map<std::string, int32_t, StringHash, std::equal_to<>>
+      name_to_id_;
+  /// Mapping from lowercased field name to field id
+  mutable std::unordered_map<std::string, int32_t, StringHash, std::equal_to<>>
+      lowercase_name_to_id_;
 };
 
 }  // namespace iceberg

src/iceberg/util/macros.h

@@ -19,12 +19,12 @@
 
 #pragma once
 
-#define ICEBERG_RETURN_UNEXPECTED(result)                         \
-  do {                                                            \
-    auto&& iceberg_temp_result = (result);                        \
-    if (!iceberg_temp_result) [[unlikely]] {                      \
-      return std::unexpected<Error>(iceberg_temp_result.error()); \
-    }                                                             \
+#define ICEBERG_RETURN_UNEXPECTED(result)                 \
+  do {                                                    \
+    auto&& result_name = (result);                        \
+    if (!result_name) [[unlikely]] {                      \
+      return std::unexpected<Error>(result_name.error()); \
+    }                                                     \
   } while (false);
 
 #define ICEBERG_ASSIGN_OR_RAISE_IMPL(result_name, lhs, rexpr) \

src/iceberg/util/string_util.h

@@ -50,7 +50,7 @@ class ICEBERG_EXPORT StringUtils {
 ///
 /// Enables std::unordered_map to directly accept std::string_view lookup keys
 /// without creating temporary std::string objects, using C++20's transparent lookup.
-struct ICEBERG_EXPORT string_hash {
+struct ICEBERG_EXPORT StringHash {
   using hash_type = std::hash<std::string_view>;
   using is_transparent = void;