Skip to content

Commit

Permalink
Change helper function names in C++ tests, fix doctest errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlenkaF
AlenkaF committed May 29, 2024
1 parent c6595c4 commit 083240e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 22 deletions.
36 changes: 18 additions & 18 deletions cpp/src/arrow/table_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ TEST_F(TestTable, ToTensorEmptyTable) {
}

template <typename DataType>
void CheckTensor(const std::shared_ptr<Tensor>& tensor, const int size,
void CheckTableToTensor(const std::shared_ptr<Tensor>& tensor, const int size,
const std::vector<int64_t> shape, const std::vector<int64_t> f_strides) {
EXPECT_EQ(size, tensor->size());
EXPECT_EQ(TypeTraits<DataType>::type_singleton(), tensor->type());
Expand All @@ -446,7 +446,7 @@ void CheckTensor(const std::shared_ptr<Tensor>& tensor, const int size,
}

template <typename DataType>
void CheckTensorRowMajor(const std::shared_ptr<Tensor>& tensor, const int size,
void CheckTableToTensorRowMajor(const std::shared_ptr<Tensor>& tensor, const int size,
const std::vector<int64_t> shape,
const std::vector<int64_t> strides) {
EXPECT_EQ(size, tensor->size());
Expand Down Expand Up @@ -484,7 +484,7 @@ TEST_F(TestTable, ToTensorSupportedNaN) {

EXPECT_FALSE(tensor_expected->Equals(*tensor));
EXPECT_TRUE(tensor_expected->Equals(*tensor, EqualOptions().nans_equal(true)));
CheckTensor<FloatType>(tensor, 18, shape, f_strides);
CheckTableToTensor<FloatType>(tensor, 18, shape, f_strides);
}

TEST_F(TestTable, ToTensorSupportedNullToNan) {
Expand Down Expand Up @@ -515,7 +515,7 @@ TEST_F(TestTable, ToTensorSupportedNullToNan) {
EXPECT_FALSE(tensor_expected->Equals(*tensor));
EXPECT_TRUE(tensor_expected->Equals(*tensor, EqualOptions().nans_equal(true)));

CheckTensor<DoubleType>(tensor, 18, shape, f_strides);
CheckTableToTensor<DoubleType>(tensor, 18, shape, f_strides);

ASSERT_OK_AND_ASSIGN(auto tensor_row, table->ToTensor(/*null_to_nan=*/true));
ASSERT_OK(tensor_row->Validate());
Expand All @@ -528,7 +528,7 @@ TEST_F(TestTable, ToTensorSupportedNullToNan) {
EXPECT_FALSE(tensor_expected_row->Equals(*tensor_row));
EXPECT_TRUE(tensor_expected_row->Equals(*tensor_row, EqualOptions().nans_equal(true)));

CheckTensorRowMajor<DoubleType>(tensor_row, 18, shape, strides);
CheckTableToTensorRowMajor<DoubleType>(tensor_row, 18, shape, strides);

// int32 -> float64
auto f2 = field("f2", int32());
Expand All @@ -546,15 +546,15 @@ TEST_F(TestTable, ToTensorSupportedNullToNan) {
EXPECT_FALSE(tensor_expected->Equals(*tensor1));
EXPECT_TRUE(tensor_expected->Equals(*tensor1, EqualOptions().nans_equal(true)));

CheckTensor<DoubleType>(tensor1, 18, shape, f_strides);
CheckTableToTensor<DoubleType>(tensor1, 18, shape, f_strides);

ASSERT_OK_AND_ASSIGN(auto tensor1_row, table1->ToTensor(/*null_to_nan=*/true));
ASSERT_OK(tensor1_row->Validate());

EXPECT_FALSE(tensor_expected_row->Equals(*tensor1_row));
EXPECT_TRUE(tensor_expected_row->Equals(*tensor1_row, EqualOptions().nans_equal(true)));

CheckTensorRowMajor<DoubleType>(tensor1_row, 18, shape, strides);
CheckTableToTensorRowMajor<DoubleType>(tensor1_row, 18, shape, strides);

// int8 -> float32
auto f3 = field("f3", int8());
Expand All @@ -580,7 +580,7 @@ TEST_F(TestTable, ToTensorSupportedNullToNan) {
EXPECT_FALSE(tensor_expected_2->Equals(*tensor2));
EXPECT_TRUE(tensor_expected_2->Equals(*tensor2, EqualOptions().nans_equal(true)));

CheckTensor<FloatType>(tensor2, 18, shape, f_strides_2);
CheckTableToTensor<FloatType>(tensor2, 18, shape, f_strides_2);

ASSERT_OK_AND_ASSIGN(auto tensor2_row, table2->ToTensor(/*null_to_nan=*/true));
ASSERT_OK(tensor2_row->Validate());
Expand All @@ -594,7 +594,7 @@ TEST_F(TestTable, ToTensorSupportedNullToNan) {
EXPECT_TRUE(
tensor2_expected_row->Equals(*tensor2_row, EqualOptions().nans_equal(true)));

CheckTensorRowMajor<FloatType>(tensor2_row, 18, shape, strides_2);
CheckTableToTensorRowMajor<FloatType>(tensor2_row, 18, shape, strides_2);
}

TEST_F(TestTable, ToTensorSupportedTypesMixed) {
Expand Down Expand Up @@ -623,7 +623,7 @@ TEST_F(TestTable, ToTensorSupportedTypesMixed) {
TensorFromJSON(uint16(), "[1, 2, 3, 4, 5, 6, 7, 8, 9]", shape, f_strides);

EXPECT_TRUE(tensor_expected->Equals(*tensor));
CheckTensor<UInt16Type>(tensor, 9, shape, f_strides);
CheckTableToTensor<UInt16Type>(tensor, 9, shape, f_strides);

// uint16 + int16 = int32
std::vector<std::shared_ptr<Field>> fields1 = {f0, f1};
Expand All @@ -643,7 +643,7 @@ TEST_F(TestTable, ToTensorSupportedTypesMixed) {

EXPECT_TRUE(tensor_expected_1->Equals(*tensor1));

CheckTensor<Int32Type>(tensor1, 18, shape1, f_strides_1);
CheckTableToTensor<Int32Type>(tensor1, 18, shape1, f_strides_1);

ASSERT_EQ(tensor1->type()->bit_width(), tensor_expected_1->type()->bit_width());

Expand Down Expand Up @@ -672,7 +672,7 @@ TEST_F(TestTable, ToTensorSupportedTypesMixed) {
EXPECT_FALSE(tensor_expected_2->Equals(*tensor2));
EXPECT_TRUE(tensor_expected_2->Equals(*tensor2, EqualOptions().nans_equal(true)));

CheckTensor<DoubleType>(tensor2, 27, shape2, f_strides_2);
CheckTableToTensor<DoubleType>(tensor2, 27, shape2, f_strides_2);
}

TEST_F(TestTable, ToTensorUnsupportedMixedFloat16) {
Expand Down Expand Up @@ -738,7 +738,7 @@ TYPED_TEST_P(TestTableToTensorColumnMajor, SupportedTypes) {
shape, f_strides);

EXPECT_TRUE(tensor_expected->Equals(*tensor));
CheckTensor<DataType>(tensor, 27, shape, f_strides);
CheckTableToTensor<DataType>(tensor, 27, shape, f_strides);

// Test offsets
auto table_slice = table->Slice(1);
Expand All @@ -756,7 +756,7 @@ TYPED_TEST_P(TestTableToTensorColumnMajor, SupportedTypes) {
shape_sliced, f_strides_sliced);

EXPECT_TRUE(tensor_expected_sliced->Equals(*tensor_sliced));
CheckTensor<DataType>(tensor_expected_sliced, 24, shape_sliced, f_strides_sliced);
CheckTableToTensor<DataType>(tensor_expected_sliced, 24, shape_sliced, f_strides_sliced);

auto table_slice_1 = table->Slice(1, 5);

Expand All @@ -773,7 +773,7 @@ TYPED_TEST_P(TestTableToTensorColumnMajor, SupportedTypes) {
shape_sliced_1, f_strides_sliced_1);

EXPECT_TRUE(tensor_expected_sliced_1->Equals(*tensor_sliced_1));
CheckTensor<DataType>(tensor_expected_sliced_1, 15, shape_sliced_1, f_strides_sliced_1);
CheckTableToTensor<DataType>(tensor_expected_sliced_1, 15, shape_sliced_1, f_strides_sliced_1);
}

REGISTER_TYPED_TEST_SUITE_P(TestTableToTensorColumnMajor, SupportedTypes);
Expand Down Expand Up @@ -828,7 +828,7 @@ TYPED_TEST_P(TestTableToTensorRowMajor, SupportedTypes) {
shape, strides);

EXPECT_TRUE(tensor_expected->Equals(*tensor));
CheckTensorRowMajor<DataType>(tensor, 27, shape, strides);
CheckTableToTensorRowMajor<DataType>(tensor, 27, shape, strides);

// Test offsets
auto table_slice = table->Slice(1);
Expand All @@ -845,7 +845,7 @@ TYPED_TEST_P(TestTableToTensorRowMajor, SupportedTypes) {
shape_sliced, strides_sliced);

EXPECT_TRUE(tensor_expected_sliced->Equals(*tensor_sliced));
CheckTensorRowMajor<DataType>(tensor_sliced, 24, shape_sliced, strides_sliced);
CheckTableToTensorRowMajor<DataType>(tensor_sliced, 24, shape_sliced, strides_sliced);

auto table_slice_1 = table->Slice(1, 5);

Expand All @@ -860,7 +860,7 @@ TYPED_TEST_P(TestTableToTensorRowMajor, SupportedTypes) {
shape_sliced_1, strides_sliced_1);

EXPECT_TRUE(tensor_expected_sliced_1->Equals(*tensor_sliced_1));
CheckTensorRowMajor<DataType>(tensor_sliced_1, 15, shape_sliced_1, strides_sliced_1);
CheckTableToTensorRowMajor<DataType>(tensor_sliced_1, 15, shape_sliced_1, strides_sliced_1);
}

REGISTER_TYPED_TEST_SUITE_P(TestTableToTensorRowMajor, SupportedTypes);
Expand Down
6 changes: 2 additions & 4 deletions python/pyarrow/table.pxi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2149,8 +2149,7 @@ cdef class _Tabular(_PandasConvertible):
>>> animals = pa.array(["Flamingo", "Parrot", "Dog", "Horse", "Brittle stars", "Centipede"])
>>> table = pa.Table.from_arrays([n_legs, animals], names=["n_legs", "animals"])
>>> table.to_pydict()
{'n_legs': [2, 2, 4, 4, 5, 100], 'animals': [
'Flamingo', 'Parrot', ..., 'Centipede']}
{'n_legs': [2, 2, 4, 4, 5, 100], 'animals': ['Flamingo', 'Parrot', ..., 'Centipede']}
"""
entries = []
for i in range(self.num_columns):
Expand Down Expand Up @@ -4779,8 +4778,7 @@ cdef class Table(_Tabular):
animals: string
----
n_legs: [[2,4,5,100],[2,4,5,100]]
animals: [["Flamingo","Horse","Brittle stars","Centipede"],
["Flamingo","Horse","Brittle stars","Centipede"]]
animals: [["Flamingo",...,"Centipede"],["Flamingo",...,"Centipede"]]
"""
cdef:
vector[shared_ptr[CRecordBatch]] c_batches
Expand Down

0 comments on commit 083240e

Please sign in to comment.