Skip to content

[fix](array) disable ALTER TABLE add ARRAY column into AGG table #52567

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

Merged
lide-reed merged 1 commit into from
Jul 1, 2025
Merged

[fix](array) disable ALTER TABLE add ARRAY column into AGG table #52567

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: 2 additions & 4 deletions fe/fe-common/src/main/java/org/apache/doris/common/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,15 +1386,13 @@ public class Config extends ConfigBase {
/**
* Set the maximum number of rows that can be cached
*/
@ConfField(mutable = true, masterOnly = false, description = {"SQL/Partition Cache可以缓存的最大行数。",
"Maximum number of rows that can be cached in SQL/Partition Cache, is 3000 by default."})
Copy link
Member

@xy720 xy720 Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why change here?

Copy link
Contributor Author

@cambyzju cambyzju Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.2 do no have ConfField.description now

@ConfField(mutable = true, masterOnly = false)
public static int cache_result_max_row_count = 3000;

/**
* Set the maximum data size that can be cached
*/
@ConfField(mutable = true, masterOnly = false, description = {"SQL/Partition Cache可以缓存的最大数据大小。",
"Maximum data size of rows that can be cached in SQL/Partition Cache, is 3000 by default."})
@ConfField(mutable = true, masterOnly = false)
public static int cache_result_max_data_size = 31457280; // 30M

/**
Expand Down
13 changes: 10 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/AddColumnClause.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,15 @@ public void analyze(Analyzer analyzer) throws AnalysisException, DdlException {
if (columnDef == null) {
throw new AnalysisException("No column definition in add column clause.");
}
boolean isAggKey = false;
if (tableName != null) {
Table table = Env.getCurrentInternalCatalog().getDbOrDdlException(tableName.getDb())
.getTableOrDdlException(tableName.getTbl());
if (table instanceof OlapTable && ((OlapTable) table).getKeysType() == KeysType.AGG_KEYS
&& columnDef.getAggregateType() == null) {
columnDef.setIsKey(true);
if (table instanceof OlapTable && ((OlapTable) table).getKeysType() == KeysType.AGG_KEYS) {
isAggKey = true;
if (columnDef.getAggregateType() == null) {
columnDef.setIsKey(true);
}
}
}
columnDef.analyze(true);
Expand All @@ -94,6 +97,10 @@ public void analyze(Analyzer analyzer) throws AnalysisException, DdlException {
throw new AnalysisException("Cannot add value column[" + columnDef.getName() + "] at first");
}

if (isAggKey && columnDef.getType().isArrayType()) {
throw new AnalysisException("Array column can't be used in aggregate table");
}

if (Strings.isNullOrEmpty(rollupName)) {
rollupName = null;
}
Expand Down
Loading