Skip to content

ARROW-1073: C++: Adapative integer builder #723

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
xhochy wants to merge 1 commit into from
Closed

ARROW-1073: C++: Adapative integer builder #723

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
220 changes: 220 additions & 0 deletions cpp/src/arrow/array-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,226 @@ TEST_F(TestFWBinaryArray, Slice) {
ASSERT_TRUE(array->RangeEquals(1, 3, 0, slice));
}

// ----------------------------------------------------------------------
// AdaptiveInt tests

class TestAdaptiveIntBuilder : public TestBuilder {
public:
void SetUp() {
TestBuilder::SetUp();
builder_ = std::make_shared<AdaptiveIntBuilder>(pool_);
}

void Done() { EXPECT_OK(builder_->Finish(&result_)); }

protected:
std::shared_ptr<AdaptiveIntBuilder> builder_;

std::shared_ptr<Array> expected_;
std::shared_ptr<Array> result_;
};

TEST_F(TestAdaptiveIntBuilder, TestInt8) {
builder_->Append(0);
builder_->Append(127);
builder_->Append(-128);

Done();

std::vector<int8_t> expected_values({0, 127, -128});
ArrayFromVector<Int8Type, int8_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveIntBuilder, TestInt16) {
builder_->Append(0);
builder_->Append(128);
Done();

std::vector<int16_t> expected_values({0, 128});
ArrayFromVector<Int16Type, int16_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(-129);
expected_values = {-129};
Done();

ArrayFromVector<Int16Type, int16_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(std::numeric_limits<int16_t>::max());
builder_->Append(std::numeric_limits<int16_t>::min());
expected_values = {
std::numeric_limits<int16_t>::max(), std::numeric_limits<int16_t>::min()};
Done();

ArrayFromVector<Int16Type, int16_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveIntBuilder, TestInt32) {
builder_->Append(0);
builder_->Append(static_cast<int64_t>(std::numeric_limits<int16_t>::max()) + 1);
Done();

std::vector<int32_t> expected_values(
{0, static_cast<int32_t>(std::numeric_limits<int16_t>::max()) + 1});
ArrayFromVector<Int32Type, int32_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(static_cast<int64_t>(std::numeric_limits<int16_t>::min()) - 1);
expected_values = {static_cast<int32_t>(std::numeric_limits<int16_t>::min()) - 1};
Done();

ArrayFromVector<Int32Type, int32_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(std::numeric_limits<int32_t>::max());
builder_->Append(std::numeric_limits<int32_t>::min());
expected_values = {
std::numeric_limits<int32_t>::max(), std::numeric_limits<int32_t>::min()};
Done();

ArrayFromVector<Int32Type, int32_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveIntBuilder, TestInt64) {
builder_->Append(0);
builder_->Append(static_cast<int64_t>(std::numeric_limits<int32_t>::max()) + 1);
Done();

std::vector<int64_t> expected_values(
{0, static_cast<int64_t>(std::numeric_limits<int32_t>::max()) + 1});
ArrayFromVector<Int64Type, int64_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(static_cast<int64_t>(std::numeric_limits<int32_t>::min()) - 1);
expected_values = {static_cast<int64_t>(std::numeric_limits<int32_t>::min()) - 1};
Done();

ArrayFromVector<Int64Type, int64_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(std::numeric_limits<int64_t>::max());
builder_->Append(std::numeric_limits<int64_t>::min());
expected_values = {
std::numeric_limits<int64_t>::max(), std::numeric_limits<int64_t>::min()};
Done();

ArrayFromVector<Int64Type, int64_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveIntBuilder, TestAppendVector) {
std::vector<int64_t> expected_values(
{0, static_cast<int64_t>(std::numeric_limits<int32_t>::max()) + 1});
builder_->Append(expected_values.data(), expected_values.size());
Done();

ArrayFromVector<Int64Type, int64_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

class TestAdaptiveUIntBuilder : public TestBuilder {
public:
void SetUp() {
TestBuilder::SetUp();
builder_ = std::make_shared<AdaptiveUIntBuilder>(pool_);
}

void Done() { EXPECT_OK(builder_->Finish(&result_)); }

protected:
std::shared_ptr<AdaptiveUIntBuilder> builder_;

std::shared_ptr<Array> expected_;
std::shared_ptr<Array> result_;
};

TEST_F(TestAdaptiveUIntBuilder, TestUInt8) {
builder_->Append(0);
builder_->Append(255);

Done();

std::vector<uint8_t> expected_values({0, 255});
ArrayFromVector<UInt8Type, uint8_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveUIntBuilder, TestUInt16) {
builder_->Append(0);
builder_->Append(256);
Done();

std::vector<uint16_t> expected_values({0, 256});
ArrayFromVector<UInt16Type, uint16_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(std::numeric_limits<uint16_t>::max());
expected_values = {std::numeric_limits<uint16_t>::max()};
Done();

ArrayFromVector<UInt16Type, uint16_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveUIntBuilder, TestUInt32) {
builder_->Append(0);
builder_->Append(static_cast<uint64_t>(std::numeric_limits<uint16_t>::max()) + 1);
Done();

std::vector<uint32_t> expected_values(
{0, static_cast<uint32_t>(std::numeric_limits<uint16_t>::max()) + 1});
ArrayFromVector<UInt32Type, uint32_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(std::numeric_limits<uint32_t>::max());
expected_values = {std::numeric_limits<uint32_t>::max()};
Done();

ArrayFromVector<UInt32Type, uint32_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveUIntBuilder, TestUInt64) {
builder_->Append(0);
builder_->Append(static_cast<uint64_t>(std::numeric_limits<uint32_t>::max()) + 1);
Done();

std::vector<uint64_t> expected_values(
{0, static_cast<uint64_t>(std::numeric_limits<uint32_t>::max()) + 1});
ArrayFromVector<UInt64Type, uint64_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));

SetUp();
builder_->Append(std::numeric_limits<uint64_t>::max());
expected_values = {std::numeric_limits<uint64_t>::max()};
Done();

ArrayFromVector<UInt64Type, uint64_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

TEST_F(TestAdaptiveUIntBuilder, TestAppendVector) {
std::vector<uint64_t> expected_values(
{0, static_cast<uint64_t>(std::numeric_limits<uint32_t>::max()) + 1});
builder_->Append(expected_values.data(), expected_values.size());
Done();

ArrayFromVector<UInt64Type, uint64_t>(expected_values, &expected_);
ASSERT_TRUE(expected_->Equals(result_));
}

// ----------------------------------------------------------------------
// List tests

Expand Down
66 changes: 66 additions & 0 deletions cpp/src/arrow/builder-benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,70 @@ static void BM_BuildVectorNoNulls(

BENCHMARK(BM_BuildVectorNoNulls)->Repetitions(3)->Unit(benchmark::kMillisecond);

static void BM_BuildAdaptiveIntNoNulls(
benchmark::State& state) { // NOLINT non-const reference
int64_t size = static_cast<int64_t>(std::numeric_limits<int16_t>::max()) * 256;
int64_t chunk_size = size / 8;
std::vector<int64_t> data;
for (int64_t i = 0; i < size; i++) {
data.push_back(i);
}
while (state.KeepRunning()) {
AdaptiveIntBuilder builder(default_memory_pool());
for (int64_t i = 0; i < size; i += chunk_size) {
// Build up an array of 512 MiB in size
builder.Append(data.data() + i, chunk_size, nullptr);
}
std::shared_ptr<Array> out;
builder.Finish(&out);
}
state.SetBytesProcessed(state.iterations() * data.size() * sizeof(int64_t));
}

BENCHMARK(BM_BuildAdaptiveIntNoNulls)->Repetitions(3)->Unit(benchmark::kMillisecond);

static void BM_BuildAdaptiveIntNoNullsScalarAppend(
benchmark::State& state) { // NOLINT non-const reference
int64_t size = static_cast<int64_t>(std::numeric_limits<int16_t>::max()) * 256;
std::vector<int64_t> data;
for (int64_t i = 0; i < size; i++) {
data.push_back(i);
}
while (state.KeepRunning()) {
AdaptiveIntBuilder builder(default_memory_pool());
for (int64_t i = 0; i < size; i++) {
builder.Append(data[i]);
Copy link
Member

@wesm wesm Jun 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To make this benchmark more "realistic" we should add an assertion about the result of Append being OK

}
std::shared_ptr<Array> out;
builder.Finish(&out);
}
state.SetBytesProcessed(state.iterations() * data.size() * sizeof(int64_t));
}

BENCHMARK(BM_BuildAdaptiveIntNoNullsScalarAppend)
->Repetitions(3)
->Unit(benchmark::kMillisecond);

static void BM_BuildAdaptiveUIntNoNulls(
benchmark::State& state) { // NOLINT non-const reference
int64_t size = static_cast<int64_t>(std::numeric_limits<uint16_t>::max()) * 256;
int64_t chunk_size = size / 8;
std::vector<uint64_t> data;
for (uint64_t i = 0; i < static_cast<uint64_t>(size); i++) {
data.push_back(i);
}
while (state.KeepRunning()) {
AdaptiveUIntBuilder builder(default_memory_pool());
for (int64_t i = 0; i < size; i += chunk_size) {
// Build up an array of 512 MiB in size
builder.Append(data.data() + i, chunk_size, nullptr);
}
std::shared_ptr<Array> out;
builder.Finish(&out);
}
state.SetBytesProcessed(state.iterations() * data.size() * sizeof(int64_t));
}

BENCHMARK(BM_BuildAdaptiveUIntNoNulls)->Repetitions(3)->Unit(benchmark::kMillisecond);

} // namespace arrow
Loading