From ac089ed445a1b7d014c945d4c0cdab50b6994b54 Mon Sep 17 00:00:00 2001 From: shangxinli Date: Sat, 21 Feb 2026 17:36:05 -0800 Subject: [PATCH] fix: fix misspelled variable, missing format arg, and wrong pointer assignment - Rename `while_digits` to `whole_digits` in decimal parser (typo) - Add missing `{}` format placeholder in parquet writer error message - Fix `batch = nullptr` to `*batch = nullptr` in EmptyRecordBatchReader --- src/iceberg/parquet/parquet_reader.cc | 2 +- src/iceberg/parquet/parquet_writer.cc | 2 +- src/iceberg/util/decimal.cc | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/iceberg/parquet/parquet_reader.cc b/src/iceberg/parquet/parquet_reader.cc index d13df0eb8..2fbf8e0a6 100644 --- a/src/iceberg/parquet/parquet_reader.cc +++ b/src/iceberg/parquet/parquet_reader.cc @@ -87,7 +87,7 @@ class EmptyRecordBatchReader : public ::arrow::RecordBatchReader { std::shared_ptr<::arrow::Schema> schema() const override { return nullptr; } ::arrow::Status ReadNext(std::shared_ptr<::arrow::RecordBatch>* batch) override { - batch = nullptr; + *batch = nullptr; return ::arrow::Status::OK(); } }; diff --git a/src/iceberg/parquet/parquet_writer.cc b/src/iceberg/parquet/parquet_writer.cc index c874665a6..a68e9e61e 100644 --- a/src/iceberg/parquet/parquet_writer.cc +++ b/src/iceberg/parquet/parquet_writer.cc @@ -61,7 +61,7 @@ Result<::arrow::Compression::type> ParseCompression(const WriterProperties& prop } else if (compression_name == "zstd") { return ::arrow::Compression::ZSTD; } else { - return InvalidArgument("Unsupported Parquet compression codec: ", compression_name); + return InvalidArgument("Unsupported Parquet compression codec: {}", compression_name); } } diff --git a/src/iceberg/util/decimal.cc b/src/iceberg/util/decimal.cc index aeb7c6147..0599afa4f 100644 --- a/src/iceberg/util/decimal.cc +++ b/src/iceberg/util/decimal.cc @@ -56,7 +56,7 @@ constexpr Decimal kMaxDecimalValue(5421010862427522170LL, 687399551400673279ULL) constexpr Decimal kMinDecimalValue(-5421010862427522171LL, 17759344522308878337ULL); struct DecimalComponents { - std::string_view while_digits; + std::string_view whole_digits; std::string_view fractional_digits; int32_t exponent{0}; char sign{0}; @@ -92,9 +92,9 @@ bool ParseDecimalComponents(std::string_view str, DecimalComponents* out) { out->sign = str[pos++]; } // First run of digits - pos = ParseDigitsRun(str, pos, &out->while_digits); + pos = ParseDigitsRun(str, pos, &out->whole_digits); if (pos == str.size()) { - return !out->while_digits.empty(); + return !out->whole_digits.empty(); } // Optional dot @@ -102,7 +102,7 @@ bool ParseDecimalComponents(std::string_view str, DecimalComponents* out) { // Second run of digits after the dot pos = ParseDigitsRun(str, ++pos, &out->fractional_digits); } - if (out->fractional_digits.empty() && out->while_digits.empty()) { + if (out->fractional_digits.empty() && out->whole_digits.empty()) { // Need at least some digits (whole or fractional) return false; } @@ -437,10 +437,10 @@ Result Decimal::FromString(std::string_view str, int32_t* precision, } // Count number of significant digits (without leading zeros) - size_t first_non_zero = dec.while_digits.find_first_not_of('0'); + size_t first_non_zero = dec.whole_digits.find_first_not_of('0'); size_t significant_digits = dec.fractional_digits.size(); if (first_non_zero != std::string_view::npos) { - significant_digits += dec.while_digits.size() - first_non_zero; + significant_digits += dec.whole_digits.size() - first_non_zero; } auto parsed_precision = static_cast(significant_digits); @@ -454,7 +454,7 @@ Result Decimal::FromString(std::string_view str, int32_t* precision, } uint128_t value = 0; - ShiftAndAdd(dec.while_digits, value); + ShiftAndAdd(dec.whole_digits, value); ShiftAndAdd(dec.fractional_digits, value); Decimal result(static_cast(value));