database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[bugfix](hms)add default value check for hms catalog with dlf (#40336) (#40723)

Browse Source 
## Proposed changes

bp #40336
This commit is contained in:
wuwenchi
2024-09-12 19:19:47 +08:00
committed by GitHub
parent 3d2ac60bae
commit 23b21fcebf
3 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fe/fe-core/src/main/java/org/apache/doris/common/util/Util.java
View File

@ -629,7 +629,12 @@ public class Util {
String rootCause = "unknown";
Throwable p = t;
while (p != null) {
rootCause = p.getClass().getName() + ": " + p.getMessage();
String message = p.getMessage();
if (message == null) {
rootCause = p.getClass().getName();
} else {
rootCause = p.getClass().getName() + ": " + p.getMessage();
}
p = p.getCause();
}
return rootCause;

13
fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetadataOps.java
View File

@ -24,6 +24,7 @@ import org.apache.doris.analysis.DropDbStmt;
import org.apache.doris.analysis.DropTableStmt;
import org.apache.doris.analysis.HashDistributionDesc;
import org.apache.doris.analysis.PartitionDesc;
import org.apache.doris.catalog.Column;
import org.apache.doris.catalog.Env;
import org.apache.doris.catalog.JdbcResource;
import org.apache.doris.catalog.PartitionType;
@ -38,6 +39,7 @@ import org.apache.doris.datasource.ExternalDatabase;
import org.apache.doris.datasource.jdbc.client.JdbcClient;
import org.apache.doris.datasource.jdbc.client.JdbcClientConfig;
import org.apache.doris.datasource.operations.ExternalMetadataOps;
import org.apache.doris.datasource.property.constants.HMSProperties;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
@ -192,6 +194,15 @@ public class HiveMetadataOps implements ExternalMetadataOps {
}
}
Map<String, String> properties = catalog.getProperties();
if (properties.containsKey(HMSProperties.HIVE_METASTORE_TYPE)
&& properties.get(HMSProperties.HIVE_METASTORE_TYPE).equals(HMSProperties.DLF_TYPE)) {
for (Column column : stmt.getColumns()) {
if (column.hasDefaultValue()) {
throw new UserException("Default values are not supported with `DLF` catalog.");
}
}
}
String comment = stmt.getComment();
Optional<String> location = Optional.ofNullable(props.getOrDefault(LOCATION_URI_KEY, null));
HiveTableMetadata hiveTableMeta;
@ -285,7 +296,7 @@ public class HiveMetadataOps implements ExternalMetadataOps {
@Override
public boolean databaseExist(String dbName) {
return listDatabaseNames().contains(dbName);
return listDatabaseNames().contains(dbName.toLowerCase());
}
@Override