diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java index 4a6bc249b4a716..4f205be0381b37 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Database.java @@ -1016,8 +1016,4 @@ public String toJson() { public String toString() { return toJson(); } - - public int getTableNum() { - return idToTable.size(); - } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java index 8ed93b78fd0940..19594f339b1546 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogMgr.java @@ -840,8 +840,4 @@ public Map>> getIdToCata public Set getCopyOfCatalog() { return new HashSet<>(idToCatalog.values()); } - - public int getCatalogNum() { - return idToCatalog.size(); - } } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java index b6dc35b45623ed..c4a8983df6f452 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InternalCatalog.java @@ -267,10 +267,6 @@ public List getDbIds() { return Lists.newArrayList(idToDb.keySet()); } - public int getDbNum() { - return idToDb.size(); - } - @Nullable @Override public Database getDbNullable(String dbName) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java index 80800bc0738189..14dd8834454066 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/metric/MetricRepo.java @@ -19,7 +19,6 @@ import org.apache.doris.alter.Alter; import org.apache.doris.alter.AlterJobV2.JobType; -import org.apache.doris.catalog.Database; import org.apache.doris.catalog.Env; import org.apache.doris.cloud.system.CloudSystemInfoService; import org.apache.doris.common.Config; @@ -150,11 +149,6 @@ public final class MetricRepo { public static Histogram HISTO_COMMIT_AND_PUBLISH_LATENCY; - // Catlaog/Database/Table num - public static GaugeMetric GAUGE_CATALOG_NUM; - public static GaugeMetric GAUGE_INTERNAL_DATABASE_NUM; - public static GaugeMetric GAUGE_INTERNAL_TABLE_NUM; - private static Map, Long> loadJobNum = Maps.newHashMap(); private static ScheduledThreadPoolExecutor metricTimer = ThreadPoolManager.newDaemonScheduledThreadPool(1, @@ -566,34 +560,6 @@ public Long getValue() { HISTO_COMMIT_AND_PUBLISH_LATENCY = METRIC_REGISTER.histogram( MetricRegistry.name("txn_commit_and_publish", "latency", "ms")); - GAUGE_CATALOG_NUM = new GaugeMetric("catalog_num", - MetricUnit.NOUNIT, "total catalog num") { - @Override - public Integer getValue() { - return Env.getCurrentEnv().getCatalogMgr().getCatalogNum(); - } - }; - DORIS_METRIC_REGISTER.addMetrics(GAUGE_CATALOG_NUM); - - GAUGE_INTERNAL_DATABASE_NUM = new GaugeMetric("internal_database_num", - MetricUnit.NOUNIT, "total internal database num") { - @Override - public Integer getValue() { - return Env.getCurrentEnv().getCatalogMgr().getInternalCatalog().getDbNum(); - } - }; - DORIS_METRIC_REGISTER.addMetrics(GAUGE_INTERNAL_DATABASE_NUM); - - GAUGE_INTERNAL_TABLE_NUM = new GaugeMetric("internal_table_num", - MetricUnit.NOUNIT, "total internal table num") { - @Override - public Integer getValue() { - return Env.getCurrentEnv().getCatalogMgr().getInternalCatalog().getAllDbs().stream() - .map(d -> (Database) d).map(Database::getTableNum).reduce(0, Integer::sum); - } - }; - DORIS_METRIC_REGISTER.addMetrics(GAUGE_INTERNAL_TABLE_NUM); - // init system metrics initSystemMetrics(); CloudMetrics.init(); diff --git a/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java b/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java index 3ce3b4751532e3..5b8c4bdd7288c6 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/metric/MetricsTest.java @@ -19,7 +19,6 @@ import org.apache.doris.common.FeConstants; import org.apache.doris.common.util.JsonUtil; -import org.apache.doris.metric.Metric.MetricUnit; import org.apache.doris.monitor.jvm.JvmService; import org.apache.doris.monitor.jvm.JvmStats; @@ -123,46 +122,4 @@ public void testGc() { Assert.assertTrue(size.get() < JsonUtil.parseArray(finalMetricJson).size()); } - - @Test - public void testCatalogAndDatabaseMetrics() { - List catalogMetrics = MetricRepo.getMetricsByName("catalog_num"); - Assert.assertEquals(1, catalogMetrics.size()); - GaugeMetric catalogMetric = (GaugeMetric) catalogMetrics.get(0); - Assert.assertEquals("catalog_num", catalogMetric.getName()); - Assert.assertEquals(MetricUnit.NOUNIT, catalogMetric.getUnit()); - Assert.assertEquals("total catalog num", catalogMetric.getDescription()); - - List dbMetrics = MetricRepo.getMetricsByName("internal_database_num"); - Assert.assertEquals(1, dbMetrics.size()); - GaugeMetric dbMetric = (GaugeMetric) dbMetrics.get(0); - Assert.assertEquals("internal_database_num", dbMetric.getName()); - Assert.assertEquals(MetricUnit.NOUNIT, dbMetric.getUnit()); - Assert.assertEquals("total internal database num", dbMetric.getDescription()); - - List tableMetrics = MetricRepo.getMetricsByName("internal_table_num"); - Assert.assertEquals(1, tableMetrics.size()); - GaugeMetric tableMetric = (GaugeMetric) tableMetrics.get(0); - Assert.assertEquals("internal_table_num", tableMetric.getName()); - Assert.assertEquals(MetricUnit.NOUNIT, tableMetric.getUnit()); - Assert.assertEquals("total internal table num", tableMetric.getDescription()); - - // Test metrics in Prometheus format - MetricVisitor visitor = new PrometheusMetricVisitor(); - MetricRepo.DORIS_METRIC_REGISTER.accept(visitor); - String metricResult = visitor.finish(); - - Assert.assertTrue(metricResult.contains("# TYPE doris_fe_catalog_num gauge")); - Assert.assertTrue(metricResult.contains("# TYPE doris_fe_internal_database_num gauge")); - Assert.assertTrue(metricResult.contains("# TYPE doris_fe_internal_table_num gauge")); - - // Test metrics in JSON format - JsonMetricVisitor jsonVisitor = new JsonMetricVisitor(); - MetricRepo.DORIS_METRIC_REGISTER.accept(jsonVisitor); - String jsonResult = jsonVisitor.finish(); - - Assert.assertTrue(jsonResult.contains("\"metric\":\"doris_fe_catalog_num\"")); - Assert.assertTrue(jsonResult.contains("\"metric\":\"doris_fe_internal_database_num\"")); - Assert.assertTrue(jsonResult.contains("\"metric\":\"doris_fe_internal_table_num\"")); - } }