fix

dataroaring · May 30, 2024 · 9c2c6a5 · 9c2c6a5
1 parent c8c7f1c
commit 9c2c6a5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp
@@ -52,6 +52,9 @@ bvar::PerSecond<bvar::Adder<uint64_t>> g_tablet_pk_not_found_per_second(
  "doris_pk", "lookup_not_found_per_second", &g_tablet_pk_not_found, 60);
 bvar::LatencyRecorder g_tablet_update_delete_bitmap_latency("doris_pk", "update_delete_bitmap");
 
+static bvar::Adder<size_t> g_total_tablet_num("doris_total_tablet_num");
+
+
 // read columns by read plan
 // read_index: ori_pos-> block_idx
 Status read_columns_by_plan(TabletSchemaSPtr tablet_schema,
@@ -158,10 +161,12 @@ BaseTablet::BaseTablet(TabletMetaSharedPtr tablet_meta) : _tablet_meta(std::move
  tablet_schema_with_merged_max_schema_version(_tablet_meta->all_rs_metas());
  }
  DCHECK(_max_version_schema);
+ g_total_tablet_num << 1;
 }
 
 BaseTablet::~BaseTablet() {
  DorisMetrics::instance()->metric_registry()->deregister_entity(_metric_entity);
+ g_total_tablet_num << -1;
 }
 
 TabletSchemaSPtr BaseTablet::tablet_schema_with_merged_max_schema_version(

diff --git a/be/src/olap/rowset/rowset.cpp b/be/src/olap/rowset/rowset.cpp
@@ -26,6 +26,8 @@
 
 namespace doris {
 
+static bvar::Adder<size_t> g_total_rowset_num("doris_total_rowset_num");
+
 Rowset::Rowset(const TabletSchemaSPtr& schema, const RowsetMetaSharedPtr& rowset_meta)
  : _rowset_meta(rowset_meta), _refs_by_reader(0) {
  _is_pending = !_rowset_meta->has_version();
@@ -37,6 +39,11 @@ Rowset::Rowset(const TabletSchemaSPtr& schema, const RowsetMetaSharedPtr& rowset
  }
  // build schema from RowsetMeta.tablet_schema or Tablet.tablet_schema
  _schema = _rowset_meta->tablet_schema() ? _rowset_meta->tablet_schema() : schema;
+ g_total_rowset_num << 1;
+}
+
+Rowset::~Rowset() {
+ g_total_rowset_num << -1;
 }
 
 Status Rowset::load(bool use_cache) {

diff --git a/be/src/olap/rowset/rowset.h b/be/src/olap/rowset/rowset.h
@@ -118,7 +118,7 @@ class RowsetStateMachine {
 
 class Rowset : public std::enable_shared_from_this<Rowset> {
 public:
- virtual ~Rowset() = default;
+ virtual ~Rowset();
 
  // Open all segment files in this rowset and load necessary metadata.
  // - `use_cache` : whether to use fd cache, only applicable to alpha rowset now

diff --git a/be/src/olap/tablet_schema.cpp b/be/src/olap/tablet_schema.cpp
@@ -53,6 +53,8 @@
 
 namespace doris {
 
+static bvar::Adder<size_t> g_total_tablet_schema_num("doris_total_tablet_schema_num");
+
 FieldType TabletColumn::get_field_type_by_type(PrimitiveType primitiveType) {
  switch (primitiveType) {
  case PrimitiveType::INVALID_TYPE:
@@ -820,6 +822,14 @@ void TabletIndex::to_schema_pb(TabletIndexPB* index) const {
  }
 }
 
+TabletSchema::TabletSchema() {
+ g_total_tablet_schema_num << 1;
+}
+
+TabletSchema::~TabletSchema() {
+ g_total_tablet_schema_num << -1;
+}
+
 void TabletSchema::append_column(TabletColumn column, ColumnType col_type) {
  if (column.is_key()) {
  _num_key_columns++;

diff --git a/be/src/olap/tablet_schema.h b/be/src/olap/tablet_schema.h
@@ -269,7 +269,9 @@ class TabletSchema {
  // TODO(yingchun): better to make constructor as private to avoid
  // manually init members incorrectly, and define a new function like
  // void create_from_pb(const TabletSchemaPB& schema, TabletSchema* tablet_schema).
- TabletSchema() = default;
+ TabletSchema();
+ virtual ~TabletSchema();
+
  void init_from_pb(const TabletSchemaPB& schema, bool ignore_extracted_columns = false);
  // Notice: Use deterministic way to serialize protobuf,
  // since serialize Map in protobuf may could lead to un-deterministic by default