From 983ef76888fff3c9f0984979a01dae0516fe35bc Mon Sep 17 00:00:00 2001 From: Fernando Rodriguez Date: Wed, 4 Aug 2021 14:10:37 -0500 Subject: [PATCH 1/5] change shared_ptr and shared_ptr to Datum in CheckScalar* --- cpp/src/arrow/compute/kernels/test_util.cc | 37 ++++------------------ cpp/src/arrow/compute/kernels/test_util.h | 8 ++--- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/cpp/src/arrow/compute/kernels/test_util.cc b/cpp/src/arrow/compute/kernels/test_util.cc index ce8d42e34c2..954db7538de 100644 --- a/cpp/src/arrow/compute/kernels/test_util.cc +++ b/cpp/src/arrow/compute/kernels/test_util.cc @@ -174,10 +174,10 @@ void CheckScalar(std::string func_name, const DatumVector& inputs, Datum expecte } } -void CheckScalarUnary(std::string func_name, std::shared_ptr input, - std::shared_ptr expected, const FunctionOptions* options) { - ArrayVector input_vector = {input}; - CheckScalar(std::move(func_name), GetDatums(input_vector), expected, options); +void CheckScalarUnary(std::string func_name, Datum input, Datum expected, + const FunctionOptions* options) { + std::vector input_vector = {std::move(input)}; + CheckScalar(std::move(func_name), input_vector, expected, options); } void CheckScalarUnary(std::string func_name, std::shared_ptr in_ty, @@ -187,11 +187,6 @@ void CheckScalarUnary(std::string func_name, std::shared_ptr in_ty, ArrayFromJSON(out_ty, json_expected), options); } -void CheckScalarUnary(std::string func_name, std::shared_ptr input, - std::shared_ptr expected, const FunctionOptions* options) { - CheckScalar(std::move(func_name), {input}, expected, options); -} - void CheckVectorUnary(std::string func_name, Datum input, std::shared_ptr expected, const FunctionOptions* options) { ASSERT_OK_AND_ASSIGN(Datum out, CallFunction(func_name, {input}, options)); @@ -200,27 +195,9 @@ void CheckVectorUnary(std::string func_name, Datum input, std::shared_ptr AssertArraysEqual(*expected, *actual, /*verbose=*/true); } -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, const FunctionOptions* options) { - CheckScalar(std::move(func_name), {left_input, right_input}, expected, options); -} - -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, const FunctionOptions* options) { - CheckScalar(std::move(func_name), {left_input, right_input}, expected, options); -} - -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, const FunctionOptions* options) { - CheckScalar(std::move(func_name), {left_input, right_input}, expected, options); -} - -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, const FunctionOptions* options) { +void CheckScalarBinary(std::string func_name, Datum left_input, Datum right_input, + Datum expected, const FunctionOptions* options) { + std::cout << "Option 1" << std::endl; CheckScalar(std::move(func_name), {left_input, right_input}, expected, options); } diff --git a/cpp/src/arrow/compute/kernels/test_util.h b/cpp/src/arrow/compute/kernels/test_util.h index c366b99a71d..d461f9ade32 100644 --- a/cpp/src/arrow/compute/kernels/test_util.h +++ b/cpp/src/arrow/compute/kernels/test_util.h @@ -78,13 +78,11 @@ void CheckScalarUnary(std::string func_name, std::shared_ptr in_ty, std::string json_expected, const FunctionOptions* options = nullptr); -void CheckScalarUnary(std::string func_name, std::shared_ptr input, - std::shared_ptr expected, +void CheckScalarUnary(std::string func_name, Datum input, Datum expected, const FunctionOptions* options = nullptr); -void CheckScalarUnary(std::string func_name, std::shared_ptr input, - std::shared_ptr expected, - const FunctionOptions* options = nullptr); +void CheckScalarBinary(std::string func_name, Datum left_input, Datum right_input, + Datum expected, const FunctionOptions* options = nullptr); void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, std::shared_ptr right_input, From c3f20125471e8da04a713ba845d95e42959c31de Mon Sep 17 00:00:00 2001 From: Fernando Rodriguez Date: Wed, 4 Aug 2021 14:11:02 -0500 Subject: [PATCH 2/5] add explicit conversion to Datum in BinaryJoin test --- cpp/src/arrow/compute/kernels/scalar_string_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/src/arrow/compute/kernels/scalar_string_test.cc b/cpp/src/arrow/compute/kernels/scalar_string_test.cc index 785c82ca044..7e2c37f8c80 100644 --- a/cpp/src/arrow/compute/kernels/scalar_string_test.cc +++ b/cpp/src/arrow/compute/kernels/scalar_string_test.cc @@ -1186,9 +1186,9 @@ TYPED_TEST(TestStringKernels, BinaryJoin) { auto expected = ArrayFromJSON(this->type(), R"(["a--bb--ccc", "", null, "dd", null, "ff--"])"); CheckScalarBinary("binary_join", ArrayFromJSON(list(this->type()), list_json), - separator, expected); + static_cast(separator), expected); CheckScalarBinary("binary_join", ArrayFromJSON(large_list(this->type()), list_json), - separator, expected); + static_cast(separator), expected); auto separator_null = MakeNullScalar(this->type()); expected = ArrayFromJSON(this->type(), R"([null, null, null, null, null, null])"); From a0345ca0c94bfe6ad2892acd199d4e60afb3efba Mon Sep 17 00:00:00 2001 From: Fernando Rodriguez Date: Wed, 4 Aug 2021 14:15:41 -0500 Subject: [PATCH 3/5] remove comment --- cpp/src/arrow/compute/kernels/test_util.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/cpp/src/arrow/compute/kernels/test_util.cc b/cpp/src/arrow/compute/kernels/test_util.cc index 954db7538de..ceea9cbc15c 100644 --- a/cpp/src/arrow/compute/kernels/test_util.cc +++ b/cpp/src/arrow/compute/kernels/test_util.cc @@ -197,7 +197,6 @@ void CheckVectorUnary(std::string func_name, Datum input, std::shared_ptr void CheckScalarBinary(std::string func_name, Datum left_input, Datum right_input, Datum expected, const FunctionOptions* options) { - std::cout << "Option 1" << std::endl; CheckScalar(std::move(func_name), {left_input, right_input}, expected, options); } From 39cf5a1dbf064f8bc2f01f2c8798c55f7f5abed3 Mon Sep 17 00:00:00 2001 From: Fernando Rodriguez Date: Wed, 4 Aug 2021 14:19:23 -0500 Subject: [PATCH 4/5] remove functions overloading CheckScalar --- cpp/src/arrow/compute/kernels/test_util.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/cpp/src/arrow/compute/kernels/test_util.h b/cpp/src/arrow/compute/kernels/test_util.h index d461f9ade32..eecedb64317 100644 --- a/cpp/src/arrow/compute/kernels/test_util.h +++ b/cpp/src/arrow/compute/kernels/test_util.h @@ -84,26 +84,6 @@ void CheckScalarUnary(std::string func_name, Datum input, Datum expected, void CheckScalarBinary(std::string func_name, Datum left_input, Datum right_input, Datum expected, const FunctionOptions* options = nullptr); -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, - const FunctionOptions* options = nullptr); - -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, - const FunctionOptions* options = nullptr); - -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, - const FunctionOptions* options = nullptr); - -void CheckScalarBinary(std::string func_name, std::shared_ptr left_input, - std::shared_ptr right_input, - std::shared_ptr expected, - const FunctionOptions* options = nullptr); - void CheckVectorUnary(std::string func_name, Datum input, std::shared_ptr expected, const FunctionOptions* options = nullptr); From dda0c4eac7f6f432df6597fa7ef5d4f5187a7463 Mon Sep 17 00:00:00 2001 From: Fernando Rodriguez Date: Wed, 4 Aug 2021 14:28:03 -0500 Subject: [PATCH 5/5] change static_cast to Datum(separator) --- cpp/src/arrow/compute/kernels/scalar_string_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/src/arrow/compute/kernels/scalar_string_test.cc b/cpp/src/arrow/compute/kernels/scalar_string_test.cc index 7e2c37f8c80..16ab551283c 100644 --- a/cpp/src/arrow/compute/kernels/scalar_string_test.cc +++ b/cpp/src/arrow/compute/kernels/scalar_string_test.cc @@ -1186,9 +1186,9 @@ TYPED_TEST(TestStringKernels, BinaryJoin) { auto expected = ArrayFromJSON(this->type(), R"(["a--bb--ccc", "", null, "dd", null, "ff--"])"); CheckScalarBinary("binary_join", ArrayFromJSON(list(this->type()), list_json), - static_cast(separator), expected); + Datum(separator), expected); CheckScalarBinary("binary_join", ArrayFromJSON(large_list(this->type()), list_json), - static_cast(separator), expected); + Datum(separator), expected); auto separator_null = MakeNullScalar(this->type()); expected = ArrayFromJSON(this->type(), R"([null, null, null, null, null, null])");