bkietz commented on a change in pull request #10410: URL: https://github.com/apache/arrow/pull/10410#discussion_r643454193
########## File path: cpp/src/arrow/compute/kernels/scalar_if_else_test.cc ########## @@ -0,0 +1,264 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +#include <arrow/array.h> +#include <arrow/compute/api_scalar.h> +#include <arrow/compute/kernels/test_util.h> +#include <arrow/testing/gtest_util.h> +#include <gtest/gtest.h> + +namespace arrow { +namespace compute { + +void CheckIfElseOutput(const Datum& cond, const Datum& left, const Datum& right, + const Datum& expected) { + ASSERT_OK_AND_ASSIGN(Datum datum_out, IfElse(cond, left, right)); + if (datum_out.is_array()) { + std::shared_ptr<Array> result = datum_out.make_array(); + ASSERT_OK(result->ValidateFull()); + std::shared_ptr<Array> expected_ = expected.make_array(); + AssertArraysEqual(*expected_, *result, /*verbose=*/true); + } else { // expecting scalar + const std::shared_ptr<Scalar>& result = datum_out.scalar(); + const std::shared_ptr<Scalar>& expected_ = expected.scalar(); + AssertScalarsEqual(*expected_, *result, /*verbose=*/true); + } +} + +class TestIfElseKernel : public ::testing::Test {}; + +template <typename Type> +class TestIfElsePrimitive : public ::testing::Test {}; + +using PrimitiveTypes = ::testing::Types<Int8Type, UInt8Type, Int16Type, UInt16Type, + Int32Type, UInt32Type, Int64Type, UInt64Type, + FloatType, DoubleType, Date32Type, Date64Type>; + +TYPED_TEST_SUITE(TestIfElsePrimitive, PrimitiveTypes); + +TYPED_TEST(TestIfElsePrimitive, IfElseFixedSizeRand) { + using ArrayType = typename TypeTraits<TypeParam>::ArrayType; + auto type = TypeTraits<TypeParam>::type_singleton(); + + random::RandomArrayGenerator rand(/*seed=*/0); + int64_t len = 1000; + auto cond = std::static_pointer_cast<BooleanArray>( + rand.ArrayOf(boolean(), len, /*null_probability=*/0.01)); + auto left = std::static_pointer_cast<ArrayType>( + rand.ArrayOf(type, len, /*null_probability=*/0.01)); + auto right = std::static_pointer_cast<ArrayType>( + rand.ArrayOf(type, len, /*null_probability=*/0.01)); + + typename TypeTraits<TypeParam>::BuilderType builder; + + for (int64_t i = 0; i < len; ++i) { + if (!cond->IsValid(i) || (cond->Value(i) && !left->IsValid(i)) || + (!cond->Value(i) && !right->IsValid(i))) { + ASSERT_OK(builder.AppendNull()); + continue; + } + + if (cond->Value(i)) { + ASSERT_OK(builder.Append(left->Value(i))); + } else { + ASSERT_OK(builder.Append(right->Value(i))); + } + } + ASSERT_OK_AND_ASSIGN(auto expected_data, builder.Finish()); + + CheckIfElseOutput(cond, left, right, expected_data); +} + +void CheckWithDifferentShapes(const std::shared_ptr<Array>& cond, + const std::shared_ptr<Array>& left, + const std::shared_ptr<Array>& right, + const std::shared_ptr<Array>& expected) { + // this will check for whole arrays, every scalar at i'th index and slicing (offset) + CheckScalar("if_else", {cond, left, right}, expected); + + auto len = left->length(); + + enum { COND_SCALAR = 1, LEFT_SCALAR = 2, RIGHT_SCALAR = 4 }; + for (int mask = 0; mask < (COND_SCALAR | LEFT_SCALAR | RIGHT_SCALAR); ++mask) { + for (int64_t cond_idx = 0; cond_idx < len; ++cond_idx) { + Datum cond_in, cond_bcast; + if (mask & COND_SCALAR) { + ASSERT_OK_AND_ASSIGN(cond_in, cond->GetScalar(cond_idx)); + ASSERT_OK_AND_ASSIGN(cond_bcast, MakeArrayFromScalar(*cond_in.scalar(), len)); + } else { + cond_in = cond_bcast = cond; + } Review comment: Please add SCOPED_TRACEs here and below for left/right so that failures within the loop are more informative about which iteration failed ```suggestion Datum cond_in, cond_bcast; std::string trace_msg = "Cond"; if (mask & COND_SCALAR) { ASSERT_OK_AND_ASSIGN(cond_in, cond->GetScalar(cond_idx)); ASSERT_OK_AND_ASSIGN(cond_bcast, MakeArrayFromScalar(*cond_in.scalar(), len)); trace_msg += "@" + std::to_string(cond_idx) + "=" + cond_in.scalar()->ToString(); } else { cond_in = cond_bcast = cond; } SCOPED_TRACE(trace_msg); ``` ########## File path: cpp/src/arrow/compute/kernels/scalar_if_else.cc ########## @@ -699,14 +699,58 @@ struct IfElseFunctor<Type, enable_if_boolean<Type>> { // AAS static Status Call(KernelContext* ctx, const ArrayData& cond, const ArrayData& left, const Scalar& right, ArrayData* out) { - // todo impl + ARROW_RETURN_NOT_OK(PromoteNullsVisitor(ctx, cond, left, right, out)); + + // out_buff = left & cond + ARROW_ASSIGN_OR_RAISE(std::shared_ptr<Buffer> out_buf, + arrow::internal::BitmapAnd( + ctx->memory_pool(), left.buffers[1]->data(), left.offset, + cond.buffers[1]->data(), cond.offset, cond.length, 0)); + + bool right_data = internal::UnboxScalar<BooleanType>::Unbox(right); + + // out_buff = left & cond | right & ~cond + if (right_data) { + arrow::internal::BitmapOrNot(out_buf->data(), 0, cond.buffers[1]->data(), + cond.offset, cond.length, 0, out_buf->mutable_data()); + } + + out->buffers[1] = std::move(out_buf); return Status::OK(); } // ASS static Status Call(KernelContext* ctx, const ArrayData& cond, const Scalar& left, const Scalar& right, ArrayData* out) { - // todo impl + ARROW_RETURN_NOT_OK(PromoteNullsVisitor(ctx, cond, left, right, out)); + + bool left_data = internal::UnboxScalar<BooleanType>::Unbox(left); + bool right_data = internal::UnboxScalar<BooleanType>::Unbox(right); + + // out_buf = left & cond | right & ~cond + std::shared_ptr<Buffer> out_buf = nullptr; + if (left_data) { + if (right_data) { + // out_buf = ones + ARROW_ASSIGN_OR_RAISE(out_buf, ctx->AllocateBitmap(cond.length)); + // filling with UINT8_MAX upto the buffer's size (in bytes) + arrow::compute::internal::SetMemory<UINT8_MAX>(out_buf.get()); Review comment: Please inline the call to memset here -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
