fix(type): fix tolower calls, add cctype header and apply code formatting

Author: nullccxsy

src/iceberg/type.cc

@@ -28,6 +28,7 @@
 #include <optional>
 #include <ranges>
 #include <string_view>
+
 #include <iceberg/schema_field.h>
 
 #include "iceberg/exception.h"
@@ -82,8 +83,8 @@ std::optional<std::reference_wrapper<const SchemaField>> StructType::GetFieldByN
   if (it == field_name_to_index_.end()) return std::nullopt;
   return fields_[it->second];
 }
-std::optional<std::reference_wrapper<const SchemaField>> StructType::GetFieldByNameCaseInsensitive(
-  std::string_view name) const {
+std::optional<std::reference_wrapper<const SchemaField>>
+StructType::GetFieldByNameCaseInsensitive(std::string_view name) const {
   InitNameToIdMapCaseInsensitive();
   std::string lower_name(name);
   std::ranges::transform(lower_name, lower_name.begin(), ::tolower);
@@ -102,16 +103,16 @@ void StructType::InitNameToIdMap() const {
   if (!field_name_to_index_.empty()) {
     return;
   }
-  
+
   for (int i = 0; i < fields_.size(); i++) {
-    field_name_to_index_[std::string(fields_[i].name())]  = i;
+    field_name_to_index_[std::string(fields_[i].name())] = i;
   }
 }
 void StructType::InitNameToIdMapCaseInsensitive() const {
   if (!caseinsensitive_field_name_to_index_.empty()) {
     return;
   }
-  
+
   for (int i = 0; i < fields_.size(); i++) {
     std::string lowercase_name(fields_[i].name());
     std::ranges::transform(lowercase_name, lowercase_name.begin(), ::tolower);
@@ -160,13 +161,13 @@ std::optional<std::reference_wrapper<const SchemaField>> ListType::GetFieldByNam
   }
   return std::nullopt;
 }
-std::optional<std::reference_wrapper<const SchemaField>> ListType::GetFieldByNameCaseInsensitive(
-    std::string_view name) const {
+std::optional<std::reference_wrapper<const SchemaField>>
+ListType::GetFieldByNameCaseInsensitive(std::string_view name) const {
   auto lower_name_view = name | std::views::transform(::tolower);
   auto lower_field_name = element_.name() | std::views::transform(::tolower);
   if (std::ranges::equal(lower_field_name, lower_name_view)) {
     return std::cref(element_);
-  } 
+  }
   return std::nullopt;
 }
 bool ListType::Equals(const Type& other) const {
@@ -229,11 +230,11 @@ std::optional<std::reference_wrapper<const SchemaField>> MapType::GetFieldByName
   }
   return std::nullopt;
 }
-std::optional<std::reference_wrapper<const SchemaField>> MapType::GetFieldByNameCaseInsensitive(
-    std::string_view name) const {
-  auto lower_name_view  = name | std::views::transform(::tolower);
-  auto lower_key_view = kKeyName | std::views::transform(tolower);
-  auto lower_value_view = kValueName | std::views::transform(tolower);
+std::optional<std::reference_wrapper<const SchemaField>>
+MapType::GetFieldByNameCaseInsensitive(std::string_view name) const {
+  auto lower_name_view = name | std::views::transform(::tolower);
+  auto lower_key_view = kKeyName | std::views::transform(::tolower);
+  auto lower_value_view = kValueName | std::views::transform(::tolower);
   if (std::ranges::equal(lower_key_view, lower_name_view)) {
     return key();
   } else if (std::ranges::equal(lower_value_view, lower_name_view)) {

src/iceberg/type.h

@@ -24,6 +24,7 @@
 /// iceberg/type_fwd.h for the enum defining the list of types.
 
 #include <array>
+#include <cctype>
 #include <cstdint>
 #include <functional>
 #include <memory>
@@ -194,7 +195,7 @@ class ICEBERG_EXPORT MapType : public NestedType {
       std::string_view name) const override;
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldByNameCaseInsensitive(
       std::string_view name) const override;
-      
+
  protected:
   bool Equals(const Type& other) const override;
 

test/type_test.cc

@@ -320,7 +320,8 @@ TEST(TypeTest, List) {
     ASSERT_THAT(list.GetFieldById(5), ::testing::Optional(field));
     ASSERT_THAT(list.GetFieldByIndex(0), ::testing::Optional(field));
     ASSERT_THAT(list.GetFieldByName("element"), ::testing::Optional(field));
-    ASSERT_THAT(list.GetFieldByNameCaseInsensitive("ELEMENT"), ::testing::Optional(field));
+    ASSERT_THAT(list.GetFieldByNameCaseInsensitive("ELEMENT"),
+                ::testing::Optional(field));
 
     ASSERT_EQ(std::nullopt, list.GetFieldById(0));
     ASSERT_EQ(std::nullopt, list.GetFieldByIndex(1));
@@ -355,7 +356,6 @@ TEST(TypeTest, Map) {
     ASSERT_THAT(map.GetFieldByNameCaseInsensitive("KEY"), ::testing::Optional(key));
     ASSERT_THAT(map.GetFieldByNameCaseInsensitive("VALUE"), ::testing::Optional(value));
 
-
     ASSERT_EQ(std::nullopt, map.GetFieldById(0));
     ASSERT_EQ(std::nullopt, map.GetFieldByIndex(2));
     ASSERT_EQ(std::nullopt, map.GetFieldByIndex(-1));
@@ -396,8 +396,10 @@ TEST(TypeTest, Struct) {
     ASSERT_THAT(struct_.GetFieldByIndex(1), ::testing::Optional(field2));
     ASSERT_THAT(struct_.GetFieldByName("foo"), ::testing::Optional(field1));
     ASSERT_THAT(struct_.GetFieldByName("bar"), ::testing::Optional(field2));
-    ASSERT_THAT(struct_.GetFieldByNameCaseInsensitive("FOO"), ::testing::Optional(field1));
-    ASSERT_THAT(struct_.GetFieldByNameCaseInsensitive("Bar"), ::testing::Optional(field2));
+    ASSERT_THAT(struct_.GetFieldByNameCaseInsensitive("FOO"),
+                ::testing::Optional(field1));
+    ASSERT_THAT(struct_.GetFieldByNameCaseInsensitive("Bar"),
+                ::testing::Optional(field2));
 
     ASSERT_EQ(std::nullopt, struct_.GetFieldById(0));
     ASSERT_EQ(std::nullopt, struct_.GetFieldByIndex(2));