Skip to content

ARROW-14842: [C++] Improve precision range error messages for Decimal #11773

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

Closed
cyb70289 wants to merge 3 commits into from
Closed

ARROW-14842: [C++] Improve precision range error messages for Decimal #11773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c28db3
ARROW-14842: [C++] Improve precision range error messages for Decimal
cyb70289 Nov 25, 2021
113ae08
R expect_error with "fixed = TRUE"
cyb70289 Nov 25, 2021
b83b6ab
workaround static constexpr member odr-used issue
cyb70289 Nov 30, 2021
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 c_glib/test/test-decimal128-data-type.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_deciaml_data_type_new

def test_invalid_precision
message =
"[decimal128-data-type][new]: Invalid: Decimal precision out of range: 39"
"[decimal128-data-type][new]: Invalid: Decimal precision out of range [1, 38]: 39"
assert_raise(Arrow::Error::Invalid.new(message)) do
Arrow::Decimal128DataType.new(39, 1)
end
Expand Down
2 changes: 1 addition & 1 deletion c_glib/test/test-decimal256-data-type.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def test_deciaml_data_type_new

def test_invalid_precision
message =
"[decimal256-data-type][new]: Invalid: Decimal precision out of range: 77"
"[decimal256-data-type][new]: Invalid: Decimal precision out of range [1, 76]: 77"
assert_raise(Arrow::Error::Invalid.new(message)) do
Arrow::Decimal256DataType.new(77, 1)
end
Expand Down
6 changes: 4 additions & 2 deletions cpp/src/arrow/type.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,8 @@ Decimal128Type::Decimal128Type(int32_t precision, int32_t scale)

Result<std::shared_ptr<DataType>> Decimal128Type::Make(int32_t precision, int32_t scale) {
if (precision < kMinPrecision || precision > kMaxPrecision) {
return Status::Invalid("Decimal precision out of range: ", precision);
return Status::Invalid("Decimal precision out of range [", int32_t(kMinPrecision),
", ", int32_t(kMaxPrecision), "]: ", precision);
}
return std::make_shared<Decimal128Type>(precision, scale);
}
Expand All @@ -847,7 +848,8 @@ Decimal256Type::Decimal256Type(int32_t precision, int32_t scale)

Result<std::shared_ptr<DataType>> Decimal256Type::Make(int32_t precision, int32_t scale) {
if (precision < kMinPrecision || precision > kMaxPrecision) {
return Status::Invalid("Decimal precision out of range: ", precision);
return Status::Invalid("Decimal precision out of range [", int32_t(kMinPrecision),
", ", int32_t(kMaxPrecision), "]: ", precision);
}
return std::make_shared<Decimal256Type>(precision, scale);
}
Expand Down
4 changes: 2 additions & 2 deletions r/tests/testthat/test-data-type.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@ test_that("decimal type and validation", {
expect_error(decimal(4))
expect_error(decimal(4, "two"), '"scale" must be an integer')
expect_error(decimal(NA, 2), '"precision" must be an integer')
expect_error(decimal(0, 2), "Invalid: Decimal precision out of range: 0")
expect_error(decimal(100, 2), "Invalid: Decimal precision out of range: 100")
expect_error(decimal(0, 2), "Invalid: Decimal precision out of range [1, 38]: 0", fixed = TRUE)
expect_error(decimal(100, 2), "Invalid: Decimal precision out of range [1, 38]: 100", fixed = TRUE)
expect_error(decimal(4, NA), '"scale" must be an integer')

expect_r6_class(decimal(4, 2), "Decimal128Type")
Expand Down