Skip to content

[fix](sys_table) fix potential NPE when query table_properties and partitions sys table #40972

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 2 commits into from
Sep 20, 2024
Merged

[fix](sys_table) fix potential NPE when query table_properties and partitions sys table #40972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10a7725
[fix](sys_table) fix potential NPE when query table_properties and pa…
Vallishp Sep 19, 2024
445b24d
Merge branch 'master' into systable_protect_olap
Vallishp Sep 19, 2024
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
134 changes: 73 additions & 61 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 @@ -1211,29 +1211,34 @@ private static void tablePropertiesForInternalCatalog(UserIdentity currentUserId
continue;
}
OlapTable olapTable = (OlapTable) table;
TableProperty property = olapTable.getTableProperty();
if (property == null) {
// if there is no properties, then write empty properties and check next 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("")); // PROPERTIES_NAME
trow.addToColumnValue(new TCell().setStringVal("")); // PROPERTIES_VALUE
dataBatch.add(trow);
continue;
}
olapTable.readLock();
try {
TableProperty property = olapTable.getTableProperty();
if (property == null) {
// if there is no properties, then write empty properties and check next 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("")); // PROPERTIES_NAME
trow.addToColumnValue(new TCell().setStringVal("")); // PROPERTIES_VALUE
dataBatch.add(trow);
continue;
}

Map<String, String> propertiesMap = property.getProperties();
propertiesMap.forEach((key, value) -> {
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(key)); // PROPERTIES_NAME
trow.addToColumnValue(new TCell().setStringVal(value)); // PROPERTIES_VALUE
dataBatch.add(trow);
});
Map<String, String> propertiesMap = property.getProperties();
propertiesMap.forEach((key, value) -> {
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(key)); // PROPERTIES_NAME
trow.addToColumnValue(new TCell().setStringVal(value)); // PROPERTIES_VALUE
dataBatch.add(trow);
});
} finally {
olapTable.readUnlock();
}
} // for table
}

Expand Down Expand Up @@ -1341,49 +1346,56 @@ private static void partitionsForInternalCatalog(UserIdentity currentUserIdentit
}

OlapTable olapTable = (OlapTable) table;
Collection<Partition> allPartitions = olapTable.getAllPartitions();
olapTable.readLock();
try {
Collection<Partition> allPartitions = olapTable.getAllPartitions();

for (Partition partition : allPartitions) {
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(partition.getName())); // PARTITION_NAME
trow.addToColumnValue(new TCell().setStringVal("NULL")); // SUBPARTITION_NAME (always null)

trow.addToColumnValue(new TCell().setIntVal(0)); //PARTITION_ORDINAL_POSITION (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //SUBPARTITION_ORDINAL_POSITION (not available)
trow.addToColumnValue(new TCell().setStringVal(
olapTable.getPartitionInfo().getType().toString())); // PARTITION_METHOD
trow.addToColumnValue(new TCell().setStringVal("NULL")); // SUBPARTITION_METHOD(always null)
PartitionItem item = olapTable.getPartitionInfo().getItem(partition.getId());
if ((olapTable.getPartitionInfo().getType() == PartitionType.UNPARTITIONED) || (item == null)) {
trow.addToColumnValue(new TCell().setStringVal("NULL")); // if unpartitioned, its null
trow.addToColumnValue(new TCell().setStringVal("NULL")); // SUBPARTITION_EXPRESSION (always null)
trow.addToColumnValue(new TCell().setStringVal("NULL")); // PARITION DESC, its null
} else {
for (Partition partition : allPartitions) {
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(partition.getName())); // PARTITION_NAME
trow.addToColumnValue(new TCell().setStringVal("NULL")); // SUBPARTITION_NAME (always null)

trow.addToColumnValue(new TCell().setIntVal(0)); //PARTITION_ORDINAL_POSITION (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //SUBPARTITION_ORDINAL_POSITION (not available)
trow.addToColumnValue(new TCell().setStringVal(
olapTable.getPartitionInfo()
.getDisplayPartitionColumns().toString())); // PARTITION_EXPRESSION
trow.addToColumnValue(new TCell().setStringVal("NULL")); // SUBPARTITION_EXPRESSION (always null)
olapTable.getPartitionInfo().getType().toString())); // PARTITION_METHOD
trow.addToColumnValue(new TCell().setStringVal("NULL")); // SUBPARTITION_METHOD(always null)
PartitionItem item = olapTable.getPartitionInfo().getItem(partition.getId());
if ((olapTable.getPartitionInfo().getType() == PartitionType.UNPARTITIONED) || (item == null)) {
trow.addToColumnValue(new TCell().setStringVal("NULL")); // if unpartitioned, its null
trow.addToColumnValue(
new TCell().setStringVal("NULL")); // SUBPARTITION_EXPRESSION (always null)
trow.addToColumnValue(new TCell().setStringVal("NULL")); // PARITION DESC, its null
} else {
trow.addToColumnValue(new TCell().setStringVal(
olapTable.getPartitionInfo()
.getDisplayPartitionColumns().toString())); // PARTITION_EXPRESSION
trow.addToColumnValue(
new TCell().setStringVal("NULL")); // SUBPARTITION_EXPRESSION (always null)
trow.addToColumnValue(new TCell().setStringVal(
item.getItemsSql())); // PARITION DESC
}
trow.addToColumnValue(new TCell().setLongVal(partition.getRowCount())); //TABLE_ROWS (PARTITION row)
trow.addToColumnValue(new TCell().setLongVal(partition.getAvgRowLength())); //AVG_ROW_LENGTH
trow.addToColumnValue(new TCell().setLongVal(partition.getDataLength())); //DATA_LENGTH
trow.addToColumnValue(new TCell().setIntVal(0)); //MAX_DATA_LENGTH (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //INDEX_LENGTH (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //DATA_FREE (not available)
trow.addToColumnValue(new TCell().setStringVal("NULL")); //CREATE_TIME (not available)
trow.addToColumnValue(new TCell().setStringVal(
item.getItemsSql())); // PARITION DESC
TimeUtils.longToTimeString(partition.getVisibleVersionTime()))); //UPDATE_TIME
trow.addToColumnValue(new TCell().setStringVal("NULL")); // CHECK_TIME (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //CHECKSUM (not available)
trow.addToColumnValue(new TCell().setStringVal("")); // PARTITION_COMMENT (not available)
trow.addToColumnValue(new TCell().setStringVal("")); // NODEGROUP (not available)
trow.addToColumnValue(new TCell().setStringVal("")); // TABLESPACE_NAME (not available)
dataBatch.add(trow);
}
trow.addToColumnValue(new TCell().setLongVal(partition.getRowCount())); //TABLE_ROWS (PARTITION row)
trow.addToColumnValue(new TCell().setLongVal(partition.getAvgRowLength())); //AVG_ROW_LENGTH
trow.addToColumnValue(new TCell().setLongVal(partition.getDataLength())); //DATA_LENGTH
trow.addToColumnValue(new TCell().setIntVal(0)); //MAX_DATA_LENGTH (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //INDEX_LENGTH (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //DATA_FREE (not available)
trow.addToColumnValue(new TCell().setStringVal("NULL")); //CREATE_TIME (not available)
trow.addToColumnValue(new TCell().setStringVal(
TimeUtils.longToTimeString(partition.getVisibleVersionTime()))); //UPDATE_TIME
trow.addToColumnValue(new TCell().setStringVal("NULL")); // CHECK_TIME (not available)
trow.addToColumnValue(new TCell().setIntVal(0)); //CHECKSUM (not available)
trow.addToColumnValue(new TCell().setStringVal("")); // PARTITION_COMMENT (not available)
trow.addToColumnValue(new TCell().setStringVal("")); // NODEGROUP (not available)
trow.addToColumnValue(new TCell().setStringVal("")); // TABLESPACE_NAME (not available)
dataBatch.add(trow);
} finally {
olapTable.readUnlock();
}
} // for table
}
Expand Down