Skip to content

Optimized ColumnArray::Slice #176

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

Merged
merged 2 commits into from
May 12, 2022
Merged

Optimized ColumnArray::Slice #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef2752
Optimized ColumnArray::Slice
Enmk May 6, 2022
64b8f92
Better tests for ColumnArray::Slice for 2D arrays.
Enmk May 7, 2022
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
8 changes: 4 additions & 4 deletions clickhouse/columns/array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "array.h"
#include "numeric.h"

#include <stdexcept>

namespace clickhouse {
Expand Down Expand Up @@ -45,10 +46,9 @@ ColumnRef ColumnArray::Slice(size_t begin, size_t size) const {
if (size && begin + size > Size())
throw ValidationError("Slice indexes are out of bounds");

auto result = std::make_shared<ColumnArray>(data_->CloneEmpty());
for (size_t i = 0; i < size; i++) {
result->AppendAsColumn(GetAsColumn(begin + i));
}
auto result = std::make_shared<ColumnArray>(data_->Slice(GetOffset(begin), GetOffset(begin + size) - GetOffset(begin)));
for (size_t i = 0; i < size; i++)
result->AddOffset(GetSize(begin + i));

return result;
}
Expand Down
21 changes: 15 additions & 6 deletions ut/column_array_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ TEST(ColumnArray, Slice) {
}

TEST(ColumnArray, Slice_2D) {
// Verify that ColumnArray::Slice on 2D Array produces a 2D Array of proper type, size and contents.
// Also check that slices can be of any size.
const std::vector<std::vector<std::vector<uint64_t>>> values = {
{{1u, 2u}, {3u}},
{{4u}, {5u, 6u, 7u}, {8u, 9u}, {}},
Expand All @@ -143,13 +145,20 @@ TEST(ColumnArray, Slice_2D) {
};

std::shared_ptr<ColumnArray> untyped_array = Create2DArray<ColumnUInt64>(values);

for (size_t i = 0; i < values.size() - 1; ++i) {
auto slice = untyped_array->Slice(i, 1)->AsStrict<ColumnArray>();
EXPECT_EQ(1u, slice->Size());

for (size_t j = 0; j < values[i].size(); ++j) {
EXPECT_TRUE(CompareRecursive(values[i][j], *slice->GetAsColumnTyped<ColumnArray>(0)->GetAsColumnTyped<ColumnUInt64>(j)));
for (size_t slice_size = 0; slice_size < values.size() - i; ++slice_size) {
auto slice = untyped_array->Slice(i, slice_size)->AsStrict<ColumnArray>();
EXPECT_EQ(slice_size, slice->Size());

for (size_t slice_row = 0; slice_row < slice_size; ++slice_row) {
SCOPED_TRACE(::testing::Message() << "i: " << i << " slice_size:" << slice_size << " row:" << slice_row);
auto val = slice->GetAsColumnTyped<ColumnArray>(slice_row);
ASSERT_EQ(values[i + slice_row].size(), val->Size());

for (size_t j = 0; j < values[i + slice_row].size(); ++j) {
ASSERT_TRUE(CompareRecursive(values[i + slice_row][j], *val->GetAsColumnTyped<ColumnUInt64>(j)));
}
}
}
}
}
Expand Down