Skip to content
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

ARROW-17965: [C++] ExecBatch support for ChunkedArray values #14348

Merged
merged 5 commits into from
Oct 15, 2022
Merged

ARROW-17965: [C++] ExecBatch support for ChunkedArray values #14348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
976e94e
ARROW-17965: [C++] ExecBatch support for ChunkedArray values
rtpsw Oct 7, 2022
863d875
requested fixes
rtpsw Oct 8, 2022
04b6d97
Merge branch 'master' into ARROW-17965
rtpsw Oct 14, 2022
03771eb
lint
rtpsw Oct 15, 2022
5537785
Merge branch 'ARROW-17965' of https://github.com/rtpsw/arrow into ARR…
rtpsw Oct 15, 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
34 changes: 24 additions & 10 deletions cpp/src/arrow/compute/exec.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,22 @@ void PrintTo(const ExecBatch& batch, std::ostream* os) {

if (value.is_scalar()) {
*os << "Scalar[" << value.scalar()->ToString() << "]\n";
continue;
} else if (value.is_array() || value.is_chunked_array()) {
PrettyPrintOptions options;
options.skip_new_lines = true;
if (value.is_array()) {
auto array = value.make_array();
*os << "Array";
ARROW_CHECK_OK(PrettyPrint(*array, options, os));
} else {
auto array = value.chunked_array();
*os << "Chunked Array";
ARROW_CHECK_OK(PrettyPrint(*array, options, os));
}
*os << "\n";
} else {
ARROW_DCHECK(false);
}

auto array = value.make_array();
PrettyPrintOptions options;
options.skip_new_lines = true;
*os << "Array";
ARROW_CHECK_OK(PrettyPrint(*array, options, os));
*os << "\n";
}
}

Expand All @@ -118,8 +125,15 @@ std::string ExecBatch::ToString() const {
ExecBatch ExecBatch::Slice(int64_t offset, int64_t length) const {
ExecBatch out = *this;
for (auto& value : out.values) {
if (value.is_scalar()) continue;
value = value.array()->Slice(offset, length);
if (value.is_scalar()) {
// keep value as is
} else if (value.is_array()) {
value = value.array()->Slice(offset, length);
} else if (value.is_chunked_array()) {
value = value.chunked_array()->Slice(offset, length);
} else {
ARROW_DCHECK(false);
}
}
out.length = std::min(length, this->length - offset);
return out;
Expand Down
24 changes: 24 additions & 0 deletions cpp/src/arrow/compute/exec_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,30 @@ using ::arrow::internal::BitmapEquals;
using ::arrow::internal::CopyBitmap;
using ::arrow::internal::CountSetBits;

TEST(ExecBatch, SliceBasics) {
int64_t length = 4, cut_length = 2, left_length = length - cut_length;
ExecBatch batch{{Int32Scalar(0), ArrayFromJSON(utf8(), R"(["a", "b", "c", "d"])"),
ChunkedArrayFromJSON(float64(), {"[1.1]", "[2.2]", "[3.3]", "[4.4]"})},
length};
std::vector<ExecBatch> expected_sliced{
{{Int32Scalar(0), ArrayFromJSON(utf8(), R"(["a", "b"])"),
ChunkedArrayFromJSON(float64(), {"[1.1]", "[2.2]"})},
cut_length},
{{Int32Scalar(0), ArrayFromJSON(utf8(), R"(["c", "d"])"),
ChunkedArrayFromJSON(float64(), {"[3.3]", "[4.4]"})},
left_length}};
std::vector<ExecBatch> actual_sliced = {batch.Slice(0, cut_length),
batch.Slice(cut_length, left_length)};
for (size_t i = 0; i < expected_sliced.size(); i++) {
ASSERT_EQ(expected_sliced[i].length, actual_sliced[i].length);
ASSERT_EQ(expected_sliced[i].values.size(), actual_sliced[i].values.size());
for (size_t j = 0; j < expected_sliced[i].values.size(); j++) {
AssertDatumsEqual(expected_sliced[i].values[j], actual_sliced[i].values[j]);
}
ASSERT_EQ(expected_sliced[i].ToString(), actual_sliced[i].ToString());
}
}

TEST(ExecBatch, ToRecordBatch) {
auto i32_array = ArrayFromJSON(int32(), "[0, 1, 2]");
auto utf8_array = ArrayFromJSON(utf8(), R"(["a", "b", "c"])");
Expand Down