This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new e0dfae14505 [opt](ShortCircuit) add more stats info to trace (#42697)
(#43327)
e0dfae14505 is described below
commit e0dfae1450578dc8889a8b83a1ab56766bf1b067
Author: lihangyu <15605149...@163.com>
AuthorDate: Wed Nov 6 18:34:12 2024 +0800
[opt](ShortCircuit) add more stats info to trace (#42697) (#43327)
(#42697)
---
be/src/olap/base_tablet.cpp | 8 ++-
be/src/olap/base_tablet.h | 3 +-
be/src/olap/primary_key_index.cpp | 7 ++-
be/src/olap/primary_key_index.h | 10 +++-
.../segment_v2/bloom_filter_index_reader.cpp | 6 +-
.../rowset/segment_v2/bloom_filter_index_reader.h | 4 +-
.../rowset/segment_v2/indexed_column_reader.cpp | 19 ++++---
.../olap/rowset/segment_v2/indexed_column_reader.h | 15 +++--
be/src/olap/rowset/segment_v2/segment.cpp | 10 ++--
be/src/olap/rowset/segment_v2/segment.h | 6 +-
be/src/olap/segment_loader.cpp | 7 ++-
be/src/olap/segment_loader.h | 3 +-
be/src/service/internal_service.cpp | 11 ++--
be/src/service/point_query_executor.cpp | 64 ++++++++++++++++------
be/src/service/point_query_executor.h | 10 +++-
15 files changed, 126 insertions(+), 57 deletions(-)
diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp
index 1fd3b785b90..0cb918448c4 100644
--- a/be/src/olap/base_tablet.cpp
+++ b/be/src/olap/base_tablet.cpp
@@ -79,7 +79,8 @@ Status _get_segment_column_iterator(const
BetaRowsetSharedPtr& rowset, uint32_t
.use_page_cache = !config::disable_storage_page_cache,
.file_reader = segment->file_reader().get(),
.stats = stats,
- .io_ctx = io::IOContext {.reader_type = ReaderType::READER_QUERY},
+ .io_ctx = io::IOContext {.reader_type = ReaderType::READER_QUERY,
+ .file_cache_stats =
&stats->file_cache_stats},
};
RETURN_IF_ERROR((*column_iterator)->init(opt));
return Status::OK();
@@ -441,7 +442,8 @@ Status BaseTablet::lookup_row_key(const Slice& encoded_key,
TabletSchema* latest
const std::vector<RowsetSharedPtr>&
specified_rowsets,
RowLocation* row_location, uint32_t version,
std::vector<std::unique_ptr<SegmentCacheHandle>>& segment_caches,
- RowsetSharedPtr* rowset, bool with_rowid) {
+ RowsetSharedPtr* rowset, bool with_rowid,
+ OlapReaderStatistics* stats) {
SCOPED_BVAR_LATENCY(g_tablet_lookup_rowkey_latency);
size_t seq_col_length = 0;
// use the latest tablet schema to decide if the tablet has sequence
column currently
@@ -489,7 +491,7 @@ Status BaseTablet::lookup_row_key(const Slice& encoded_key,
TabletSchema* latest
for (auto id : picked_segments) {
Status s = segments[id]->lookup_row_key(encoded_key, schema,
with_seq_col, with_rowid,
- &loc);
+ &loc, stats);
if (s.is<KEY_NOT_FOUND>()) {
continue;
}
diff --git a/be/src/olap/base_tablet.h b/be/src/olap/base_tablet.h
index 943f8155818..f862aa06cc0 100644
--- a/be/src/olap/base_tablet.h
+++ b/be/src/olap/base_tablet.h
@@ -153,7 +153,8 @@ public:
const std::vector<RowsetSharedPtr>&
specified_rowsets,
RowLocation* row_location, uint32_t version,
std::vector<std::unique_ptr<SegmentCacheHandle>>&
segment_caches,
- RowsetSharedPtr* rowset = nullptr, bool with_rowid =
true);
+ RowsetSharedPtr* rowset = nullptr, bool with_rowid =
true,
+ OlapReaderStatistics* stats = nullptr);
// calc delete bitmap when flush memtable, use a fake version to calc
// For example, cur max version is 5, and we use version 6 to calc but
diff --git a/be/src/olap/primary_key_index.cpp
b/be/src/olap/primary_key_index.cpp
index d3554cae15d..9d40ff5a8fa 100644
--- a/be/src/olap/primary_key_index.cpp
+++ b/be/src/olap/primary_key_index.cpp
@@ -17,6 +17,7 @@
#include "olap/primary_key_index.h"
+#include <butil/time.h>
#include <gen_cpp/segment_v2.pb.h>
#include <utility>
@@ -95,7 +96,8 @@ Status PrimaryKeyIndexReader::parse_index(io::FileReaderSPtr
file_reader,
// parse primary key index
_index_reader.reset(new segment_v2::IndexedColumnReader(file_reader,
meta.primary_key_index()));
_index_reader->set_is_pk_index(true);
-
RETURN_IF_ERROR(_index_reader->load(!config::disable_pk_storage_page_cache,
false));
+
RETURN_IF_ERROR(_index_reader->load(!config::disable_pk_storage_page_cache,
false,
+ _pk_index_load_stats));
_index_parsed = true;
return Status::OK();
@@ -107,7 +109,8 @@ Status PrimaryKeyIndexReader::parse_bf(io::FileReaderSPtr
file_reader,
segment_v2::ColumnIndexMetaPB column_index_meta =
meta.bloom_filter_index();
segment_v2::BloomFilterIndexReader bf_index_reader(std::move(file_reader),
column_index_meta.bloom_filter_index());
-
RETURN_IF_ERROR(bf_index_reader.load(!config::disable_pk_storage_page_cache,
false));
+
RETURN_IF_ERROR(bf_index_reader.load(!config::disable_pk_storage_page_cache,
false,
+ _pk_index_load_stats));
std::unique_ptr<segment_v2::BloomFilterIndexIterator> bf_iter;
RETURN_IF_ERROR(bf_index_reader.new_iterator(&bf_iter));
RETURN_IF_ERROR(bf_iter->read_bloom_filter(0, &_bf));
diff --git a/be/src/olap/primary_key_index.h b/be/src/olap/primary_key_index.h
index b5eb13131b7..dcbbc5f3062 100644
--- a/be/src/olap/primary_key_index.h
+++ b/be/src/olap/primary_key_index.h
@@ -25,6 +25,7 @@
#include "common/status.h"
#include "io/fs/file_reader_writer_fwd.h"
+#include "olap/olap_common.h"
#include "olap/rowset/segment_v2/bloom_filter.h"
#include "olap/rowset/segment_v2/bloom_filter_index_writer.h"
#include "olap/rowset/segment_v2/indexed_column_reader.h"
@@ -97,7 +98,8 @@ private:
class PrimaryKeyIndexReader {
public:
- PrimaryKeyIndexReader() : _index_parsed(false), _bf_parsed(false) {}
+ PrimaryKeyIndexReader(OlapReaderStatistics* pk_index_load_stats = nullptr)
+ : _index_parsed(false), _bf_parsed(false),
_pk_index_load_stats(pk_index_load_stats) {}
~PrimaryKeyIndexReader() {
segment_v2::g_pk_total_bloom_filter_num <<
-static_cast<int64_t>(_bf_num);
@@ -111,9 +113,10 @@ public:
Status parse_bf(io::FileReaderSPtr file_reader, const
segment_v2::PrimaryKeyIndexMetaPB& meta);
- Status new_iterator(std::unique_ptr<segment_v2::IndexedColumnIterator>*
index_iterator) const {
+ Status new_iterator(std::unique_ptr<segment_v2::IndexedColumnIterator>*
index_iterator,
+ OlapReaderStatistics* stats = nullptr) const {
DCHECK(_index_parsed);
- index_iterator->reset(new
segment_v2::IndexedColumnIterator(_index_reader.get()));
+ index_iterator->reset(new
segment_v2::IndexedColumnIterator(_index_reader.get(), stats));
return Status::OK();
}
@@ -152,6 +155,7 @@ private:
std::unique_ptr<segment_v2::BloomFilter> _bf;
size_t _bf_num = 0;
uint64 _bf_bytes = 0;
+ OlapReaderStatistics* _pk_index_load_stats = nullptr;
};
} // namespace doris
diff --git a/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.cpp
b/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.cpp
index 0857c1890c4..917356f486b 100644
--- a/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.cpp
@@ -31,8 +31,10 @@
namespace doris {
namespace segment_v2 {
-Status BloomFilterIndexReader::load(bool use_page_cache, bool kept_in_memory) {
+Status BloomFilterIndexReader::load(bool use_page_cache, bool kept_in_memory,
+ OlapReaderStatistics* index_load_stats) {
// TODO yyq: implement a new once flag to avoid status construct.
+ _index_load_stats = index_load_stats;
return _load_once.call([this, use_page_cache, kept_in_memory] {
return _load(use_page_cache, kept_in_memory);
});
@@ -42,7 +44,7 @@ Status BloomFilterIndexReader::_load(bool use_page_cache,
bool kept_in_memory) {
const IndexedColumnMetaPB& bf_index_meta =
_bloom_filter_index_meta->bloom_filter();
_bloom_filter_reader.reset(new IndexedColumnReader(_file_reader,
bf_index_meta));
- RETURN_IF_ERROR(_bloom_filter_reader->load(use_page_cache,
kept_in_memory));
+ RETURN_IF_ERROR(_bloom_filter_reader->load(use_page_cache, kept_in_memory,
_index_load_stats));
return Status::OK();
}
diff --git a/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.h
b/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.h
index c2617ef4e4e..effaa876e1c 100644
--- a/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.h
+++ b/be/src/olap/rowset/segment_v2/bloom_filter_index_reader.h
@@ -47,7 +47,8 @@ public:
_bloom_filter_index_meta.reset(new
BloomFilterIndexPB(bloom_filter_index_meta));
}
- Status load(bool use_page_cache, bool kept_in_memory);
+ Status load(bool use_page_cache, bool kept_in_memory,
+ OlapReaderStatistics* _bf_index_load_stats = nullptr);
BloomFilterAlgorithmPB algorithm() { return
_bloom_filter_index_meta->algorithm(); }
@@ -67,6 +68,7 @@ private:
const TypeInfo* _type_info = nullptr;
std::unique_ptr<BloomFilterIndexPB> _bloom_filter_index_meta = nullptr;
std::unique_ptr<IndexedColumnReader> _bloom_filter_reader;
+ OlapReaderStatistics* _index_load_stats = nullptr;
};
class BloomFilterIndexIterator {
diff --git a/be/src/olap/rowset/segment_v2/indexed_column_reader.cpp
b/be/src/olap/rowset/segment_v2/indexed_column_reader.cpp
index 59251b5595d..4ed98fd9a6b 100644
--- a/be/src/olap/rowset/segment_v2/indexed_column_reader.cpp
+++ b/be/src/olap/rowset/segment_v2/indexed_column_reader.cpp
@@ -60,9 +60,11 @@ static bvar::Adder<uint64_t>
g_index_reader_memory_bytes("doris_index_reader_mem
using strings::Substitute;
-Status IndexedColumnReader::load(bool use_page_cache, bool kept_in_memory) {
+Status IndexedColumnReader::load(bool use_page_cache, bool kept_in_memory,
+ OlapReaderStatistics* index_load_stats) {
_use_page_cache = use_page_cache;
_kept_in_memory = kept_in_memory;
+ _index_load_stats = index_load_stats;
_type_info = get_scalar_type_info((FieldType)_meta.data_type());
if (_type_info == nullptr) {
@@ -105,7 +107,7 @@ Status IndexedColumnReader::load_index_page(const
PagePointerPB& pp, PageHandle*
BlockCompressionCodec* local_compress_codec;
RETURN_IF_ERROR(get_block_compression_codec(_meta.compression(),
&local_compress_codec));
RETURN_IF_ERROR(read_page(PagePointer(pp), handle, &body, &footer,
INDEX_PAGE,
- local_compress_codec, false));
+ local_compress_codec, false, _index_load_stats));
RETURN_IF_ERROR(reader->parse(body, footer.index_page_footer()));
_mem_size += body.get_size();
return Status::OK();
@@ -113,8 +115,10 @@ Status IndexedColumnReader::load_index_page(const
PagePointerPB& pp, PageHandle*
Status IndexedColumnReader::read_page(const PagePointer& pp, PageHandle*
handle, Slice* body,
PageFooterPB* footer, PageTypePB type,
- BlockCompressionCodec* codec, bool
pre_decode) const {
+ BlockCompressionCodec* codec, bool
pre_decode,
+ OlapReaderStatistics* stats) const {
OlapReaderStatistics tmp_stats;
+ OlapReaderStatistics* stats_ptr = stats != nullptr ? stats : &tmp_stats;
PageReadOptions opts {
.use_page_cache = _use_page_cache,
.kept_in_memory = _kept_in_memory,
@@ -123,9 +127,10 @@ Status IndexedColumnReader::read_page(const PagePointer&
pp, PageHandle* handle,
.file_reader = _file_reader.get(),
.page_pointer = pp,
.codec = codec,
- .stats = &tmp_stats,
+ .stats = stats_ptr,
.encoding_info = _encoding_info,
- .io_ctx = io::IOContext {.is_index_data = true},
+ .io_ctx = io::IOContext {.is_index_data = true,
+ .file_cache_stats =
&stats_ptr->file_cache_stats},
};
if (_is_pk_index) {
opts.type = PRIMARY_KEY_INDEX_PAGE;
@@ -154,8 +159,8 @@ Status IndexedColumnIterator::_read_data_page(const
PagePointer& pp) {
PageHandle handle;
Slice body;
PageFooterPB footer;
- RETURN_IF_ERROR(
- _reader->read_page(pp, &handle, &body, &footer, DATA_PAGE,
_compress_codec, true));
+ RETURN_IF_ERROR(_reader->read_page(pp, &handle, &body, &footer, DATA_PAGE,
_compress_codec,
+ true, _stats));
// parse data page
// note that page_index is not used in IndexedColumnIterator, so we pass 0
PageDecoderOptions opts;
diff --git a/be/src/olap/rowset/segment_v2/indexed_column_reader.h
b/be/src/olap/rowset/segment_v2/indexed_column_reader.h
index d156643a21c..6168fba2ed5 100644
--- a/be/src/olap/rowset/segment_v2/indexed_column_reader.h
+++ b/be/src/olap/rowset/segment_v2/indexed_column_reader.h
@@ -27,6 +27,7 @@
#include "common/status.h"
#include "io/fs/file_reader_writer_fwd.h"
+#include "olap/olap_common.h"
#include "olap/rowset/segment_v2/common.h"
#include "olap/rowset/segment_v2/index_page.h"
#include "olap/rowset/segment_v2/page_handle.h"
@@ -53,11 +54,13 @@ public:
~IndexedColumnReader();
- Status load(bool use_page_cache, bool kept_in_memory);
+ Status load(bool use_page_cache, bool kept_in_memory,
+ OlapReaderStatistics* index_load_stats = nullptr);
// read a page specified by `pp' from `file' into `handle'
Status read_page(const PagePointer& pp, PageHandle* handle, Slice* body,
PageFooterPB* footer,
- PageTypePB type, BlockCompressionCodec* codec, bool
pre_decode) const;
+ PageTypePB type, BlockCompressionCodec* codec, bool
pre_decode,
+ OlapReaderStatistics* stats = nullptr) const;
int64_t num_values() const { return _num_values; }
const EncodingInfo* encoding_info() const { return _encoding_info; }
@@ -95,14 +98,17 @@ private:
const KeyCoder* _value_key_coder = nullptr;
uint64_t _mem_size = 0;
bool _is_pk_index = false;
+ OlapReaderStatistics* _index_load_stats = nullptr;
};
class IndexedColumnIterator {
public:
- explicit IndexedColumnIterator(const IndexedColumnReader* reader)
+ explicit IndexedColumnIterator(const IndexedColumnReader* reader,
+ OlapReaderStatistics* stats = nullptr)
: _reader(reader),
_ordinal_iter(&reader->_ordinal_index_reader),
- _value_iter(&reader->_value_index_reader) {}
+ _value_iter(&reader->_value_index_reader),
+ _stats(stats) {}
// Seek to the given ordinal entry. Entry 0 is the first entry.
// Return Status::Error<ENTRY_NOT_FOUND> if provided seek point is past
the end.
@@ -151,6 +157,7 @@ private:
ordinal_t _current_ordinal = 0;
// iterator owned compress codec, should NOT be shared by threads,
initialized before used
BlockCompressionCodec* _compress_codec = nullptr;
+ OlapReaderStatistics* _stats = nullptr;
};
} // namespace segment_v2
diff --git a/be/src/olap/rowset/segment_v2/segment.cpp
b/be/src/olap/rowset/segment_v2/segment.cpp
index 11457a7a332..06a458a75ca 100644
--- a/be/src/olap/rowset/segment_v2/segment.cpp
+++ b/be/src/olap/rowset/segment_v2/segment.cpp
@@ -458,7 +458,8 @@ Status Segment::_load_pk_bloom_filter() {
});
}
-Status Segment::load_pk_index_and_bf() {
+Status Segment::load_pk_index_and_bf(OlapReaderStatistics* index_load_stats) {
+ _pk_index_load_stats = index_load_stats;
RETURN_IF_ERROR(load_index());
RETURN_IF_ERROR(_load_pk_bloom_filter());
return Status::OK();
@@ -467,7 +468,7 @@ Status Segment::load_pk_index_and_bf() {
Status Segment::load_index() {
return _load_index_once.call([this] {
if (_tablet_schema->keys_type() == UNIQUE_KEYS && _pk_index_meta !=
nullptr) {
- _pk_index_reader = std::make_unique<PrimaryKeyIndexReader>();
+ _pk_index_reader =
std::make_unique<PrimaryKeyIndexReader>(_pk_index_load_stats);
RETURN_IF_ERROR(_pk_index_reader->parse_index(_file_reader,
*_pk_index_meta));
// _meta_mem_usage += _pk_index_reader->get_memory_size();
return Status::OK();
@@ -926,7 +927,8 @@ Status Segment::new_inverted_index_iterator(const
TabletColumn& tablet_column,
}
Status Segment::lookup_row_key(const Slice& key, const TabletSchema*
latest_schema,
- bool with_seq_col, bool with_rowid,
RowLocation* row_location) {
+ bool with_seq_col, bool with_rowid,
RowLocation* row_location,
+ OlapReaderStatistics* stats) {
RETURN_IF_ERROR(load_pk_index_and_bf());
bool has_seq_col = latest_schema->has_sequence_col();
bool has_rowid = !latest_schema->cluster_key_idxes().empty();
@@ -946,7 +948,7 @@ Status Segment::lookup_row_key(const Slice& key, const
TabletSchema* latest_sche
}
bool exact_match = false;
std::unique_ptr<segment_v2::IndexedColumnIterator> index_iterator;
- RETURN_IF_ERROR(_pk_index_reader->new_iterator(&index_iterator));
+ RETURN_IF_ERROR(_pk_index_reader->new_iterator(&index_iterator, stats));
auto st = index_iterator->seek_at_or_after(&key_without_seq, &exact_match);
if (!st.ok() && !st.is<ErrorCode::ENTRY_NOT_FOUND>()) {
return st;
diff --git a/be/src/olap/rowset/segment_v2/segment.h
b/be/src/olap/rowset/segment_v2/segment.h
index 035860b9bc9..322b5d8b238 100644
--- a/be/src/olap/rowset/segment_v2/segment.h
+++ b/be/src/olap/rowset/segment_v2/segment.h
@@ -130,7 +130,8 @@ public:
}
Status lookup_row_key(const Slice& key, const TabletSchema* latest_schema,
bool with_seq_col,
- bool with_rowid, RowLocation* row_location);
+ bool with_rowid, RowLocation* row_location,
+ OlapReaderStatistics* stats = nullptr);
Status read_key_by_rowid(uint32_t row_id, std::string* key);
@@ -140,7 +141,7 @@ public:
Status load_index();
- Status load_pk_index_and_bf();
+ Status load_pk_index_and_bf(OlapReaderStatistics* index_load_stats =
nullptr);
void update_healthy_status(Status new_status) {
_healthy_status.update(new_status); }
// The segment is loaded into SegmentCache and then will load indices, if
there are something wrong
@@ -294,6 +295,7 @@ private:
InvertedIndexFileInfo _idx_file_info;
int _be_exec_version = BeExecVersionManager::get_newest_version();
+ OlapReaderStatistics* _pk_index_load_stats = nullptr;
};
} // namespace segment_v2
diff --git a/be/src/olap/segment_loader.cpp b/be/src/olap/segment_loader.cpp
index abc82c6f3ee..26ac54c699b 100644
--- a/be/src/olap/segment_loader.cpp
+++ b/be/src/olap/segment_loader.cpp
@@ -17,6 +17,8 @@
#include "olap/segment_loader.h"
+#include <butil/time.h>
+
#include "common/config.h"
#include "common/status.h"
#include "olap/olap_define.h"
@@ -52,7 +54,8 @@ void SegmentCache::erase(const SegmentCache::CacheKey& key) {
Status SegmentLoader::load_segments(const BetaRowsetSharedPtr& rowset,
SegmentCacheHandle* cache_handle, bool
use_cache,
- bool need_load_pk_index_and_bf) {
+ bool need_load_pk_index_and_bf,
+ OlapReaderStatistics* index_load_stats) {
if (cache_handle->is_inited()) {
return Status::OK();
}
@@ -70,7 +73,7 @@ Status SegmentLoader::load_segments(const
BetaRowsetSharedPtr& rowset,
segment_v2::SegmentSharedPtr segment;
RETURN_IF_ERROR(rowset->load_segment(i, &segment));
if (need_load_pk_index_and_bf) {
- RETURN_IF_ERROR(segment->load_pk_index_and_bf());
+ RETURN_IF_ERROR(segment->load_pk_index_and_bf(index_load_stats));
}
if (use_cache && !config::disable_segment_cache) {
// memory of SegmentCache::CacheValue will be handled by
SegmentCache
diff --git a/be/src/olap/segment_loader.h b/be/src/olap/segment_loader.h
index b3b88fa7700..834906da93b 100644
--- a/be/src/olap/segment_loader.h
+++ b/be/src/olap/segment_loader.h
@@ -117,7 +117,8 @@ public:
// Load segments of "rowset", return the "cache_handle" which contains
segments.
// If use_cache is true, it will be loaded from _cache.
Status load_segments(const BetaRowsetSharedPtr& rowset,
SegmentCacheHandle* cache_handle,
- bool use_cache = false, bool
need_load_pk_index_and_bf = false);
+ bool use_cache = false, bool
need_load_pk_index_and_bf = false,
+ OlapReaderStatistics* index_load_stats = nullptr);
void erase_segment(const SegmentCache::CacheKey& key);
diff --git a/be/src/service/internal_service.cpp
b/be/src/service/internal_service.cpp
index c23cc057584..89b43ec5223 100644
--- a/be/src/service/internal_service.cpp
+++ b/be/src/service/internal_service.cpp
@@ -886,13 +886,10 @@ void
PInternalService::fetch_arrow_flight_schema(google::protobuf::RpcController
Status PInternalService::_tablet_fetch_data(const PTabletKeyLookupRequest*
request,
PTabletKeyLookupResponse*
response) {
- PointQueryExecutor lookup_util;
- RETURN_IF_ERROR(lookup_util.init(request, response));
- RETURN_IF_ERROR(lookup_util.lookup_up());
- if (VLOG_DEBUG_IS_ON) {
- VLOG_DEBUG << lookup_util.print_profile();
- }
- LOG_EVERY_N(INFO, 500) << lookup_util.print_profile();
+ PointQueryExecutor executor;
+ RETURN_IF_ERROR(executor.init(request, response));
+ RETURN_IF_ERROR(executor.lookup_up());
+ executor.print_profile();
return Status::OK();
}
diff --git a/be/src/service/point_query_executor.cpp
b/be/src/service/point_query_executor.cpp
index 9719a672b8d..2550a53a6ad 100644
--- a/be/src/service/point_query_executor.cpp
+++ b/be/src/service/point_query_executor.cpp
@@ -22,6 +22,7 @@
#include <gen_cpp/Exprs_types.h>
#include <gen_cpp/PaloInternalService_types.h>
#include <gen_cpp/internal_service.pb.h>
+#include <glog/logging.h>
#include <google/protobuf/extension_set.h>
#include <stdlib.h>
@@ -39,6 +40,7 @@
#include "olap/olap_tuple.h"
#include "olap/row_cursor.h"
#include "olap/rowset/beta_rowset.h"
+#include "olap/rowset/rowset_fwd.h"
#include "olap/storage_engine.h"
#include "olap/tablet_manager.h"
#include "olap/tablet_schema.h"
@@ -313,34 +315,48 @@ Status PointQueryExecutor::lookup_up() {
return Status::OK();
}
-std::string PointQueryExecutor::print_profile() {
+void PointQueryExecutor::print_profile() {
auto init_us = _profile_metrics.init_ns.value() / 1000;
auto init_key_us = _profile_metrics.init_key_ns.value() / 1000;
auto lookup_key_us = _profile_metrics.lookup_key_ns.value() / 1000;
auto lookup_data_us = _profile_metrics.lookup_data_ns.value() / 1000;
auto output_data_us = _profile_metrics.output_data_ns.value() / 1000;
+ auto load_segments_key_us =
_profile_metrics.load_segment_key_stage_ns.value() / 1000;
+ auto load_segments_data_us =
_profile_metrics.load_segment_data_stage_ns.value() / 1000;
auto total_us = init_us + lookup_key_us + lookup_data_us + output_data_us;
auto read_stats = _profile_metrics.read_stats;
- return fmt::format(
- ""
+ const std::string stats_str = fmt::format(
"[lookup profile:{}us] init:{}us, init_key:{}us,"
- ""
- ""
- "lookup_key:{}us, lookup_data:{}us, output_data:{}us,
hit_lookup_cache:{}"
- ""
- ""
+ " lookup_key:{}us, load_segments_key:{}us, lookup_data:{}us,
load_segments_data:{}us,"
+ " output_data:{}us, "
+ "hit_lookup_cache:{}"
", is_binary_row:{}, output_columns:{}, total_keys:{},
row_cache_hits:{}"
", hit_cached_pages:{}, total_pages_read:{},
compressed_bytes_read:{}, "
"io_latency:{}ns, "
"uncompressed_bytes_read:{}, result_data_bytes:{}, row_hits:{}"
- ", rs_column_uid:{}"
- "",
- total_us, init_us, init_key_us, lookup_key_us, lookup_data_us,
output_data_us,
- _profile_metrics.hit_lookup_cache, _binary_row_format,
_reusable->output_exprs().size(),
- _row_read_ctxs.size(), _profile_metrics.row_cache_hits,
read_stats.cached_pages_num,
+ ", rs_column_uid:{}, bytes_read_from_local:{},
bytes_read_from_remote:{}, "
+ "local_io_timer:{}, remote_io_timer:{}, local_write_timer:{}",
+ total_us, init_us, init_key_us, lookup_key_us,
load_segments_key_us, lookup_data_us,
+ load_segments_data_us, output_data_us,
_profile_metrics.hit_lookup_cache,
+ _binary_row_format, _reusable->output_exprs().size(),
_row_read_ctxs.size(),
+ _profile_metrics.row_cache_hits, read_stats.cached_pages_num,
read_stats.total_pages_num, read_stats.compressed_bytes_read,
read_stats.io_ns,
read_stats.uncompressed_bytes_read,
_profile_metrics.result_data_bytes, _row_hits,
- _reusable->rs_column_uid());
+ _reusable->rs_column_uid(),
+ _profile_metrics.read_stats.file_cache_stats.bytes_read_from_local,
+
_profile_metrics.read_stats.file_cache_stats.bytes_read_from_remote,
+ _profile_metrics.read_stats.file_cache_stats.local_io_timer,
+ _profile_metrics.read_stats.file_cache_stats.remote_io_timer,
+ _profile_metrics.read_stats.file_cache_stats.write_cache_io_timer);
+
+ constexpr static int kSlowThreholdUs = 50 * 1000; // 50ms
+ if (total_us > kSlowThreholdUs) {
+ LOG(WARNING) << "slow query, " << stats_str;
+ } else if (VLOG_DEBUG_IS_ON) {
+ VLOG_DEBUG << stats_str;
+ } else {
+ LOG_EVERY_N(INFO, 1000) << stats_str;
+ }
}
Status PointQueryExecutor::_init_keys(const PTabletKeyLookupRequest* request) {
@@ -380,6 +396,17 @@ Status PointQueryExecutor::_lookup_row_key() {
specified_rowsets = _tablet->get_rowset_by_ids(nullptr);
}
std::vector<std::unique_ptr<SegmentCacheHandle>>
segment_caches(specified_rowsets.size());
+ // init segment_cache
+ {
+ SCOPED_TIMER(&_profile_metrics.load_segment_key_stage_ns);
+ for (size_t i = 0; i < specified_rowsets.size(); i++) {
+ auto& rs = specified_rowsets[i];
+ segment_caches[i] = std::make_unique<SegmentCacheHandle>();
+ RETURN_IF_ERROR(SegmentLoader::instance()->load_segments(
+ std::static_pointer_cast<BetaRowset>(rs),
segment_caches[i].get(), true, true,
+ &_profile_metrics.read_stats));
+ }
+ }
for (size_t i = 0; i < _row_read_ctxs.size(); ++i) {
RowLocation location;
if (!config::disable_storage_row_cache) {
@@ -396,7 +423,8 @@ Status PointQueryExecutor::_lookup_row_key() {
auto rowset_ptr = std::make_unique<RowsetSharedPtr>();
st = (_tablet->lookup_row_key(_row_read_ctxs[i]._primary_key, nullptr,
false,
specified_rowsets, &location, INT32_MAX
/*rethink?*/,
- segment_caches, rowset_ptr.get(),
false));
+ segment_caches, rowset_ptr.get(), false,
+ &_profile_metrics.read_stats));
if (st.is<ErrorCode::KEY_NOT_FOUND>()) {
continue;
}
@@ -459,7 +487,11 @@ Status PointQueryExecutor::_lookup_row_data() {
BetaRowsetSharedPtr rowset =
std::static_pointer_cast<BetaRowset>(_tablet->get_rowset(row_loc.rowset_id));
SegmentCacheHandle segment_cache;
- RETURN_IF_ERROR(SegmentLoader::instance()->load_segments(rowset,
&segment_cache, true));
+ {
+ SCOPED_TIMER(&_profile_metrics.load_segment_data_stage_ns);
+ RETURN_IF_ERROR(
+ SegmentLoader::instance()->load_segments(rowset,
&segment_cache, true));
+ }
// find segment
auto it = std::find_if(segment_cache.get_segments().cbegin(),
segment_cache.get_segments().cend(),
diff --git a/be/src/service/point_query_executor.h
b/be/src/service/point_query_executor.h
index b22dc5bfd1d..89f4ecff9b1 100644
--- a/be/src/service/point_query_executor.h
+++ b/be/src/service/point_query_executor.h
@@ -276,12 +276,16 @@ struct Metrics {
init_key_ns(TUnit::TIME_NS),
lookup_key_ns(TUnit::TIME_NS),
lookup_data_ns(TUnit::TIME_NS),
- output_data_ns(TUnit::TIME_NS) {}
+ output_data_ns(TUnit::TIME_NS),
+ load_segment_key_stage_ns(TUnit::TIME_NS),
+ load_segment_data_stage_ns(TUnit::TIME_NS) {}
RuntimeProfile::Counter init_ns;
RuntimeProfile::Counter init_key_ns;
RuntimeProfile::Counter lookup_key_ns;
RuntimeProfile::Counter lookup_data_ns;
RuntimeProfile::Counter output_data_ns;
+ RuntimeProfile::Counter load_segment_key_stage_ns;
+ RuntimeProfile::Counter load_segment_data_stage_ns;
OlapReaderStatistics read_stats;
size_t row_cache_hits = 0;
bool hit_lookup_cache = false;
@@ -297,7 +301,9 @@ public:
Status lookup_up();
- std::string print_profile();
+ void print_profile();
+
+ const OlapReaderStatistics& read_stats() const { return _read_stats; }
private:
Status _init_keys(const PTabletKeyLookupRequest* request);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
