This is an automated email from the ASF dual-hosted git repository.
starocean999 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 66f10bf37dd [Chore](nereids) Remove ShowColumnStatsStmt (#54378)
66f10bf37dd is described below
commit 66f10bf37dd6528af2a12dcc1d40f376ea6bd10a
Author: csding <[email protected]>
AuthorDate: Wed Aug 6 17:13:51 2025 +0800
[Chore](nereids) Remove ShowColumnStatsStmt (#54378)
---
fe/fe-core/src/main/cup/sql_parser.cup | 5 -
.../apache/doris/analysis/ShowColumnStatsStmt.java | 285 ---------------------
.../java/org/apache/doris/qe/ShowExecutor.java | 35 ---
3 files changed, 325 deletions(-)
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index cd7f990a8a0..704fc13695b 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -3530,11 +3530,6 @@ show_param ::=
{:
RESULT = new ShowAlterStmt(type, db, parser.where, orderByClause,
limitClause);
:}
- /* show column stats */
- | KW_COLUMN opt_cached:cached KW_STATS table_name:tbl opt_col_list:cols
opt_partition_names:partitionNames
- {:
- RESULT = new ShowColumnStatsStmt(tbl, cols, partitionNames, cached);
- :}
| KW_TABLET KW_DIAGNOSIS INTEGER_LITERAL:tabletId
{:
RESULT = new DiagnoseTabletStmt(tabletId);
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowColumnStatsStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowColumnStatsStmt.java
deleted file mode 100644
index 908729c870b..00000000000
---
a/fe/fe-core/src/main/java/org/apache/doris/analysis/ShowColumnStatsStmt.java
+++ /dev/null
@@ -1,285 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package org.apache.doris.analysis;
-
-import org.apache.doris.catalog.Column;
-import org.apache.doris.catalog.DatabaseIf;
-import org.apache.doris.catalog.Env;
-import org.apache.doris.catalog.OlapTable;
-import org.apache.doris.catalog.Partition;
-import org.apache.doris.catalog.ScalarType;
-import org.apache.doris.catalog.TableIf;
-import org.apache.doris.common.ErrorCode;
-import org.apache.doris.common.ErrorReport;
-import org.apache.doris.common.Pair;
-import org.apache.doris.common.UserException;
-import org.apache.doris.common.util.Util;
-import org.apache.doris.datasource.CatalogIf;
-import org.apache.doris.mysql.privilege.PrivPredicate;
-import org.apache.doris.qe.ConnectContext;
-import org.apache.doris.qe.ShowResultSet;
-import org.apache.doris.qe.ShowResultSetMetaData;
-import org.apache.doris.statistics.AnalysisManager;
-import org.apache.doris.statistics.ColStatsMeta;
-import org.apache.doris.statistics.ColumnStatistic;
-import org.apache.doris.statistics.PartitionColumnStatistic;
-import org.apache.doris.statistics.PartitionColumnStatisticCacheKey;
-import org.apache.doris.statistics.ResultRow;
-import org.apache.doris.statistics.TableStatsMeta;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-public class ShowColumnStatsStmt extends ShowStmt implements
NotFallbackInParser {
-
- private static final ImmutableList<String> TABLE_COLUMN_TITLE_NAMES =
- new ImmutableList.Builder<String>()
- .add("column_name")
- .add("index_name")
- .add("count")
- .add("ndv")
- .add("num_null")
- .add("data_size")
- .add("avg_size_byte")
- .add("min")
- .add("max")
- .add("method")
- .add("type")
- .add("trigger")
- .add("query_times")
- .add("updated_time")
- .add("update_rows")
- .add("last_analyze_row_count")
- .add("last_analyze_version")
- .add("hot_values")
- .build();
-
- private static final ImmutableList<String> PARTITION_COLUMN_TITLE_NAMES =
- new ImmutableList.Builder<String>()
- .add("column_name")
- .add("partition_name")
- .add("index_name")
- .add("count")
- .add("ndv")
- .add("num_null")
- .add("min")
- .add("max")
- .add("data_size")
- .add("updated_time")
- .add("update_rows")
- .add("trigger")
- .build();
-
- private final TableName tableName;
-
- private final List<String> columnNames;
- private final PartitionNames partitionNames;
- private final boolean cached;
-
- private TableIf table;
-
- public ShowColumnStatsStmt(TableName tableName, List<String> columnNames,
- PartitionNames partitionNames, boolean cached) {
- this.tableName = tableName;
- this.columnNames = columnNames;
- this.partitionNames = partitionNames;
- this.cached = cached;
- }
-
- public TableName getTableName() {
- return tableName;
- }
-
- @Override
- public void analyze() throws UserException {
- super.analyze();
- tableName.analyze();
- if (partitionNames != null) {
- partitionNames.analyze();
- }
- CatalogIf<DatabaseIf> catalog =
Env.getCurrentEnv().getCatalogMgr().getCatalog(tableName.getCtl());
- if (catalog == null) {
- ErrorReport.reportAnalysisException("Catalog: %s not exists",
tableName.getCtl());
- }
- DatabaseIf<TableIf> db = catalog.getDb(tableName.getDb()).orElse(null);
- if (db == null) {
- ErrorReport.reportAnalysisException("DB: %s not exists",
tableName.getDb());
- }
- table = db.getTable(tableName.getTbl()).orElse(null);
- if (table == null) {
- ErrorReport.reportAnalysisException("Table: %s not exists",
tableName.getTbl());
- }
-
- if (!Env.getCurrentEnv().getAccessManager()
- .checkTblPriv(ConnectContext.get(), tableName.getCtl(),
tableName.getDb(), tableName.getTbl(),
- PrivPredicate.SHOW)) {
-
ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLEACCESS_DENIED_ERROR,
"Permission denied",
- ConnectContext.get().getQualifiedUser(),
ConnectContext.get().getRemoteIP(),
- tableName.getDb() + ": " + tableName.getTbl());
- }
-
- if (columnNames != null) {
- for (String name : columnNames) {
- if (table.getColumn(name) == null) {
- ErrorReport.reportAnalysisException("Column: %s not
exists", name);
- }
- }
- }
- }
-
- @Override
- public ShowResultSetMetaData getMetaData() {
- ShowResultSetMetaData.Builder builder =
ShowResultSetMetaData.builder();
- ImmutableList<String> titles = partitionNames == null ?
TABLE_COLUMN_TITLE_NAMES : PARTITION_COLUMN_TITLE_NAMES;
- for (String title : titles) {
- builder.addColumn(new Column(title, ScalarType.createVarchar(30)));
- }
- return builder.build();
- }
-
- public TableIf getTable() {
- return table;
- }
-
- public ShowResultSet constructResultSet(List<Pair<Pair<String, String>,
ColumnStatistic>> columnStatistics) {
- List<List<String>> result = Lists.newArrayList();
- AnalysisManager analysisManager =
Env.getCurrentEnv().getAnalysisManager();
- columnStatistics.forEach(p -> {
- if (p.second.isUnKnown) {
- return;
- }
- List<String> row = Lists.newArrayList();
- // p data structure is Pair<Pair<IndexName, ColumnName>,
ColumnStatistic>
- row.add(p.first.second);
- row.add(Util.getTempTableDisplayName(p.first.first));
- row.add(String.valueOf(p.second.count));
- row.add(String.valueOf(p.second.ndv));
- row.add(String.valueOf(p.second.numNulls));
- row.add(String.valueOf(p.second.dataSize));
- row.add(String.valueOf(p.second.avgSizeByte));
- row.add(String.valueOf(p.second.minExpr == null ? "N/A" :
p.second.minExpr.toSql()));
- row.add(String.valueOf(p.second.maxExpr == null ? "N/A" :
p.second.maxExpr.toSql()));
- ColStatsMeta colStatsMeta =
analysisManager.findColStatsMeta(table.getId(), p.first.first, p.first.second);
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
colStatsMeta.analysisMethod));
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
colStatsMeta.analysisType));
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
colStatsMeta.jobType));
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
colStatsMeta.queriedTimes));
- row.add(String.valueOf(p.second.updatedTime));
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
colStatsMeta.updatedRows));
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
colStatsMeta.rowCount));
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
colStatsMeta.tableVersion));
- row.add(String.valueOf(colStatsMeta == null ? "N/A" :
p.second.getStringHotValues()));
- result.add(row);
- });
- return new ShowResultSet(getMetaData(), result);
- }
-
- public ShowResultSet constructPartitionResultSet(List<ResultRow>
resultRows, TableIf tableIf) {
- List<List<String>> result = Lists.newArrayList();
- for (ResultRow r : resultRows) {
- List<String> row = Lists.newArrayList();
- row.add(r.get(0)); // column_name
- row.add(r.get(1)); // partition_name
- long indexId = Long.parseLong(r.get(2));
- String indexName = indexId == -1 ? tableIf.getName() :
((OlapTable) tableIf).getIndexNameById(indexId);
- row.add(indexName); // index_name.
- row.add(r.get(3)); // count
- row.add(r.get(4)); // ndv
- row.add(r.get(5)); // num_null
- row.add(r.get(6)); // min
- row.add(r.get(7)); // max
- row.add(r.get(8)); // data_size
- row.add(r.get(9)); // updated_time
- String updateRows = "N/A";
- TableStatsMeta tableStats =
Env.getCurrentEnv().getAnalysisManager().findTableStatsStatus(tableIf.getId());
- ColStatsMeta columnStatsMeta = null;
- if (tableStats != null && tableIf instanceof OlapTable) {
- OlapTable olapTable = (OlapTable) tableIf;
- columnStatsMeta = tableStats.findColumnStatsMeta(indexName,
r.get(0));
- if (columnStatsMeta != null &&
columnStatsMeta.partitionUpdateRows != null) {
- Partition partition = olapTable.getPartition(r.get(1));
- if (partition != null) {
- Long rows =
columnStatsMeta.partitionUpdateRows.get(partition.getId());
- if (rows != null) {
- updateRows = rows.toString();
- }
- }
- }
- }
- row.add(updateRows); // update_rows
- row.add(columnStatsMeta == null ? "N/A" :
columnStatsMeta.jobType.name()); // trigger. Manual or System
- result.add(row);
- }
- return new ShowResultSet(getMetaData(), result);
- }
-
- public ShowResultSet constructPartitionCachedColumnStats(
- Map<PartitionColumnStatisticCacheKey, PartitionColumnStatistic>
resultMap, TableIf tableIf) {
- List<List<String>> result = Lists.newArrayList();
- for (Map.Entry<PartitionColumnStatisticCacheKey,
PartitionColumnStatistic> entry : resultMap.entrySet()) {
- PartitionColumnStatisticCacheKey key = entry.getKey();
- PartitionColumnStatistic value = entry.getValue();
- if (value == null || value.isUnKnown) {
- continue;
- }
- List<String> row = Lists.newArrayList();
- row.add(key.colName); // column_name
- row.add(key.partId); // partition_name
- long indexId = key.idxId;
- String indexName = indexId == -1 ? tableIf.getName() :
((OlapTable) tableIf).getIndexNameById(indexId);
- row.add(indexName); // index_name.
- row.add(String.valueOf(value.count)); // count
- row.add(String.valueOf(value.ndv.estimateCardinality())); // ndv
- row.add(String.valueOf(value.numNulls)); // num_null
- row.add(String.valueOf(value.minExpr == null ? "N/A" :
value.minExpr.toSql())); // min
- row.add(String.valueOf(value.maxExpr == null ? "N/A" :
value.maxExpr.toSql())); // max
- row.add(String.valueOf(value.dataSize)); // data_size
- row.add(value.updatedTime); // updated_time
- row.add("N/A"); // update_rows
- row.add("N/A"); // trigger
- result.add(row);
- }
- return new ShowResultSet(getMetaData(), result);
- }
-
- public PartitionNames getPartitionNames() {
- return partitionNames;
- }
-
- public Set<String> getColumnNames() {
- if (columnNames != null) {
- return Sets.newHashSet(columnNames);
- }
- return table.getColumns().stream()
- .map(Column::getName).collect(Collectors.toSet());
- }
-
- public boolean isCached() {
- return cached;
- }
-
- public boolean isAllColumns() {
- return columnNames == null;
- }
-}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
index 6f1eff744fc..ee3fedcc72e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ShowExecutor.java
@@ -19,9 +19,7 @@ package org.apache.doris.qe;
import org.apache.doris.analysis.DiagnoseTabletStmt;
import org.apache.doris.analysis.HelpStmt;
-import org.apache.doris.analysis.PartitionNames;
import org.apache.doris.analysis.ShowAlterStmt;
-import org.apache.doris.analysis.ShowColumnStatsStmt;
import org.apache.doris.analysis.ShowCreateLoadStmt;
import org.apache.doris.analysis.ShowCreateMTMVStmt;
import org.apache.doris.analysis.ShowEnginesStmt;
@@ -56,7 +54,6 @@ import com.google.common.collect.Lists;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -91,8 +88,6 @@ public class ShowExecutor {
handleShowCreateLoad();
} else if (stmt instanceof ShowAlterStmt) {
handleShowAlter();
- } else if (stmt instanceof ShowColumnStatsStmt) {
- handleShowColumnStats();
} else if (stmt instanceof DiagnoseTabletStmt) {
handleAdminDiagnoseTablet();
} else if (stmt instanceof ShowIndexPolicyStmt) {
@@ -259,36 +254,6 @@ public class ShowExecutor {
resultSet = new ShowResultSet(showCreateLoadStmt.getMetaData(), rows);
}
- private void handleShowColumnStats() throws AnalysisException {
- ShowColumnStatsStmt showColumnStatsStmt = (ShowColumnStatsStmt) stmt;
- TableIf tableIf = showColumnStatsStmt.getTable();
- List<Pair<Pair<String, String>, ColumnStatistic>> columnStatistics =
new ArrayList<>();
- Set<String> columnNames = showColumnStatsStmt.getColumnNames();
- PartitionNames partitionNames =
showColumnStatsStmt.getPartitionNames();
- boolean showCache = showColumnStatsStmt.isCached();
- boolean isAllColumns = showColumnStatsStmt.isAllColumns();
- if (partitionNames != null) {
- List<String> partNames = partitionNames.getPartitionNames() == null
- ? new ArrayList<>(tableIf.getPartitionNames())
- : partitionNames.getPartitionNames();
- if (showCache) {
- resultSet =
showColumnStatsStmt.constructPartitionCachedColumnStats(
- getCachedPartitionColumnStats(columnNames, partNames,
tableIf), tableIf);
- } else {
- List<ResultRow> partitionColumnStats =
-
StatisticsRepository.queryColumnStatisticsByPartitions(tableIf, columnNames,
partNames);
- resultSet =
showColumnStatsStmt.constructPartitionResultSet(partitionColumnStats, tableIf);
- }
- } else {
- if (isAllColumns && !showCache) {
- getStatsForAllColumns(columnStatistics, tableIf);
- } else {
- getStatsForSpecifiedColumns(columnStatistics, columnNames,
tableIf, showCache);
- }
- resultSet =
showColumnStatsStmt.constructResultSet(columnStatistics);
- }
- }
-
private void getStatsForAllColumns(List<Pair<Pair<String, String>,
ColumnStatistic>> columnStatistics,
TableIf tableIf) {
List<ResultRow> resultRows =
StatisticsRepository.queryColumnStatisticsForTable(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
