Skip to content

Commit 0c9920f

Browse files
committed
fix review
1 parent 4e0c39c commit 0c9920f

6 files changed

Lines changed: 15 additions & 4 deletions

File tree

src/paimon/core/append/append_only_writer.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ class AppendOnlyWriter : public BatchWriter {
6969
return Flush(/*wait_for_latest_compaction=*/true, full_compaction);
7070
}
7171

72+
uint64_t GetMemoryUsage() const override {
73+
return 0;
74+
}
7275
Status FlushMemory() override {
7376
return Flush(/*wait_for_latest_compaction=*/false, /*forced_full_compaction=*/false);
7477
}

src/paimon/core/io/merged_key_value_record_reader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ Status MergedKeyValueRecordReader::Iterator::LoadNextKeyValue() {
8686
current_iterator_.reset();
8787
PAIMON_ASSIGN_OR_RAISE(current_iterator_, reader_->reader_->NextBatch());
8888
if (current_iterator_ == nullptr) {
89-
reader_->reader_->Close();
9089
return Status::OK();
9190
}
9291
}
@@ -110,6 +109,7 @@ std::shared_ptr<Metrics> MergedKeyValueRecordReader::GetReaderMetrics() const {
110109
}
111110

112111
void MergedKeyValueRecordReader::Close() {
112+
visited_ = true;
113113
reader_->Close();
114114
}
115115

src/paimon/core/mergetree/merge_tree_writer.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ class MergeTreeWriter : public BatchWriter {
7575

7676
Result<CommitIncrement> PrepareCommit(bool wait_compaction) override;
7777

78+
uint64_t GetMemoryUsage() const override {
79+
return 0;
80+
}
81+
7882
Status FlushMemory() override {
7983
return Flush(/*wait_for_latest_compaction=*/false, /*forced_full_compaction=*/false);
8084
}

src/paimon/core/mergetree/write_buffer.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "paimon/core/mergetree/write_buffer.h"
1818

19+
#include <limits>
1920
#include <memory>
2021
#include <utility>
2122

@@ -34,6 +35,7 @@ WriteBuffer::WriteBuffer(
3435
const std::shared_ptr<MergeFunctionWrapper<KeyValue>>& merge_function_wrapper,
3536
const std::shared_ptr<MemoryPool>& pool)
3637
: key_comparator_(key_comparator), merge_function_wrapper_(merge_function_wrapper) {
38+
// TODO(jinli.zjw): input sequence_fields_ascending as parameter
3739
sort_buffer_ = std::make_unique<BinaryInMemorySortBuffer>(
3840
last_sequence_number, value_type, trimmed_primary_keys, user_defined_sequence_fields,
3941
/*sequence_fields_ascending=*/true, key_comparator,

src/paimon/core/postpone/postpone_bucket_writer.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@ class PostponeBucketWriter : public BatchWriter {
7272
return Status::NotImplemented("not implemented");
7373
}
7474

75+
uint64_t GetMemoryUsage() const override {
76+
return 0;
77+
}
78+
7579
Status FlushMemory() override {
7680
return Flush();
7781
}

src/paimon/core/utils/batch_writer.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ class BatchWriter {
3737
virtual ~BatchWriter() = default;
3838

3939
/// Return current in-memory data usage in bytes
40-
virtual uint64_t GetMemoryUsage() const {
41-
return 0;
42-
}
40+
virtual uint64_t GetMemoryUsage() const = 0;
4341

4442
/// Flush in-memory data.
4543
virtual Status FlushMemory() = 0;

0 commit comments

Comments
 (0)