Skip to content

[fix](table_options) fix potential NPE when quering table_options sys table #40944

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
morningman merged 1 commit into from
Sep 19, 2024
Merged

[fix](table_options) fix potential NPE when quering table_options sys table #40944

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
65 changes: 35 additions & 30 deletions fe/fe-core/src/main/java/org/apache/doris/tablefunction/MetadataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,40 +1089,45 @@ private static void tableOptionsForInternalCatalog(UserIdentity currentUserIdent
continue;
}
OlapTable olapTable = (OlapTable) table;
TRow trow = new TRow();
trow.addToColumnValue(new TCell().setStringVal(catalog.getName())); // TABLE_CATALOG
trow.addToColumnValue(new TCell().setStringVal(database.getFullName())); // TABLE_SCHEMA
trow.addToColumnValue(new TCell().setStringVal(table.getName())); // TABLE_NAME
trow.addToColumnValue(
new TCell().setStringVal(olapTable.getKeysType().toMetadata())); // TABLE_MODEL
trow.addToColumnValue(
new TCell().setStringVal(olapTable.getKeyColAsString())); // key columTypes

DistributionInfo distributionInfo = olapTable.getDefaultDistributionInfo();
if (distributionInfo.getType() == DistributionInfoType.HASH) {
HashDistributionInfo hashDistributionInfo = (HashDistributionInfo) distributionInfo;
List<Column> distributionColumns = hashDistributionInfo.getDistributionColumns();
StringBuilder distributeKey = new StringBuilder();
for (Column c : distributionColumns) {
if (distributeKey.length() != 0) {
distributeKey.append(",");
olapTable.readLock();
try {
TRow trow = new TRow();
trow.addToColumnValue(new TCell().setStringVal(catalog.getName())); // TABLE_CATALOG
trow.addToColumnValue(new TCell().setStringVal(database.getFullName())); // TABLE_SCHEMA
trow.addToColumnValue(new TCell().setStringVal(table.getName())); // TABLE_NAME
trow.addToColumnValue(
new TCell().setStringVal(olapTable.getKeysType().toMetadata())); // TABLE_MODEL
trow.addToColumnValue(
new TCell().setStringVal(olapTable.getKeyColAsString())); // key columTypes

DistributionInfo distributionInfo = olapTable.getDefaultDistributionInfo();
if (distributionInfo.getType() == DistributionInfoType.HASH) {
HashDistributionInfo hashDistributionInfo = (HashDistributionInfo) distributionInfo;
List<Column> distributionColumns = hashDistributionInfo.getDistributionColumns();
StringBuilder distributeKey = new StringBuilder();
for (Column c : distributionColumns) {
if (distributeKey.length() != 0) {
distributeKey.append(",");
}
distributeKey.append(c.getName());
}
distributeKey.append(c.getName());
}
if (distributeKey.length() == 0) {
trow.addToColumnValue(new TCell().setStringVal(""));
if (distributeKey.length() == 0) {
trow.addToColumnValue(new TCell().setStringVal(""));
} else {
trow.addToColumnValue(
new TCell().setStringVal(distributeKey.toString()));
}
trow.addToColumnValue(new TCell().setStringVal("HASH")); // DISTRIBUTE_TYPE
} else {
trow.addToColumnValue(
new TCell().setStringVal(distributeKey.toString()));
trow.addToColumnValue(new TCell().setStringVal("RANDOM")); // DISTRIBUTE_KEY
trow.addToColumnValue(new TCell().setStringVal("RANDOM")); // DISTRIBUTE_TYPE
}
trow.addToColumnValue(new TCell().setStringVal("HASH")); // DISTRIBUTE_TYPE
} else {
trow.addToColumnValue(new TCell().setStringVal("RANDOM")); // DISTRIBUTE_KEY
trow.addToColumnValue(new TCell().setStringVal("RANDOM")); // DISTRIBUTE_TYPE
trow.addToColumnValue(new TCell().setIntVal(distributionInfo.getBucketNum())); // BUCKETS_NUM
trow.addToColumnValue(new TCell().setIntVal(olapTable.getPartitionNum())); // PARTITION_NUM
dataBatch.add(trow);
} finally {
olapTable.readUnlock();
}
trow.addToColumnValue(new TCell().setIntVal(distributionInfo.getBucketNum())); // BUCKETS_NUM
trow.addToColumnValue(new TCell().setIntVal(olapTable.getPartitionNum())); // PARTITION_NUM
dataBatch.add(trow);
}
}

Expand Down