diff --git a/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc b/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc index 53d4751b8c4..a6f7217c4ac 100644 --- a/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc +++ b/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc @@ -494,11 +494,11 @@ struct Logb { static_assert(std::is_same::value, ""); static_assert(std::is_same::value, ""); if (x == 0.0) { - if (base == 0.0 || base < 0.0) { + if (base <= 0.0 || !std::isfinite(base)) { return std::numeric_limits::quiet_NaN(); - } else { - return -std::numeric_limits::infinity(); } + const auto infinity = std::numeric_limits::infinity(); + return base < 1.0 ? infinity : -infinity; } else if (x < 0.0) { return std::numeric_limits::quiet_NaN(); } diff --git a/cpp/src/arrow/compute/kernels/scalar_arithmetic_test.cc b/cpp/src/arrow/compute/kernels/scalar_arithmetic_test.cc index 68bb1cb22cb..ce8405536cb 100644 --- a/cpp/src/arrow/compute/kernels/scalar_arithmetic_test.cc +++ b/cpp/src/arrow/compute/kernels/scalar_arithmetic_test.cc @@ -3355,6 +3355,8 @@ TYPED_TEST(TestBinaryArithmeticFloating, Log) { "[NaN, NaN, -Inf, Inf]"); this->AssertBinop(Logb, "[-Inf, -1, 0, Inf]", this->MakeScalar(2.), "[NaN, NaN, -Inf, Inf]"); + this->AssertBinop(Logb, "[0, -0.0, 0, 0, 0, 0, 0]", "[0.5, 0.25, Inf, NaN, 1, 0, -2]", + "[Inf, Inf, NaN, NaN, -Inf, NaN, NaN]"); this->AssertBinop(Logb, "[-Inf, -1, 0, Inf]", "[2, 10, 0, 0]", "[NaN, NaN, NaN, NaN]"); this->AssertBinop(Logb, "[-Inf, -1, 0, Inf]", this->MakeScalar(0.), "[NaN, NaN, NaN, NaN]");