Skip to content

GH-50247: Reuse abstraction for null partitions in sorting functions #50248

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

Open
taepper wants to merge 12 commits into
base: main
Choose a base branch
from
+568 −725
Open

GH-50247: Reuse abstraction for null partitions in sorting functions #50248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a4f9728
replace PartitionNulls by PartitionNullsAndNans
taepper Jun 24, 2026
5fe6eb8
more helpers and migrations
taepper Jun 24, 2026
6225331
spanify one
taepper Jun 24, 2026
650d857
spanify another
taepper Jun 24, 2026
5a62018
spanify working
taepper Jun 24, 2026
36f348f
more spans
taepper Jun 24, 2026
7c77d23
another span
taepper Jun 24, 2026
c0fd6ec
replace Partition usage
taepper Jun 24, 2026
245c10f
Change interface to PartitionResultByNullLikeness
taepper Jun 24, 2026
49ac605
make comments not clip into new line
taepper Jun 24, 2026
a6d2942
bugfix
taepper Jun 24, 2026
54c3aca
consolidate more functions
taepper Jun 25, 2026
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
20 changes: 10 additions & 10 deletions cpp/src/arrow/compute/kernels/chunked_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ ChunkedIndexMapper::LogicalToPhysical() {
}
}

const int64_t num_indices = static_cast<int64_t>(indices_end_ - indices_begin_);
const int64_t num_indices = static_cast<int64_t>(indices_.size());
DCHECK_EQ(num_indices, std::accumulate(chunk_lengths_.begin(), chunk_lengths_.end(),
static_cast<int64_t>(0)));
CompressedChunkLocation* physical_begin =
reinterpret_cast<CompressedChunkLocation*>(indices_begin_);
DCHECK_EQ(physical_begin + num_indices,
reinterpret_cast<CompressedChunkLocation*>(indices_end_));
reinterpret_cast<CompressedChunkLocation*>(indices_.data());
DCHECK_EQ(physical_begin + num_indices, reinterpret_cast<CompressedChunkLocation*>(
indices_.data() + indices_.size()));

int64_t chunk_offset = 0;
for (int64_t chunk_index = 0; chunk_index < static_cast<int64_t>(chunk_lengths_.size());
Expand All @@ -82,12 +82,12 @@ ChunkedIndexMapper::LogicalToPhysical() {
for (int64_t i = 0; i < chunk_length; ++i) {
// Logical indices are expected to be chunk-partitioned, which avoids costly
// chunked index resolution.
DCHECK_GE(indices_begin_[chunk_offset + i], static_cast<uint64_t>(chunk_offset));
DCHECK_LT(indices_begin_[chunk_offset + i],
DCHECK_GE(indices_[chunk_offset + i], static_cast<uint64_t>(chunk_offset));
DCHECK_LT(indices_[chunk_offset + i],
static_cast<uint64_t>(chunk_offset + chunk_length));
physical_begin[chunk_offset + i] = CompressedChunkLocation{
static_cast<uint64_t>(chunk_index),
indices_begin_[chunk_offset + i] - static_cast<uint64_t>(chunk_offset)};
indices_[chunk_offset + i] - static_cast<uint64_t>(chunk_offset)};
}
chunk_offset += chunk_length;
}
Expand All @@ -105,15 +105,15 @@ Status ChunkedIndexMapper::PhysicalToLogical() {
}
}

const int64_t num_indices = static_cast<int64_t>(indices_end_ - indices_begin_);
const int64_t num_indices = static_cast<int64_t>(indices_.size());
CompressedChunkLocation* physical_begin =
reinterpret_cast<CompressedChunkLocation*>(indices_begin_);
reinterpret_cast<CompressedChunkLocation*>(indices_.data());
for (int64_t i = 0; i < num_indices; ++i) {
const auto loc = physical_begin[i];
DCHECK_LT(loc.chunk_index(), chunk_offsets.size());
DCHECK_LT(loc.index_in_chunk(),
static_cast<uint64_t>(chunk_lengths_[loc.chunk_index()]));
indices_begin_[i] =
indices_[i] =
chunk_offsets[loc.chunk_index()] + static_cast<int64_t>(loc.index_in_chunk());
}

Expand Down
22 changes: 7 additions & 15 deletions cpp/src/arrow/compute/kernels/chunked_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,12 @@ ARROW_EXPORT std::vector<const Array*> GetArrayPointers(const ArrayVector& array
// and vice-versa.
class ARROW_EXPORT ChunkedIndexMapper {
public:
ChunkedIndexMapper(const std::vector<const Array*>& chunks, uint64_t* indices_begin,
uint64_t* indices_end)
: ChunkedIndexMapper(std::span(chunks), indices_begin, indices_end) {}
ChunkedIndexMapper(std::span<const Array* const> chunks, uint64_t* indices_begin,
uint64_t* indices_end)
: chunk_lengths_(GetChunkLengths(chunks)),
indices_begin_(indices_begin),
indices_end_(indices_end) {}
ChunkedIndexMapper(const RecordBatchVector& chunks, uint64_t* indices_begin,
uint64_t* indices_end)
: chunk_lengths_(GetChunkLengths(chunks)),
indices_begin_(indices_begin),
indices_end_(indices_end) {}
ChunkedIndexMapper(const std::vector<const Array*>& chunks, std::span<uint64_t> indices)
: ChunkedIndexMapper(std::span(chunks), indices) {}
ChunkedIndexMapper(std::span<const Array* const> chunks, std::span<uint64_t> indices)
: chunk_lengths_(GetChunkLengths(chunks)), indices_(indices) {}
ChunkedIndexMapper(const RecordBatchVector& chunks, std::span<uint64_t> indices)
: chunk_lengths_(GetChunkLengths(chunks)), indices_(indices) {}

// Turn the original uint64_t logical indices into physical. This reuses the
// same memory area, so the logical indices cannot be used anymore until
Expand All @@ -158,8 +151,7 @@ class ARROW_EXPORT ChunkedIndexMapper {
static std::vector<int64_t> GetChunkLengths(const RecordBatchVector& chunks);

std::vector<int64_t> chunk_lengths_;
uint64_t* indices_begin_;
uint64_t* indices_end_;
std::span<uint64_t> indices_;
};

} // namespace arrow::compute::internal
Loading
Loading