This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 74286db3419 [chore](be) remove unused seek_to_first method (#51418)
74286db3419 is described below
commit 74286db341919dd9e27ad7c857b53e9677228b70
Author: yiguolei <[email protected]>
AuthorDate: Wed Jun 4 00:19:05 2025 +0800
[chore](be) remove unused seek_to_first method (#51418)
---
be/src/olap/rowset/segment_v2/column_reader.cpp | 19 -------
be/src/olap/rowset/segment_v2/column_reader.h | 66 ----------------------
.../rowset/segment_v2/hierarchical_data_reader.cpp | 8 ---
.../rowset/segment_v2/hierarchical_data_reader.h | 4 --
.../segment_v2/column_reader_writer_test.cpp | 12 ----
5 files changed, 109 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/column_reader.cpp
b/be/src/olap/rowset/segment_v2/column_reader.cpp
index 47d083a0a18..5450f15ec51 100644
--- a/be/src/olap/rowset/segment_v2/column_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/column_reader.cpp
@@ -694,16 +694,6 @@ Status ColumnReader::_load_bloom_filter_index(bool
use_page_cache, bool kept_in_
return Status::OK();
}
-Status ColumnReader::seek_to_first(OrdinalPageIndexIterator* iter,
- const ColumnIteratorOptions& iter_opts) {
- RETURN_IF_ERROR(_load_ordinal_index(_use_index_page_cache,
_opts.kept_in_memory, iter_opts));
- *iter = _ordinal_index->begin();
- if (!iter->valid()) {
- return Status::NotFound("Failed to seek to first rowid");
- }
- return Status::OK();
-}
-
Status ColumnReader::seek_at_or_before(ordinal_t ordinal,
OrdinalPageIndexIterator* iter,
const ColumnIteratorOptions& iter_opts)
{
RETURN_IF_ERROR(_load_ordinal_index(_use_index_page_cache,
_opts.kept_in_memory, iter_opts));
@@ -1201,15 +1191,6 @@ Status FileColumnIterator::init(const
ColumnIteratorOptions& opts) {
FileColumnIterator::~FileColumnIterator() = default;
-Status FileColumnIterator::seek_to_first() {
- RETURN_IF_ERROR(_reader->seek_to_first(&_page_iter, _opts));
- RETURN_IF_ERROR(_read_data_page(_page_iter));
-
- _seek_to_pos_in_page(&_page, 0);
- _current_ordinal = 0;
- return Status::OK();
-}
-
Status FileColumnIterator::seek_to_ordinal(ordinal_t ord) {
// if current page contains this row, we don't need to seek
if (!_page || !_page.contains(ord) || !_page_iter.valid()) {
diff --git a/be/src/olap/rowset/segment_v2/column_reader.h
b/be/src/olap/rowset/segment_v2/column_reader.h
index 406b1bb6122..d996f4cc1ae 100644
--- a/be/src/olap/rowset/segment_v2/column_reader.h
+++ b/be/src/olap/rowset/segment_v2/column_reader.h
@@ -147,8 +147,6 @@ public:
const StorageReadOptions& read_options,
std::unique_ptr<InvertedIndexIterator>*
iterator);
- // Seek to the first entry in the column.
- Status seek_to_first(OrdinalPageIndexIterator* iter, const
ColumnIteratorOptions& iter_opts);
Status seek_at_or_before(ordinal_t ordinal, OrdinalPageIndexIterator* iter,
const ColumnIteratorOptions& iter_opts);
@@ -302,9 +300,6 @@ public:
return Status::OK();
}
- // Seek to the first entry in the column.
- virtual Status seek_to_first() = 0;
-
// Seek to the given ordinal entry in the column.
// Entry 0 is the first entry written to the column.
// If provided seek point is past the end of the file,
@@ -362,8 +357,6 @@ public:
Status init(const ColumnIteratorOptions& opts) override;
- Status seek_to_first() override;
-
Status seek_to_ordinal(ordinal_t ord) override;
Status seek_to_page_start();
@@ -432,7 +425,6 @@ private:
class EmptyFileColumnIterator final : public ColumnIterator {
public:
- Status seek_to_first() override { return Status::OK(); }
Status seek_to_ordinal(ordinal_t ord) override { return Status::OK(); }
ordinal_t get_current_ordinal() const override { return 0; }
};
@@ -457,11 +449,6 @@ public:
return Status::OK();
}
- Status seek_to_first() override {
- RETURN_IF_ERROR(_offset_iterator->seek_to_first());
- return Status::OK();
- }
-
Status _peek_one_offset(ordinal_t* offset);
Status _calculate_offsets(ssize_t start,
@@ -486,15 +473,6 @@ public:
Status read_by_rowids(const rowid_t* rowids, const size_t count,
vectorized::MutableColumnPtr& dst) override;
- Status seek_to_first() override {
- RETURN_IF_ERROR(_key_iterator->seek_to_first());
- RETURN_IF_ERROR(_val_iterator->seek_to_first());
- RETURN_IF_ERROR(_offsets_iterator->seek_to_first());
- if (_map_reader->is_nullable()) {
- RETURN_IF_ERROR(_null_iterator->seek_to_first());
- }
- return Status::OK();
- }
Status seek_to_ordinal(ordinal_t ord) override;
@@ -524,16 +502,6 @@ public:
Status read_by_rowids(const rowid_t* rowids, const size_t count,
vectorized::MutableColumnPtr& dst) override;
- Status seek_to_first() override {
- for (auto& column_iterator : _sub_column_iterators) {
- RETURN_IF_ERROR(column_iterator->seek_to_first());
- }
- if (_struct_reader->is_nullable()) {
- RETURN_IF_ERROR(_null_iterator->seek_to_first());
- }
- return Status::OK();
- }
-
Status seek_to_ordinal(ordinal_t ord) override;
ordinal_t get_current_ordinal() const override {
@@ -560,15 +528,6 @@ public:
Status read_by_rowids(const rowid_t* rowids, const size_t count,
vectorized::MutableColumnPtr& dst) override;
- Status seek_to_first() override {
- RETURN_IF_ERROR(_offset_iterator->seek_to_first());
- RETURN_IF_ERROR(_item_iterator->seek_to_first()); // lazy???
- if (_array_reader->is_nullable()) {
- RETURN_IF_ERROR(_null_iterator->seek_to_first());
- }
- return Status::OK();
- }
-
Status seek_to_ordinal(ordinal_t ord) override;
ordinal_t get_current_ordinal() const override {
@@ -590,11 +549,6 @@ public:
RowIdColumnIterator(int64_t tid, RowsetId rid, int32_t segid)
: _tablet_id(tid), _rowset_id(rid), _segment_id(segid) {}
- Status seek_to_first() override {
- _current_rowid = 0;
- return Status::OK();
- }
-
Status seek_to_ordinal(ordinal_t ord_idx) override {
_current_rowid = ord_idx;
return Status::OK();
@@ -640,11 +594,6 @@ public:
RowIdColumnIteratorV2(uint8_t version, int64_t backend_id, uint32_t
file_id)
: _version(version), _backend_id(backend_id), _file_id(file_id) {}
- Status seek_to_first() override {
- _current_rowid = 0;
- return Status::OK();
- }
-
Status seek_to_ordinal(ordinal_t ord_idx) override {
_current_rowid = ord_idx;
return Status::OK();
@@ -679,8 +628,6 @@ public:
Status init(const ColumnIteratorOptions& opts) override { return
_inner_iter->init(opts); }
- Status seek_to_first() override { return _inner_iter->seek_to_first(); }
-
Status seek_to_ordinal(ordinal_t ord_idx) override {
return _inner_iter->seek_to_ordinal(ord_idx);
}
@@ -720,11 +667,6 @@ public:
Status init(const ColumnIteratorOptions& opts) override;
- Status seek_to_first() override {
- _current_rowid = 0;
- return Status::OK();
- }
-
Status seek_to_ordinal(ordinal_t ord_idx) override {
_current_rowid = ord_idx;
return Status::OK();
@@ -780,14 +722,6 @@ public:
return Status::OK();
}
- Status seek_to_first() override {
- _current_rowid = 0;
- if (_sibling_iter) {
- return _sibling_iter->seek_to_first();
- }
- return Status::OK();
- }
-
Status seek_to_ordinal(ordinal_t ord_idx) override {
_current_rowid = ord_idx;
if (_sibling_iter) {
diff --git a/be/src/olap/rowset/segment_v2/hierarchical_data_reader.cpp
b/be/src/olap/rowset/segment_v2/hierarchical_data_reader.cpp
index 5ed7e0ec043..d6d0db1e2af 100644
--- a/be/src/olap/rowset/segment_v2/hierarchical_data_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/hierarchical_data_reader.cpp
@@ -79,10 +79,6 @@ Status HierarchicalDataReader::init(const
ColumnIteratorOptions& opts) {
return Status::OK();
}
-Status HierarchicalDataReader::seek_to_first() {
- throw Exception(Status::FatalError("Not implemented"));
-}
-
Status HierarchicalDataReader::seek_to_ordinal(ordinal_t ord) {
RETURN_IF_ERROR(tranverse([&](SubstreamReaderTree::Node& node) {
RETURN_IF_ERROR(node.data.iterator->seek_to_ordinal(ord));
@@ -157,10 +153,6 @@ Status ExtractReader::init(const ColumnIteratorOptions&
opts) {
return Status::OK();
}
-Status ExtractReader::seek_to_first() {
- throw Exception(Status::FatalError("Not implemented"));
-}
-
Status ExtractReader::seek_to_ordinal(ordinal_t ord) {
CHECK(_root_reader->inited);
return _root_reader->iterator->seek_to_ordinal(ord);
diff --git a/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
b/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
index ffc3397339d..6165c095004 100644
--- a/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
+++ b/be/src/olap/rowset/segment_v2/hierarchical_data_reader.h
@@ -59,8 +59,6 @@ public:
Status init(const ColumnIteratorOptions& opts) override;
- Status seek_to_first() override;
-
Status seek_to_ordinal(ordinal_t ord) override;
Status next_batch(size_t* n, vectorized::MutableColumnPtr& dst, bool*
has_null) override;
@@ -277,8 +275,6 @@ public:
Status init(const ColumnIteratorOptions& opts) override;
- Status seek_to_first() override;
-
Status seek_to_ordinal(ordinal_t ord) override;
Status next_batch(size_t* n, vectorized::MutableColumnPtr& dst, bool*
has_null) override;
diff --git a/be/test/olap/rowset/segment_v2/column_reader_writer_test.cpp
b/be/test/olap/rowset/segment_v2/column_reader_writer_test.cpp
index 15504a184f9..638fe05db8d 100644
--- a/be/test/olap/rowset/segment_v2/column_reader_writer_test.cpp
+++ b/be/test/olap/rowset/segment_v2/column_reader_writer_test.cpp
@@ -145,9 +145,6 @@ void test_nullable_data(uint8_t* src_data, uint8_t*
src_is_null, int num_rows,
st = iter->init(iter_opts);
EXPECT_TRUE(st.ok());
- st = iter->seek_to_first();
- EXPECT_TRUE(st.ok()) << st.to_string();
-
vectorized::Arena pool;
std::unique_ptr<ColumnVectorBatch> cvb;
ColumnVectorBatch::create(0, true, type_info, nullptr, &cvb);
@@ -323,9 +320,6 @@ void test_array_nullable_data(CollectionValue* src_data,
uint8_t* src_is_null, i
EXPECT_TRUE(st.ok());
// sequence read
{
- st = iter->seek_to_first();
- EXPECT_TRUE(st.ok()) << st.to_string();
-
vectorized::Arena pool;
std::unique_ptr<ColumnVectorBatch> cvb;
ColumnVectorBatch::create(0, true, type_info.get(), field, &cvb);
@@ -458,9 +452,6 @@ void test_read_default_value(string value, void* result) {
EXPECT_TRUE(st.ok());
// sequence read
{
- st = iter.seek_to_first();
- EXPECT_TRUE(st.ok()) << st.to_string();
-
vectorized::Arena pool;
std::unique_ptr<ColumnVectorBatch> cvb;
ColumnVectorBatch::create(0, true, scalar_type_info, nullptr,
&cvb);
@@ -567,9 +558,6 @@ void test_v_read_default_value(string value, void* result) {
// sequence read
{
- st = iter.seek_to_first();
- EXPECT_TRUE(st.ok()) << st.to_string();
-
vectorized::MutableColumnPtr mcp =
create_vectorized_column_ptr(type);
size_t rows_read = 16;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
