fmt

Author: HeartLinked

src/iceberg/expression/literal.cc

@@ -22,8 +22,6 @@
 #include <cmath>
 #include <concepts>
 
-#include <iceberg/result.h>
-
 #include "iceberg/exception.h"
 
 namespace iceberg {
@@ -284,8 +282,7 @@ Result<Literal> LiteralCaster::CastFromFixed(
     }
     case TypeId::kFixed: {
       auto target_fixed_type = std::dynamic_pointer_cast<FixedType>(target_type);
-      if (fixed_val.size() ==
-          target_fixed_type->length()) {  // 长度匹配，可以认为是同类型转换，直接返回自身
+      if (fixed_val.size() == target_fixed_type->length()) {
         return literal;
       }
       return NotSupported("Cannot cast Fixed({}) to Fixed({}) due to mismatched lengths",
@@ -468,11 +465,12 @@ std::string Literal::ToString() const {
     case TypeId::kString: {
       return std::get<std::string>(value_);
     }
-    case TypeId::kBinary: {
+    case TypeId::kBinary:
+    case TypeId::kFixed: {
       const auto& binary_data = std::get<std::vector<uint8_t>>(value_);
       std::string result = "X'";
       result.reserve(2 + binary_data.size() * 2 +
-                     1);  // 2 for X' + 2 chars per byte + 1 for '
+                     1);  // 2 chars per byte and 2 + 1 for prefix and suffix
       for (const auto& byte : binary_data) {
         std::format_to(std::back_inserter(result), "{:02X}", byte);
       }
@@ -488,8 +486,7 @@ std::string Literal::ToString() const {
       return std::to_string(std::get<int32_t>(value_));
     }
     case TypeId::kDecimal:
-    case TypeId::kUuid:
-    case TypeId::kFixed: {
+    case TypeId::kUuid: {
       throw IcebergError("Not implemented: ToString for " + type_->ToString());
     }
     default: {

test/literal_test.cc

@@ -325,6 +325,9 @@ TEST(LiteralTest, FixedBasics) {
 
   EXPECT_EQ(fixed_literal.type()->type_id(), TypeId::kFixed);
   EXPECT_EQ(empty_fixed.type()->type_id(), TypeId::kFixed);
+
+  EXPECT_EQ(fixed_literal.ToString(), "X'010203FF'");
+  EXPECT_EQ(empty_fixed.ToString(), "X''");
 }
 
 TEST(LiteralTest, FixedComparison) {