c-jamie commented on a change in pull request #12270:
URL: https://github.com/apache/arrow/pull/12270#discussion_r793014118
##########
File path: cpp/src/arrow/compute/kernels/vector_selection_test.cc
##########
@@ -2365,38 +2365,91 @@ TEST_F(TestDropNullKernelWithTable,
DropNullTableWithSlices) {
});
}
-TEST(TestIndicesNonZero, IndicesNonZero) {
+template <typename Type>
+class TestIndicesNonZero : public ::testing::Test {};
+
+TYPED_TEST_SUITE(TestIndicesNonZero, NumericArrowTypes);
+TYPED_TEST(TestIndicesNonZero, IndicesNonZero) {
Datum actual;
std::shared_ptr<Array> result;
+ auto type = TypeTraits<TypeParam>::type_singleton();
- ASSERT_OK_AND_ASSIGN(
- actual,
- CallFunction("indices_nonzero", {ArrayFromJSON(uint32(), "[null, 50, 0,
10]")}));
+ ASSERT_OK_AND_ASSIGN(actual, CallFunction("indices_nonzero",
+ {ArrayFromJSON(type, "[null, 50,
0, 10]")}));
result = actual.make_array();
- AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[1, 3]"));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[1, 3]"), *result);
+
+ // empty
+ ASSERT_OK_AND_ASSIGN(actual,
+ CallFunction("indices_nonzero", {ArrayFromJSON(type,
"[]")}));
+ result = actual.make_array();
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[]"), *result);
+
+ // chunked
+ ChunkedArray chunked_arr(
+ {ArrayFromJSON(type, "[1, 0, 3]"), ArrayFromJSON(type, "[4, 0, 6]")});
+ ASSERT_OK_AND_ASSIGN(
+ actual, CallFunction("indices_nonzero",
{static_cast<Datum>(chunked_arr)}));
Review comment:
For me, I get a compiler error: `error: no matching function for call to
'CallFunction' actual, CallFunction("indices_nonzero", {chunked_arr}));`
##########
File path: cpp/src/arrow/compute/kernels/vector_selection_test.cc
##########
@@ -2365,38 +2365,91 @@ TEST_F(TestDropNullKernelWithTable,
DropNullTableWithSlices) {
});
}
-TEST(TestIndicesNonZero, IndicesNonZero) {
+template <typename Type>
+class TestIndicesNonZero : public ::testing::Test {};
+
+TYPED_TEST_SUITE(TestIndicesNonZero, NumericArrowTypes);
+TYPED_TEST(TestIndicesNonZero, IndicesNonZero) {
Datum actual;
std::shared_ptr<Array> result;
+ auto type = TypeTraits<TypeParam>::type_singleton();
- ASSERT_OK_AND_ASSIGN(
- actual,
- CallFunction("indices_nonzero", {ArrayFromJSON(uint32(), "[null, 50, 0,
10]")}));
+ ASSERT_OK_AND_ASSIGN(actual, CallFunction("indices_nonzero",
+ {ArrayFromJSON(type, "[null, 50,
0, 10]")}));
result = actual.make_array();
- AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[1, 3]"));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[1, 3]"), *result);
+
+ // empty
+ ASSERT_OK_AND_ASSIGN(actual,
+ CallFunction("indices_nonzero", {ArrayFromJSON(type,
"[]")}));
+ result = actual.make_array();
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[]"), *result);
+
+ // chunked
+ ChunkedArray chunked_arr(
+ {ArrayFromJSON(type, "[1, 0, 3]"), ArrayFromJSON(type, "[4, 0, 6]")});
+ ASSERT_OK_AND_ASSIGN(
+ actual, CallFunction("indices_nonzero",
{static_cast<Datum>(chunked_arr)}));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[0, 2, 3, 5]"),
*actual.make_array());
+
+ // empty chunked
+ ChunkedArray chunked_arr_empty({ArrayFromJSON(type, "[1, 0, 3]"),
+ ArrayFromJSON(type, "[]"),
+ ArrayFromJSON(type, "[4, 0, 6]")});
+ ASSERT_OK_AND_ASSIGN(
+ actual, CallFunction("indices_nonzero",
{static_cast<Datum>(chunked_arr_empty)}));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[0, 2, 3, 5]"),
*actual.make_array());
+}
+TEST(TestIndicesNonZero, IndicesNonZeroBoolean) {
+ Datum actual;
+ std::shared_ptr<Array> result;
+
+ // boool
ASSERT_OK_AND_ASSIGN(
actual, CallFunction("indices_nonzero",
{ArrayFromJSON(boolean(), "[null, true, false,
true]")}));
result = actual.make_array();
AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[1, 3]"));
+}
- ASSERT_OK_AND_ASSIGN(actual,
- CallFunction("indices_nonzero",
- {ArrayFromJSON(float64(), "[null, 1.3,
0.0, 5.0]")}));
+TEST(TestIndicesNonZero, IndicesNonZeroDecimal) {
+ Datum actual;
+ std::shared_ptr<Array> result;
+
+ ASSERT_OK_AND_ASSIGN(
+ actual, CallFunction(
+ "indices_nonzero",
+ {DecimalArrayFromJSON(decimal128(2, -2),
R"(["12E2",null,"0","0"])")}));
result = actual.make_array();
- AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[1, 3]"));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[0]"), *result, true);
Review comment:
done
##########
File path: cpp/src/arrow/compute/kernels/vector_selection_test.cc
##########
@@ -2365,38 +2365,91 @@ TEST_F(TestDropNullKernelWithTable,
DropNullTableWithSlices) {
});
}
-TEST(TestIndicesNonZero, IndicesNonZero) {
+template <typename Type>
+class TestIndicesNonZero : public ::testing::Test {};
+
+TYPED_TEST_SUITE(TestIndicesNonZero, NumericArrowTypes);
+TYPED_TEST(TestIndicesNonZero, IndicesNonZero) {
Datum actual;
std::shared_ptr<Array> result;
+ auto type = TypeTraits<TypeParam>::type_singleton();
- ASSERT_OK_AND_ASSIGN(
- actual,
- CallFunction("indices_nonzero", {ArrayFromJSON(uint32(), "[null, 50, 0,
10]")}));
+ ASSERT_OK_AND_ASSIGN(actual, CallFunction("indices_nonzero",
+ {ArrayFromJSON(type, "[null, 50,
0, 10]")}));
result = actual.make_array();
- AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[1, 3]"));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[1, 3]"), *result);
+
+ // empty
+ ASSERT_OK_AND_ASSIGN(actual,
+ CallFunction("indices_nonzero", {ArrayFromJSON(type,
"[]")}));
+ result = actual.make_array();
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[]"), *result);
+
+ // chunked
+ ChunkedArray chunked_arr(
+ {ArrayFromJSON(type, "[1, 0, 3]"), ArrayFromJSON(type, "[4, 0, 6]")});
+ ASSERT_OK_AND_ASSIGN(
+ actual, CallFunction("indices_nonzero",
{static_cast<Datum>(chunked_arr)}));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[0, 2, 3, 5]"),
*actual.make_array());
+
+ // empty chunked
+ ChunkedArray chunked_arr_empty({ArrayFromJSON(type, "[1, 0, 3]"),
+ ArrayFromJSON(type, "[]"),
+ ArrayFromJSON(type, "[4, 0, 6]")});
+ ASSERT_OK_AND_ASSIGN(
+ actual, CallFunction("indices_nonzero",
{static_cast<Datum>(chunked_arr_empty)}));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[0, 2, 3, 5]"),
*actual.make_array());
+}
+TEST(TestIndicesNonZero, IndicesNonZeroBoolean) {
+ Datum actual;
+ std::shared_ptr<Array> result;
+
+ // boool
ASSERT_OK_AND_ASSIGN(
actual, CallFunction("indices_nonzero",
{ArrayFromJSON(boolean(), "[null, true, false,
true]")}));
result = actual.make_array();
AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[1, 3]"));
+}
- ASSERT_OK_AND_ASSIGN(actual,
- CallFunction("indices_nonzero",
- {ArrayFromJSON(float64(), "[null, 1.3,
0.0, 5.0]")}));
+TEST(TestIndicesNonZero, IndicesNonZeroDecimal) {
+ Datum actual;
+ std::shared_ptr<Array> result;
+
+ ASSERT_OK_AND_ASSIGN(
+ actual, CallFunction(
+ "indices_nonzero",
+ {DecimalArrayFromJSON(decimal128(2, -2),
R"(["12E2",null,"0","0"])")}));
result = actual.make_array();
- AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[1, 3]"));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[0]"), *result, true);
- ASSERT_OK_AND_ASSIGN(actual,
- CallFunction("indices_nonzero",
{ArrayFromJSON(float64(), "[]")}));
+ ASSERT_OK_AND_ASSIGN(
+ actual,
+ CallFunction(
+ "indices_nonzero",
+ {DecimalArrayFromJSON(
+ decimal128(6, 9),
+
R"(["765483.999999999","0.000000000",null,"-987645.000000001"])")}));
result = actual.make_array();
- AssertArraysEqual(*result, *ArrayFromJSON(uint64(), "[]"));
+ AssertArraysEqual(*ArrayFromJSON(uint64(), "[0, 3]"), *result, true);
- ChunkedArray chunkedarr(
- {ArrayFromJSON(uint32(), "[1, 0, 3]"), ArrayFromJSON(uint32(), "[4, 0,
6]")});
- ASSERT_OK_AND_ASSIGN(actual,
- CallFunction("indices_nonzero",
{static_cast<Datum>(chunkedarr)}));
- AssertArraysEqual(*actual.make_array(), *ArrayFromJSON(uint64(), "[0, 2, 3,
5]"));
+ ASSERT_OK_AND_ASSIGN(
Review comment:
done
##########
File path: cpp/src/arrow/compute/kernels/vector_selection_test.cc
##########
@@ -2365,38 +2365,91 @@ TEST_F(TestDropNullKernelWithTable,
DropNullTableWithSlices) {
});
}
-TEST(TestIndicesNonZero, IndicesNonZero) {
+template <typename Type>
+class TestIndicesNonZero : public ::testing::Test {};
+
+TYPED_TEST_SUITE(TestIndicesNonZero, NumericArrowTypes);
Review comment:
done
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
