[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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
pcmoritz wants to merge 3 commits into from
Closed

[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize #3858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c885e90
implement LargeListArray, LargeListBuilder and IPC methods
pcmoritz Mar 11, 2019
362d8e9
add ChunkedUnionBuilder
pcmoritz Mar 11, 2019
49faafb
use large list array
pcmoritz Mar 11, 2019
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
183 changes: 166 additions & 17 deletions cpp/src/arrow/array-list-test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
public:
void SetUp() {
TestBuilder::SetUp();

value_type_ = int32();
type_ = large_list(value_type_);

std::unique_ptr<ArrayBuilder> tmp;
ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
}

void Done() {
std::shared_ptr<Array> out;
FinishAndCheckPadding(builder_.get(), &out);
result_ = std::dynamic_pointer_cast<LargeListArray>(out);
}

protected:
std::shared_ptr<DataType> value_type_;

std::shared_ptr<LargeListBuilder> builder_;
std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

std::shared_ptr<Array> array, equal_array, unequal_array;
vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
vector<int32_t> unequal_offsets = {0, 1, 4, 7};
vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

// setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

std::vector<bool> offsets_is_valid3 = {true, false, true, true};
std::vector<bool> offsets_is_valid4 = {true, true, false, true};

std::vector<bool> values_is_valid = {true, false, true, true, true, true};

std::vector<int32_t> offset1_values = {0, 2, 2, 6};
std::vector<int32_t> offset2_values = {0, 2, 6, 6};
std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
const int length = 3;

ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
&offsets3);
ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
&offsets4);

ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

auto list_type = list(int8());

std::shared_ptr<Array> list1, list3, list4;
ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
builder_);
}

TEST_F(TestListArray, TestAppendNull) {
ASSERT_OK(builder_->AppendNull());
ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
ASSERT_OK(builder_->AppendNull());
ASSERT_OK(builder_->AppendNull());

Done();

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

ASSERT_EQ(0, result_->raw_value_offsets()[0]);
ASSERT_EQ(0, result_->value_offset(1));
ASSERT_EQ(0, result_->value_offset(2));

auto values = result_->values();
ASSERT_EQ(0, values->length());
// Values buffer should be non-null
ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

ASSERT_EQ(3, result->length());
vector<int32_t> ex_offsets = {0, 3, 3, 7};
vector<OffsetType> ex_offsets = {0, 3, 3, 7};
for (size_t i = 0; i < ex_offsets.size(); ++i) {
ASSERT_EQ(ex_offsets[i], result->value_offset(i));
}
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
}

Done();
ValidateBasicListArray(result_.get(), values, is_valid);
ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
vector<int64_t> lengths = {3, 0, 4};
vector<uint8_t> is_valid = {1, 0, 1};

Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

ASSERT_OK(builder_->Reserve(lengths.size()));
ASSERT_OK(vb->Reserve(values.size()));

int pos = 0;
for (size_t i = 0; i < lengths.size(); ++i) {
ASSERT_OK(builder_->Append(is_valid[i] > 0));
for (int j = 0; j < lengths[i]; ++j) {
ASSERT_OK(vb->Append(values[pos++]));
}
}

Done();
ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
ASSERT_OK(vb->Append(value));
}
Done();
ValidateBasicListArray(result_.get(), values, is_valid);
ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
vector<int64_t> lengths = {3, 0, 4};
vector<uint8_t> is_valid = {1, 0, 1};
vector<int64_t> offsets = {0, 3, 3};

Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
ASSERT_OK(vb->Reserve(values.size()));

ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
for (int32_t value : values) {
ASSERT_OK(vb->Append(value));
}
Done();
ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
vector<int> lengths = {3, 0, 4};
vector<uint8_t> is_null = {0, 1, 0};
vector<uint8_t> is_valid = {1, 0, 1};
vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
ASSERT_OK(vb->Reserve(values.size()));

ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
for (int32_t value : values) {
ASSERT_OK(vb->Append(value));
}

Done();
ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
// All buffers are null
Done();
ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
// All buffers are null
Done();
ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
auto list_type_with_name = large_list(field("counts", int32()));

std::unique_ptr<ArrayBuilder> tmp;
ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

vector<int64_t> values = {1, 2, 4, 8};
ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

std::shared_ptr<Array> list_array;
ASSERT_OK(builder_->Finish(&list_array));

const auto& type = checked_cast<LargeListType&>(*list_array->type());
ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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

pcmoritz
wants to merge
3
commits into

from

 Closed


[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize
#3858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c885e90

implement LargeListArray, LargeListBuilder and IPC methods


pcmoritz Mar 11, 2019
362d8e9

add ChunkedUnionBuilder


pcmoritz Mar 11, 2019
49faafb

use large list array


pcmoritz Mar 11, 2019

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


183 changes: 166 additions & 17 deletions
cpp/src/arrow/array-list-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
 std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
 public:
 void SetUp() {
 TestBuilder::SetUp();

 value_type_ = int32();
 type_ = large_list(value_type_);

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
 }

 void Done() {
 std::shared_ptr<Array> out;
 FinishAndCheckPadding(builder_.get(), &out);
 result_ = std::dynamic_pointer_cast<LargeListArray>(out);
 }

 protected:
 std::shared_ptr<DataType> value_type_;

 std::shared_ptr<LargeListBuilder> builder_;
 std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 std::shared_ptr<Array> array, equal_array, unequal_array;
 vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
 vector<int32_t> unequal_offsets = {0, 1, 4, 7};
 vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
 vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

 // setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
 ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
 TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
 typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
 std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

 std::vector<bool> offsets_is_valid3 = {true, false, true, true};
 std::vector<bool> offsets_is_valid4 = {true, true, false, true};

 std::vector<bool> values_is_valid = {true, false, true, true, true, true};

 std::vector<int32_t> offset1_values = {0, 2, 2, 6};
 std::vector<int32_t> offset2_values = {0, 2, 6, 6};
 std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
 std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

 std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
 const int length = 3;

 ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
 ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
 &offsets3);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
 &offsets4);

 ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

 auto list_type = list(int8());

 std::shared_ptr<Array> list1, list3, list4;
 ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
 ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

 ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
 offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
 ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
 TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
 TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
 builder_);
}

TEST_F(TestListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());

 Done();

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

 ASSERT_EQ(0, result_->raw_value_offsets()[0]);
 ASSERT_EQ(0, result_->value_offset(1));
 ASSERT_EQ(0, result_->value_offset(2));

 auto values = result_->values();
 ASSERT_EQ(0, values->length());
 // Values buffer should be non-null
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

 ASSERT_EQ(3, result->length());
 vector<int32_t> ex_offsets = {0, 3, 3, 7};
 vector<OffsetType> ex_offsets = {0, 3, 3, 7};
 for (size_t i = 0; i < ex_offsets.size(); ++i) {
 ASSERT_EQ(ex_offsets[i], result->value_offset(i));
 }
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
 }

 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 ASSERT_OK(builder_->Reserve(lengths.size()));
 ASSERT_OK(vb->Reserve(values.size()));

 int pos = 0;
 for (size_t i = 0; i < lengths.size(); ++i) {
 ASSERT_OK(builder_->Append(is_valid[i] > 0));
 for (int j = 0; j < lengths[i]; ++j) {
 ASSERT_OK(vb->Append(values[pos++]));
 }
 }

 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 3, 3};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int> lengths = {3, 0, 4};
 vector<uint8_t> is_null = {0, 1, 0};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }

 Done();
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = large_list(field("counts", int32()));

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

 vector<int64_t> values = {1, 2, 4, 8};
 ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

 std::shared_ptr<Array> list_array;
 ASSERT_OK(builder_->Finish(&list_array));

 const auto& type = checked_cast<LargeListType&>(*list_array->type());
 ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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

pcmoritz
wants to merge
3
commits into

from

 Closed


[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize
#3858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c885e90

implement LargeListArray, LargeListBuilder and IPC methods


pcmoritz Mar 11, 2019
362d8e9

add ChunkedUnionBuilder


pcmoritz Mar 11, 2019
49faafb

use large list array


pcmoritz Mar 11, 2019

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


183 changes: 166 additions & 17 deletions
cpp/src/arrow/array-list-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
 std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
 public:
 void SetUp() {
 TestBuilder::SetUp();

 value_type_ = int32();
 type_ = large_list(value_type_);

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
 }

 void Done() {
 std::shared_ptr<Array> out;
 FinishAndCheckPadding(builder_.get(), &out);
 result_ = std::dynamic_pointer_cast<LargeListArray>(out);
 }

 protected:
 std::shared_ptr<DataType> value_type_;

 std::shared_ptr<LargeListBuilder> builder_;
 std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 std::shared_ptr<Array> array, equal_array, unequal_array;
 vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
 vector<int32_t> unequal_offsets = {0, 1, 4, 7};
 vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
 vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

 // setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
 ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
 TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
 typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
 std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

 std::vector<bool> offsets_is_valid3 = {true, false, true, true};
 std::vector<bool> offsets_is_valid4 = {true, true, false, true};

 std::vector<bool> values_is_valid = {true, false, true, true, true, true};

 std::vector<int32_t> offset1_values = {0, 2, 2, 6};
 std::vector<int32_t> offset2_values = {0, 2, 6, 6};
 std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
 std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

 std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
 const int length = 3;

 ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
 ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
 &offsets3);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
 &offsets4);

 ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

 auto list_type = list(int8());

 std::shared_ptr<Array> list1, list3, list4;
 ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
 ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

 ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
 offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
 ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
 TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
 TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
 builder_);
}

TEST_F(TestListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());

 Done();

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

 ASSERT_EQ(0, result_->raw_value_offsets()[0]);
 ASSERT_EQ(0, result_->value_offset(1));
 ASSERT_EQ(0, result_->value_offset(2));

 auto values = result_->values();
 ASSERT_EQ(0, values->length());
 // Values buffer should be non-null
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

 ASSERT_EQ(3, result->length());
 vector<int32_t> ex_offsets = {0, 3, 3, 7};
 vector<OffsetType> ex_offsets = {0, 3, 3, 7};
 for (size_t i = 0; i < ex_offsets.size(); ++i) {
 ASSERT_EQ(ex_offsets[i], result->value_offset(i));
 }
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
 }

 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 ASSERT_OK(builder_->Reserve(lengths.size()));
 ASSERT_OK(vb->Reserve(values.size()));

 int pos = 0;
 for (size_t i = 0; i < lengths.size(); ++i) {
 ASSERT_OK(builder_->Append(is_valid[i] > 0));
 for (int j = 0; j < lengths[i]; ++j) {
 ASSERT_OK(vb->Append(values[pos++]));
 }
 }

 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 3, 3};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int> lengths = {3, 0, 4};
 vector<uint8_t> is_null = {0, 1, 0};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }

 Done();
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = large_list(field("counts", int32()));

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

 vector<int64_t> values = {1, 2, 4, 8};
 ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

 std::shared_ptr<Array> list_array;
 ASSERT_OK(builder_->Finish(&list_array));

 const auto& type = checked_cast<LargeListType&>(*list_array->type());
 ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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

pcmoritz
wants to merge
3
commits into

from

 Closed


[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize
#3858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c885e90

implement LargeListArray, LargeListBuilder and IPC methods


pcmoritz Mar 11, 2019
362d8e9

add ChunkedUnionBuilder


pcmoritz Mar 11, 2019
49faafb

use large list array


pcmoritz Mar 11, 2019

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


183 changes: 166 additions & 17 deletions
cpp/src/arrow/array-list-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
 std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
 public:
 void SetUp() {
 TestBuilder::SetUp();

 value_type_ = int32();
 type_ = large_list(value_type_);

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
 }

 void Done() {
 std::shared_ptr<Array> out;
 FinishAndCheckPadding(builder_.get(), &out);
 result_ = std::dynamic_pointer_cast<LargeListArray>(out);
 }

 protected:
 std::shared_ptr<DataType> value_type_;

 std::shared_ptr<LargeListBuilder> builder_;
 std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 std::shared_ptr<Array> array, equal_array, unequal_array;
 vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
 vector<int32_t> unequal_offsets = {0, 1, 4, 7};
 vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
 vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

 // setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
 ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
 TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
 typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
 std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

 std::vector<bool> offsets_is_valid3 = {true, false, true, true};
 std::vector<bool> offsets_is_valid4 = {true, true, false, true};

 std::vector<bool> values_is_valid = {true, false, true, true, true, true};

 std::vector<int32_t> offset1_values = {0, 2, 2, 6};
 std::vector<int32_t> offset2_values = {0, 2, 6, 6};
 std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
 std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

 std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
 const int length = 3;

 ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
 ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
 &offsets3);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
 &offsets4);

 ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

 auto list_type = list(int8());

 std::shared_ptr<Array> list1, list3, list4;
 ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
 ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

 ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
 offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
 ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
 TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
 TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
 builder_);
}

TEST_F(TestListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());

 Done();

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

 ASSERT_EQ(0, result_->raw_value_offsets()[0]);
 ASSERT_EQ(0, result_->value_offset(1));
 ASSERT_EQ(0, result_->value_offset(2));

 auto values = result_->values();
 ASSERT_EQ(0, values->length());
 // Values buffer should be non-null
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

 ASSERT_EQ(3, result->length());
 vector<int32_t> ex_offsets = {0, 3, 3, 7};
 vector<OffsetType> ex_offsets = {0, 3, 3, 7};
 for (size_t i = 0; i < ex_offsets.size(); ++i) {
 ASSERT_EQ(ex_offsets[i], result->value_offset(i));
 }
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
 }

 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 ASSERT_OK(builder_->Reserve(lengths.size()));
 ASSERT_OK(vb->Reserve(values.size()));

 int pos = 0;
 for (size_t i = 0; i < lengths.size(); ++i) {
 ASSERT_OK(builder_->Append(is_valid[i] > 0));
 for (int j = 0; j < lengths[i]; ++j) {
 ASSERT_OK(vb->Append(values[pos++]));
 }
 }

 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 3, 3};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int> lengths = {3, 0, 4};
 vector<uint8_t> is_null = {0, 1, 0};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }

 Done();
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = large_list(field("counts", int32()));

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

 vector<int64_t> values = {1, 2, 4, 8};
 ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

 std::shared_ptr<Array> list_array;
 ASSERT_OK(builder_->Finish(&list_array));

 const auto& type = checked_cast<LargeListType&>(*list_array->type());
 ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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

pcmoritz
wants to merge
3
commits into

from

 Closed


[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize
#3858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c885e90

implement LargeListArray, LargeListBuilder and IPC methods


pcmoritz Mar 11, 2019
362d8e9

add ChunkedUnionBuilder


pcmoritz Mar 11, 2019
49faafb

use large list array


pcmoritz Mar 11, 2019

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


183 changes: 166 additions & 17 deletions
cpp/src/arrow/array-list-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
 std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
 public:
 void SetUp() {
 TestBuilder::SetUp();

 value_type_ = int32();
 type_ = large_list(value_type_);

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
 }

 void Done() {
 std::shared_ptr<Array> out;
 FinishAndCheckPadding(builder_.get(), &out);
 result_ = std::dynamic_pointer_cast<LargeListArray>(out);
 }

 protected:
 std::shared_ptr<DataType> value_type_;

 std::shared_ptr<LargeListBuilder> builder_;
 std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 std::shared_ptr<Array> array, equal_array, unequal_array;
 vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
 vector<int32_t> unequal_offsets = {0, 1, 4, 7};
 vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
 vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

 // setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
 ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
 TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
 typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
 std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

 std::vector<bool> offsets_is_valid3 = {true, false, true, true};
 std::vector<bool> offsets_is_valid4 = {true, true, false, true};

 std::vector<bool> values_is_valid = {true, false, true, true, true, true};

 std::vector<int32_t> offset1_values = {0, 2, 2, 6};
 std::vector<int32_t> offset2_values = {0, 2, 6, 6};
 std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
 std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

 std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
 const int length = 3;

 ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
 ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
 &offsets3);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
 &offsets4);

 ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

 auto list_type = list(int8());

 std::shared_ptr<Array> list1, list3, list4;
 ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
 ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

 ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
 offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
 ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
 TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
 TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
 builder_);
}

TEST_F(TestListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());

 Done();

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

 ASSERT_EQ(0, result_->raw_value_offsets()[0]);
 ASSERT_EQ(0, result_->value_offset(1));
 ASSERT_EQ(0, result_->value_offset(2));

 auto values = result_->values();
 ASSERT_EQ(0, values->length());
 // Values buffer should be non-null
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

 ASSERT_EQ(3, result->length());
 vector<int32_t> ex_offsets = {0, 3, 3, 7};
 vector<OffsetType> ex_offsets = {0, 3, 3, 7};
 for (size_t i = 0; i < ex_offsets.size(); ++i) {
 ASSERT_EQ(ex_offsets[i], result->value_offset(i));
 }
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
 }

 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 ASSERT_OK(builder_->Reserve(lengths.size()));
 ASSERT_OK(vb->Reserve(values.size()));

 int pos = 0;
 for (size_t i = 0; i < lengths.size(); ++i) {
 ASSERT_OK(builder_->Append(is_valid[i] > 0));
 for (int j = 0; j < lengths[i]; ++j) {
 ASSERT_OK(vb->Append(values[pos++]));
 }
 }

 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 3, 3};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int> lengths = {3, 0, 4};
 vector<uint8_t> is_null = {0, 1, 0};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }

 Done();
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = large_list(field("counts", int32()));

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

 vector<int64_t> values = {1, 2, 4, 8};
 ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

 std::shared_ptr<Array> list_array;
 ASSERT_OK(builder_->Finish(&list_array));

 const auto& type = checked_cast<LargeListType&>(*list_array->type());
 ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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

pcmoritz
wants to merge
3
commits into

from

 Closed


[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize
#3858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c885e90

implement LargeListArray, LargeListBuilder and IPC methods


pcmoritz Mar 11, 2019
362d8e9

add ChunkedUnionBuilder


pcmoritz Mar 11, 2019
49faafb

use large list array


pcmoritz Mar 11, 2019

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


183 changes: 166 additions & 17 deletions
cpp/src/arrow/array-list-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
 std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
 public:
 void SetUp() {
 TestBuilder::SetUp();

 value_type_ = int32();
 type_ = large_list(value_type_);

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
 }

 void Done() {
 std::shared_ptr<Array> out;
 FinishAndCheckPadding(builder_.get(), &out);
 result_ = std::dynamic_pointer_cast<LargeListArray>(out);
 }

 protected:
 std::shared_ptr<DataType> value_type_;

 std::shared_ptr<LargeListBuilder> builder_;
 std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 std::shared_ptr<Array> array, equal_array, unequal_array;
 vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
 vector<int32_t> unequal_offsets = {0, 1, 4, 7};
 vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
 vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

 // setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
 ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
 TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
 typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
 std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

 std::vector<bool> offsets_is_valid3 = {true, false, true, true};
 std::vector<bool> offsets_is_valid4 = {true, true, false, true};

 std::vector<bool> values_is_valid = {true, false, true, true, true, true};

 std::vector<int32_t> offset1_values = {0, 2, 2, 6};
 std::vector<int32_t> offset2_values = {0, 2, 6, 6};
 std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
 std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

 std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
 const int length = 3;

 ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
 ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
 &offsets3);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
 &offsets4);

 ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

 auto list_type = list(int8());

 std::shared_ptr<Array> list1, list3, list4;
 ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
 ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

 ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
 offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
 ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
 TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
 TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
 builder_);
}

TEST_F(TestListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());

 Done();

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

 ASSERT_EQ(0, result_->raw_value_offsets()[0]);
 ASSERT_EQ(0, result_->value_offset(1));
 ASSERT_EQ(0, result_->value_offset(2));

 auto values = result_->values();
 ASSERT_EQ(0, values->length());
 // Values buffer should be non-null
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

 ASSERT_EQ(3, result->length());
 vector<int32_t> ex_offsets = {0, 3, 3, 7};
 vector<OffsetType> ex_offsets = {0, 3, 3, 7};
 for (size_t i = 0; i < ex_offsets.size(); ++i) {
 ASSERT_EQ(ex_offsets[i], result->value_offset(i));
 }
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
 }

 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 ASSERT_OK(builder_->Reserve(lengths.size()));
 ASSERT_OK(vb->Reserve(values.size()));

 int pos = 0;
 for (size_t i = 0; i < lengths.size(); ++i) {
 ASSERT_OK(builder_->Append(is_valid[i] > 0));
 for (int j = 0; j < lengths[i]; ++j) {
 ASSERT_OK(vb->Append(values[pos++]));
 }
 }

 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 3, 3};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int> lengths = {3, 0, 4};
 vector<uint8_t> is_null = {0, 1, 0};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }

 Done();
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = large_list(field("counts", int32()));

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

 vector<int64_t> values = {1, 2, 4, 8};
 ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

 std::shared_ptr<Array> list_array;
 ASSERT_OK(builder_->Finish(&list_array));

 const auto& type = checked_cast<LargeListType&>(*list_array->type());
 ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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

pcmoritz
wants to merge
3
commits into

from

 Closed


[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize
#3858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c885e90

implement LargeListArray, LargeListBuilder and IPC methods


pcmoritz Mar 11, 2019
362d8e9

add ChunkedUnionBuilder


pcmoritz Mar 11, 2019
49faafb

use large list array


pcmoritz Mar 11, 2019

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


183 changes: 166 additions & 17 deletions
cpp/src/arrow/array-list-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
 std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
 public:
 void SetUp() {
 TestBuilder::SetUp();

 value_type_ = int32();
 type_ = large_list(value_type_);

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
 }

 void Done() {
 std::shared_ptr<Array> out;
 FinishAndCheckPadding(builder_.get(), &out);
 result_ = std::dynamic_pointer_cast<LargeListArray>(out);
 }

 protected:
 std::shared_ptr<DataType> value_type_;

 std::shared_ptr<LargeListBuilder> builder_;
 std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 std::shared_ptr<Array> array, equal_array, unequal_array;
 vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
 vector<int32_t> unequal_offsets = {0, 1, 4, 7};
 vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
 vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

 // setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
 ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
 TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
 typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
 std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

 std::vector<bool> offsets_is_valid3 = {true, false, true, true};
 std::vector<bool> offsets_is_valid4 = {true, true, false, true};

 std::vector<bool> values_is_valid = {true, false, true, true, true, true};

 std::vector<int32_t> offset1_values = {0, 2, 2, 6};
 std::vector<int32_t> offset2_values = {0, 2, 6, 6};
 std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
 std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

 std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
 const int length = 3;

 ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
 ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
 &offsets3);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
 &offsets4);

 ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

 auto list_type = list(int8());

 std::shared_ptr<Array> list1, list3, list4;
 ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
 ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

 ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
 offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
 ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
 TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
 TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
 builder_);
}

TEST_F(TestListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());

 Done();

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

 ASSERT_EQ(0, result_->raw_value_offsets()[0]);
 ASSERT_EQ(0, result_->value_offset(1));
 ASSERT_EQ(0, result_->value_offset(2));

 auto values = result_->values();
 ASSERT_EQ(0, values->length());
 // Values buffer should be non-null
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

 ASSERT_EQ(3, result->length());
 vector<int32_t> ex_offsets = {0, 3, 3, 7};
 vector<OffsetType> ex_offsets = {0, 3, 3, 7};
 for (size_t i = 0; i < ex_offsets.size(); ++i) {
 ASSERT_EQ(ex_offsets[i], result->value_offset(i));
 }
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
 }

 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 ASSERT_OK(builder_->Reserve(lengths.size()));
 ASSERT_OK(vb->Reserve(values.size()));

 int pos = 0;
 for (size_t i = 0; i < lengths.size(); ++i) {
 ASSERT_OK(builder_->Append(is_valid[i] > 0));
 for (int j = 0; j < lengths[i]; ++j) {
 ASSERT_OK(vb->Append(values[pos++]));
 }
 }

 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 3, 3};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int> lengths = {3, 0, 4};
 vector<uint8_t> is_null = {0, 1, 0};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }

 Done();
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = large_list(field("counts", int32()));

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

 vector<int64_t> values = {1, 2, 4, 8};
 ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

 std::shared_ptr<Array> list_array;
 ASSERT_OK(builder_->Finish(&list_array));

 const auto& type = checked_cast<LargeListType&>(*list_array->type());
 ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize#3858

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

pcmoritz
wants to merge
3
commits into

from

 Closed


[WIP] [Python] Support 64 bit indices for pyarrow.serialize and pyarrow.deserialize
#3858
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c885e90

implement LargeListArray, LargeListBuilder and IPC methods


pcmoritz Mar 11, 2019
362d8e9

add ChunkedUnionBuilder


pcmoritz Mar 11, 2019
49faafb

use large list array


pcmoritz Mar 11, 2019

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


183 changes: 166 additions & 17 deletions
cpp/src/arrow/array-list-test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -69,13 +69,40 @@ class TestListArray : public TestBuilder {
 std::shared_ptr<ListArray> result_;
};

TEST_F(TestListArray, Equality) {
class TestLargeListArray : public TestBuilder {
 public:
 void SetUp() {
 TestBuilder::SetUp();

 value_type_ = int32();
 type_ = large_list(value_type_);

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, type_, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));
 }

 void Done() {
 std::shared_ptr<Array> out;
 FinishAndCheckPadding(builder_.get(), &out);
 result_ = std::dynamic_pointer_cast<LargeListArray>(out);
 }

 protected:
 std::shared_ptr<DataType> value_type_;

 std::shared_ptr<LargeListBuilder> builder_;
 std::shared_ptr<LargeListArray> result_;
};

template <typename ListBuilderType, typename OffsetType>
void TestListEquality(std::shared_ptr<ListBuilderType> builder_) {
 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 std::shared_ptr<Array> array, equal_array, unequal_array;
 vector<int32_t> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<OffsetType> equal_offsets = {0, 1, 2, 5, 6, 7, 8, 10};
 vector<int32_t> equal_values = {1, 2, 3, 4, 5, 2, 2, 2, 5, 6};
 vector<int32_t> unequal_offsets = {0, 1, 4, 7};
 vector<OffsetType> unequal_offsets = {0, 1, 4, 7};
 vector<int32_t> unequal_values = {1, 2, 2, 2, 3, 4, 5};

 // setup two equal arrays
Expand DownExpand Up@@ -128,36 +155,46 @@ TEST_F(TestListArray, Equality) {
 ASSERT_TRUE(array->RangeEquals(1, 5, 0, slice));
}

TEST_F(TestListArray, Equality) { TestListEquality<ListBuilder, int32_t>(builder_); }

TEST_F(TestLargeListArray, Equality) {
 TestListEquality<LargeListBuilder, int64_t>(builder_);
}

TEST_F(TestListArray, TestResize) {}

TEST_F(TestListArray, TestFromArrays) {
template <typename ListType, typename ListBuilderType, typename OffsetType,
 typename ArrowOffsetType>
void TestListFromArrays(MemoryPool* pool_, std::shared_ptr<ListBuilderType> builder_) {
 std::shared_ptr<Array> offsets1, offsets2, offsets3, offsets4, values;

 std::vector<bool> offsets_is_valid3 = {true, false, true, true};
 std::vector<bool> offsets_is_valid4 = {true, true, false, true};

 std::vector<bool> values_is_valid = {true, false, true, true, true, true};

 std::vector<int32_t> offset1_values = {0, 2, 2, 6};
 std::vector<int32_t> offset2_values = {0, 2, 6, 6};
 std::vector<OffsetType> offset1_values = {0, 2, 2, 6};
 std::vector<OffsetType> offset2_values = {0, 2, 6, 6};

 std::vector<int8_t> values_values = {0, 1, 2, 3, 4, 5};
 const int length = 3;

 ArrayFromVector<Int32Type, int32_t>(offset1_values, &offsets1);
 ArrayFromVector<Int32Type, int32_t>(offset2_values, &offsets2);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset1_values, &offsets1);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offset2_values, &offsets2);

 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid3, offset1_values, &offsets3);
 ArrayFromVector<Int32Type, int32_t>(offsets_is_valid4, offset2_values, &offsets4);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid3, offset1_values,
 &offsets3);
 ArrayFromVector<ArrowOffsetType, OffsetType>(offsets_is_valid4, offset2_values,
 &offsets4);

 ArrayFromVector<Int8Type, int8_t>(values_is_valid, values_values, &values);

 auto list_type = list(int8());

 std::shared_ptr<Array> list1, list3, list4;
 ASSERT_OK(ListArray::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListArray::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListArray::FromArrays(*offsets4, *values, pool_, &list4));
 ASSERT_OK(ListType::FromArrays(*offsets1, *values, pool_, &list1));
 ASSERT_OK(ListType::FromArrays(*offsets3, *values, pool_, &list3));
 ASSERT_OK(ListType::FromArrays(*offsets4, *values, pool_, &list4));

 ListArray expected1(list_type, length, offsets1->data()->buffers[1], values,
 offsets1->data()->buffers[0], 0);
Expand DownExpand Up@@ -187,6 +224,15 @@ TEST_F(TestListArray, TestFromArrays) {
 ASSERT_RAISES(Invalid, ListArray::FromArrays(*values, *offsets1, pool_, &tmp));
}

TEST_F(TestListArray, TestFromArrays) {
 TestListFromArrays<ListArray, ListBuilder, int32_t, Int32Type>(pool_, builder_);
}

TEST_F(TestLargeListArray, TestFromArrays) {
 TestListFromArrays<LargeListArray, LargeListBuilder, int64_t, Int64Type>(pool_,
 builder_);
}

TEST_F(TestListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());
Expand All@@ -207,14 +253,35 @@ TEST_F(TestListArray, TestAppendNull) {
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

void ValidateBasicListArray(const ListArray* result, const vector<int32_t>& values,
TEST_F(TestLargeListArray, TestAppendNull) {
 ASSERT_OK(builder_->AppendNull());
 ASSERT_OK(builder_->AppendNull());

 Done();

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

 ASSERT_EQ(0, result_->raw_value_offsets()[0]);
 ASSERT_EQ(0, result_->value_offset(1));
 ASSERT_EQ(0, result_->value_offset(2));

 auto values = result_->values();
 ASSERT_EQ(0, values->length());
 // Values buffer should be non-null
 ASSERT_NE(nullptr, values->data()->buffers[1]);
}

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

 ASSERT_EQ(3, result->length());
 vector<int32_t> ex_offsets = {0, 3, 3, 7};
 vector<OffsetType> ex_offsets = {0, 3, 3, 7};
 for (size_t i = 0; i < ex_offsets.size(); ++i) {
 ASSERT_EQ(ex_offsets[i], result->value_offset(i));
 }
Expand DownExpand Up@@ -250,7 +317,29 @@ TEST_F(TestListArray, TestBasics) {
 }

 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, TestBasics) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());

 ASSERT_OK(builder_->Reserve(lengths.size()));
 ASSERT_OK(vb->Reserve(values.size()));

 int pos = 0;
 for (size_t i = 0; i < lengths.size(); ++i) {
 ASSERT_OK(builder_->Append(is_valid[i] > 0));
 for (int j = 0; j < lengths[i]; ++j) {
 ASSERT_OK(vb->Append(values[pos++]));
 }
 }

 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppend) {
Expand All@@ -267,7 +356,24 @@ TEST_F(TestListArray, BulkAppend) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray(result_.get(), values, is_valid);
 ValidateBasicListArray<ListArray, int32_t>(result_.get(), values, is_valid);
}

TEST_F(TestLargeListArray, BulkAppend) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int64_t> lengths = {3, 0, 4};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 3, 3};

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }
 Done();
 ValidateBasicListArray<LargeListArray, int64_t>(result_.get(), values, is_valid);
}

TEST_F(TestListArray, BulkAppendInvalid) {
Expand All@@ -290,12 +396,38 @@ TEST_F(TestListArray, BulkAppendInvalid) {
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestLargeListArray, BulkAppendInvalid) {
 vector<int32_t> values = {0, 1, 2, 3, 4, 5, 6};
 vector<int> lengths = {3, 0, 4};
 vector<uint8_t> is_null = {0, 1, 0};
 vector<uint8_t> is_valid = {1, 0, 1};
 vector<int64_t> offsets = {0, 2, 4}; // should be 0, 3, 3 given the is_null array

 Int32Builder* vb = checked_cast<Int32Builder*>(builder_->value_builder());
 ASSERT_OK(vb->Reserve(values.size()));

 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 ASSERT_OK(builder_->AppendValues(offsets.data(), offsets.size(), is_valid.data()));
 for (int32_t value : values) {
 ASSERT_OK(vb->Append(value));
 }

 Done();
 ASSERT_RAISES(Invalid, ValidateArray(*result_));
}

TEST_F(TestListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestLargeListArray, TestZeroLength) {
 // All buffers are null
 Done();
 ASSERT_OK(ValidateArray(*result_));
}

TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = list(field("counts", int32()));

Expand All@@ -313,4 +445,21 @@ TEST_F(TestListArray, TestBuilderPreserveFieleName) {
 ASSERT_EQ("counts", type.value_field()->name());
}

TEST_F(TestLargeListArray, TestBuilderPreserveFieleName) {
 auto list_type_with_name = large_list(field("counts", int32()));

 std::unique_ptr<ArrayBuilder> tmp;
 ASSERT_OK(MakeBuilder(pool_, list_type_with_name, &tmp));
 builder_.reset(checked_cast<LargeListBuilder*>(tmp.release()));

 vector<int64_t> values = {1, 2, 4, 8};
 ASSERT_OK(builder_->AppendValues(values.data(), values.size()));

 std::shared_ptr<Array> list_array;
 ASSERT_OK(builder_->Finish(&list_array));

 const auto& type = checked_cast<LargeListType&>(*list_array->type());
 ASSERT_EQ("counts", type.value_field()->name());
}

} // namespace arrow
Loading