Skip to content

ARROW-182: [C++] Factor out Array::Validate into a separate function #692

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wesm wants to merge 1 commit into from
Closed

ARROW-182: [C++] Factor out Array::Validate into a separate function #692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions cpp/src/arrow/array-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ class TestStringArray : public ::testing::Test {
TEST_F(TestStringArray, TestArrayBasics) {
ASSERT_EQ(length_, strings_->length());
ASSERT_EQ(1, strings_->null_count());
ASSERT_OK(strings_->Validate());
ASSERT_OK(ValidateArray(*strings_));
}

TEST_F(TestStringArray, TestType) {
Expand Down Expand Up @@ -801,7 +801,7 @@ class TestStringBuilder : public TestBuilder {
EXPECT_OK(builder_->Finish(&out));

result_ = std::dynamic_pointer_cast<StringArray>(out);
result_->Validate();
ASSERT_OK(ValidateArray(*result_));
}

protected:
Expand Down Expand Up @@ -899,7 +899,7 @@ class TestBinaryArray : public ::testing::Test {
TEST_F(TestBinaryArray, TestArrayBasics) {
ASSERT_EQ(length_, strings_->length());
ASSERT_EQ(1, strings_->null_count());
ASSERT_OK(strings_->Validate());
ASSERT_OK(ValidateArray(*strings_));
}

TEST_F(TestBinaryArray, TestType) {
Expand Down Expand Up @@ -969,7 +969,7 @@ class TestBinaryBuilder : public TestBuilder {
EXPECT_OK(builder_->Finish(&out));

result_ = std::dynamic_pointer_cast<BinaryArray>(out);
result_->Validate();
ASSERT_OK(ValidateArray(*result_));
}

protected:
Expand All @@ -994,7 +994,7 @@ TEST_F(TestBinaryBuilder, TestScalarAppend) {
}
}
Done();
ASSERT_OK(result_->Validate());
ASSERT_OK(ValidateArray(*result_));
ASSERT_EQ(reps * N, result_->length());
ASSERT_EQ(reps, result_->null_count());
ASSERT_EQ(reps * 6, result_->data()->size());
Expand Down Expand Up @@ -1354,7 +1354,7 @@ TEST_F(TestListBuilder, TestAppendNull) {

Done();

ASSERT_OK(result_->Validate());
ASSERT_OK(ValidateArray(*result_));
ASSERT_TRUE(result_->IsNull(0));
ASSERT_TRUE(result_->IsNull(1));

Expand All @@ -1368,7 +1368,7 @@ TEST_F(TestListBuilder, TestAppendNull) {

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
const vector<uint8_t>& is_valid) {
ASSERT_OK(result->Validate());
ASSERT_OK(ValidateArray(*result));
ASSERT_EQ(1, result->null_count());
ASSERT_EQ(0, result->values()->null_count());

Expand Down Expand Up @@ -1446,13 +1446,13 @@ TEST_F(TestListBuilder, BulkAppendInvalid) {
}

Done();
ASSERT_RAISES(Invalid, result_->Validate());
ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListBuilder, TestZeroLength) {
// All buffers are null
Done();
ASSERT_OK(result_->Validate());
ASSERT_OK(ValidateArray(*result_));
}

// ----------------------------------------------------------------------
Expand Down Expand Up @@ -1569,9 +1569,9 @@ TEST(TestDictionary, Validate) {
std::shared_ptr<Array> arr3 = std::make_shared<DictionaryArray>(dict_type, indices3);

// Only checking index type for now
ASSERT_OK(arr->Validate());
ASSERT_RAISES(Invalid, arr2->Validate());
ASSERT_OK(arr3->Validate());
ASSERT_OK(ValidateArray(*arr));
ASSERT_RAISES(Invalid, ValidateArray(*arr2));
ASSERT_OK(ValidateArray(*arr3));
}

// ----------------------------------------------------------------------
Expand All @@ -1582,7 +1582,7 @@ void ValidateBasicStructArray(const StructArray* result,
const vector<uint8_t>& list_is_valid, const vector<int>& list_lengths,
const vector<int>& list_offsets, const vector<int32_t>& int_values) {
ASSERT_EQ(4, result->length());
ASSERT_OK(result->Validate());
ASSERT_OK(ValidateArray(*result));

auto list_char_arr = static_cast<ListArray*>(result->field(0).get());
auto char_arr = static_cast<Int8Array*>(list_char_arr->values().get());
Expand Down Expand Up @@ -1666,7 +1666,7 @@ TEST_F(TestStructBuilder, TestAppendNull) {

Done();

ASSERT_OK(result_->Validate());
ASSERT_OK(ValidateArray(*result_));

ASSERT_EQ(2, static_cast<int>(result_->fields().size()));
ASSERT_EQ(2, result_->length());
Expand Down Expand Up @@ -1777,8 +1777,8 @@ TEST_F(TestStructBuilder, BulkAppendInvalid) {
}

Done();
// Even null bitmap of the parent Struct is not valid, Validate() will ignore it.
ASSERT_OK(result_->Validate());
// Even null bitmap of the parent Struct is not valid, validate will ignore it.
ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestStructBuilder, TestEquality) {
Expand Down Expand Up @@ -1924,7 +1924,7 @@ TEST_F(TestStructBuilder, TestEquality) {
TEST_F(TestStructBuilder, TestZeroLength) {
// All buffers are null
Done();
ASSERT_OK(result_->Validate());
ASSERT_OK(ValidateArray(*result_));
}

// ----------------------------------------------------------------------
Expand Down
Loading