fix

Signed-off-by: gengjun-git <[email protected]>
StarRocks · Aug 30, 2024 · f9f3f09 · f9f3f09
1 parent 8066eb6
commit f9f3f09
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/Database.java b/fe/fe-core/src/main/java/com/starrocks/catalog/Database.java
@@ -72,6 +72,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -753,6 +754,7 @@ public List<PhysicalPartition> getPartitionSamples() {
                 .stream()
                 .filter(table -> table instanceof OlapTable)
                 .map(table -> ((OlapTable) table).getPartitionSample())
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
     }
 

diff --git a/fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java b/fe/fe-core/src/main/java/com/starrocks/catalog/OlapTable.java
@@ -3525,6 +3525,10 @@ public int getPartitionsCount() {
     }
 
     public PhysicalPartition getPartitionSample() {
-        return idToPartition.values().iterator().next().getSubPartitions().iterator().next();
+        if (!idToPartition.isEmpty()) {
+            return idToPartition.values().iterator().next().getSubPartitions().iterator().next();
+        } else {
+            return null;
+        }
     }
 }
diff --git a/fe/fe-core/src/main/java/com/starrocks/memory/MemoryUsageTracker.java b/fe/fe-core/src/main/java/com/starrocks/memory/MemoryUsageTracker.java
@@ -68,6 +68,7 @@ private void initMemoryTracker() {
         registerMemoryTracker("Task", currentState.getTaskManager());
         registerMemoryTracker("Task", currentState.getTaskManager().getTaskRunManager());
         registerMemoryTracker("TabletInvertedIndex", currentState.getTabletInvertedIndex());
+        registerMemoryTracker("LocalMetastore", currentState.getLocalMetastore());
 
         registerMemoryTracker("Query", new QueryTracker());
         registerMemoryTracker("Profile", ProfileManager.getInstance());