Skip to content

refactor(core): apply ColumnarRowRef in KeyValueInMemoryRecordReader #144

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
xylaaaaa wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −5
Open

refactor(core): apply ColumnarRowRef in KeyValueInMemoryRecordReader #144

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
12 changes: 7 additions & 5 deletions src/paimon/core/io/key_value_in_memory_record_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "arrow/compute/ordering.h"
#include "arrow/util/checked_cast.h"
#include "fmt/format.h"
#include "paimon/common/data/columnar/columnar_row.h"
#include "paimon/common/data/columnar/columnar_row_ref.h"
#include "paimon/common/data/internal_row.h"
#include "paimon/common/types/row_kind.h"
#include "paimon/common/utils/arrow/arrow_utils.h"
Expand All @@ -49,10 +49,8 @@ Result<KeyValue> KeyValueInMemoryRecordReader::Iterator::Next() {
row_kind, RowKind::FromByteValue(static_cast<int8_t>(reader_->row_kinds_[index])));
}
// key must hold value_struct_array as min/max key may be used after projection
auto key = std::make_unique<ColumnarRow>(reader_->value_struct_array_, reader_->key_fields_,
reader_->pool_, index);
auto value = std::make_unique<ColumnarRow>(reader_->value_struct_array_,
reader_->value_fields_, reader_->pool_, index);
auto key = std::make_unique<ColumnarRowRef>(reader_->key_ctx_, index);
auto value = std::make_unique<ColumnarRowRef>(reader_->value_ctx_, index);
KeyValue kv(row_kind, reader_->last_sequence_num_ + index,
/*level=*/KeyValue::UNKNOWN_LEVEL, std::move(key), std::move(value));
if (current_key == nullptr) {
Expand Down Expand Up @@ -105,6 +103,8 @@ Result<std::unique_ptr<KeyValueRecordReader::Iterator>> KeyValueInMemoryRecordRe
for (int32_t i = 0; i < value_struct_array_->num_fields(); i++) {
value_fields_.push_back(value_struct_array_->field(i));
}
key_ctx_ = std::make_shared<ColumnarBatchContext>(value_struct_array_, key_fields_, pool_);
value_ctx_ = std::make_shared<ColumnarBatchContext>(value_struct_array_, value_fields_, pool_);

PAIMON_ASSIGN_OR_RAISE(sort_indices_, SortBatch());
return std::make_unique<KeyValueInMemoryRecordReader::Iterator>(this);
Expand All @@ -116,6 +116,8 @@ void KeyValueInMemoryRecordReader::Close() {
key_fields_.clear();
value_fields_.clear();
sort_indices_.reset();
key_ctx_.reset();
value_ctx_.reset();
}

Result<std::shared_ptr<arrow::NumericArray<arrow::UInt64Type>>>
Expand Down
3 changes: 3 additions & 0 deletions src/paimon/core/io/key_value_in_memory_record_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class Array;
} // namespace arrow

namespace paimon {
struct ColumnarBatchContext;
class FieldsComparator;
class MemoryPool;
class Metrics;
Expand Down Expand Up @@ -91,5 +92,7 @@ class KeyValueInMemoryRecordReader : public KeyValueRecordReader {
arrow::ArrayVector key_fields_;
arrow::ArrayVector value_fields_;
std::shared_ptr<arrow::NumericArray<arrow::UInt64Type>> sort_indices_;
std::shared_ptr<ColumnarBatchContext> key_ctx_;
std::shared_ptr<ColumnarBatchContext> value_ctx_;
};
} // namespace paimon
Loading