Skip to content

branch-4.1: [fix](fe) Return unknown stats for system tables #62913 #63010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: branch-4.1
Choose a base branch
from
+52 −0
Open

branch-4.1: [fix](fe) Return unknown stats for system tables #62913 #63010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/statistics/StatisticsCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,9 @@ public ColumnStatistic getColumnStatistics(String colName, ConnectContext ctx) {
if (ctx != null && ctx.getState().isPlanWithUnKnownColumnStats()) {
return ColumnStatistic.UNKNOWN;
}
if (StatisticConstants.isSystemTable(olapTable)) {
return ColumnStatistic.UNKNOWN;
}
return doGetColumnStatistics(
catalogId, schemaId, tableId, selectIndexId, colName, ctx
);
Expand All @@ -411,6 +414,9 @@ public PartitionColumnStatistic getPartitionColumnStatistics(
if (ctx != null && ctx.getState().isPlanWithUnKnownColumnStats()) {
return PartitionColumnStatistic.UNKNOWN;
}
if (StatisticConstants.isSystemTable(olapTable)) {
return PartitionColumnStatistic.UNKNOWN;
}
return doGetPartitionColumnStatistics(
catalogId, schemaId, tableId, selectIndexId, partName, colName
);
Expand Down
46 changes: 46 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/statistics/StatisticsCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,20 @@

package org.apache.doris.statistics;

import org.apache.doris.catalog.DatabaseIf;
import org.apache.doris.catalog.OlapTable;
import org.apache.doris.common.FeConstants;
import org.apache.doris.datasource.CatalogIf;
import org.apache.doris.nereids.trees.plans.algebra.OlapScan;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.utframe.UtFrameUtils;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedConstruction;
import org.mockito.Mockito;

public class StatisticsCacheTest {

Expand Down Expand Up @@ -87,4 +94,43 @@ public void testGetPartitionColumnStatistics_withPlanWithUnknownColumnStats() {
ConnectContext.get().getState().setPlanWithUnKnownColumnStats(prevFlag);
}
}

@Test
public void testOlapTableStatisticsSkipSystemTable() {
try (MockedConstruction<ColumnStatisticsCacheLoader> columnLoader = Mockito.mockConstruction(
ColumnStatisticsCacheLoader.class);
MockedConstruction<PartitionColumnStatisticCacheLoader> partitionLoader = Mockito.mockConstruction(
PartitionColumnStatisticCacheLoader.class)) {
StatisticsCache cache = new StatisticsCache();
StatisticsCache.OlapTableStatistics olapTableStats =
cache.getOlapTableStats(mockSystemOlapScan(FeConstants.INTERNAL_DB_NAME));

Assertions.assertEquals(ColumnStatistic.UNKNOWN,
olapTableStats.getColumnStatistics("col", ConnectContext.get()));
Assertions.assertEquals(PartitionColumnStatistic.UNKNOWN,
olapTableStats.getPartitionColumnStatistics("p1", "col", ConnectContext.get()));

Mockito.verifyNoInteractions(columnLoader.constructed().get(0));
Mockito.verifyNoInteractions(partitionLoader.constructed().get(0));
}
}

private OlapScan mockSystemOlapScan(String dbName) {
CatalogIf catalog = Mockito.mock(CatalogIf.class);
Mockito.when(catalog.getId()).thenReturn(1L);
DatabaseIf database = Mockito.mock(DatabaseIf.class);
Mockito.when(database.getId()).thenReturn(2L);
Mockito.when(database.getCatalog()).thenReturn(catalog);

OlapTable table = Mockito.mock(OlapTable.class);
Mockito.when(table.getQualifiedDbName()).thenReturn(dbName);
Mockito.when(table.getDatabase()).thenReturn(database);
Mockito.when(table.getId()).thenReturn(3L);
Mockito.when(table.getBaseIndexId()).thenReturn(4L);

OlapScan scan = Mockito.mock(OlapScan.class);
Mockito.when(scan.getTable()).thenReturn(table);
Mockito.when(scan.getSelectedIndexId()).thenReturn(4L);
return scan;
}
}
Loading