Skip to content

feat: fix literal comparison operator #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2025
+22 −3
Merged

feat: fix literal comparison operator #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
401948b
feat: fix literal comparison operator
zhjwpku Oct 23, 2025
f32890f
Polish comment per review.
zhjwpku Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/iceberg/expression/literal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ bool Literal::operator==(const Literal& other) const { return (*this <=> other)
// Three-way comparison operator
std::partial_ordering Literal::operator<=>(const Literal& other) const {
// If types are different, comparison is unordered
if (*type_ != *other.type_) {
if (type_->type_id() != other.type_->type_id()) {
return std::partial_ordering::unordered;
}

Expand Down
9 changes: 7 additions & 2 deletions src/iceberg/expression/literal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <variant>
#include <vector>

#include "iceberg/iceberg_export.h"
#include "iceberg/result.h"
#include "iceberg/type.h"
#include "iceberg/util/decimal.h"
Expand Down Expand Up @@ -129,8 +130,12 @@ class ICEBERG_EXPORT Literal : public util::Formattable {

bool operator==(const Literal& other) const;

/// \brief Compare two PrimitiveLiterals. Both literals must have the same type
/// and should not be AboveMax or BelowMin.
/// \brief Compare two literals of the same primitive type.
/// \param other The other literal to compare with.
/// \return The comparison result as std::partial_ordering. If either side is AboveMax,
/// BelowMin or Null, the result is unordered.
/// Note: This comparison cannot be used for sorting literals if any literal is
/// AboveMax, BelowMin or Null.
std::partial_ordering operator<=>(const Literal& other) const;

/// Check if this literal represents a value above the maximum allowed value
Expand Down
14 changes: 14 additions & 0 deletions src/iceberg/test/literal_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,10 @@ INSTANTIATE_TEST_SUITE_P(
.small_literal = Literal::Decimal(123456, 6, 2),
.large_literal = Literal::Decimal(234567, 6, 2),
.equal_literal = Literal::Decimal(123456, 6, 2)},
ComparisonLiteralTestParam{.test_name = "DecimalDifferentScales",
.small_literal = Literal::Decimal(123456, 6, 2),
.large_literal = Literal::Decimal(1234567, 7, 3),
.equal_literal = Literal::Decimal(1234560, 7, 3)},
ComparisonLiteralTestParam{.test_name = "String",
.small_literal = Literal::String("apple"),
.large_literal = Literal::String("banana"),
Expand All @@ -620,11 +624,21 @@ INSTANTIATE_TEST_SUITE_P(
.small_literal = Literal::Binary(std::vector<uint8_t>{0x01, 0x02}),
.large_literal = Literal::Binary(std::vector<uint8_t>{0x01, 0x03}),
.equal_literal = Literal::Binary(std::vector<uint8_t>{0x01, 0x02})},
ComparisonLiteralTestParam{
.test_name = "BinaryDifferentLengths",
.small_literal = Literal::Binary(std::vector<uint8_t>{0x01, 0x02}),
.large_literal = Literal::Binary(std::vector<uint8_t>{0x01, 0x02, 0x03}),
.equal_literal = Literal::Binary(std::vector<uint8_t>{0x01, 0x02})},
ComparisonLiteralTestParam{
.test_name = "Fixed",
.small_literal = Literal::Fixed(std::vector<uint8_t>{0x01, 0x02}),
.large_literal = Literal::Fixed(std::vector<uint8_t>{0x01, 0x03}),
.equal_literal = Literal::Fixed(std::vector<uint8_t>{0x01, 0x02})},
ComparisonLiteralTestParam{
.test_name = "FixedDifferentLengths",
.small_literal = Literal::Fixed(std::vector<uint8_t>{0x01, 0x02}),
.large_literal = Literal::Fixed(std::vector<uint8_t>{0x01, 0x02, 0x03}),
.equal_literal = Literal::Fixed(std::vector<uint8_t>{0x01, 0x02})},
ComparisonLiteralTestParam{.test_name = "Date",
.small_literal = Literal::Date(100),
.large_literal = Literal::Date(200),
Expand Down
Loading