Skip to content

[fix](vault) fix UnsupportedOperationException if no use_path_style in CreateStorageVaultStmt #50615

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
gavinchou merged 5 commits into from
May 7, 2025
Merged

[fix](vault) fix UnsupportedOperationException if no use_path_style in CreateStorageVaultStmt #50615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
03b9b5f
[fix](vault) fix UnsupportedOperationException if no `use_path_style`…
yagagagaga May 6, 2025
0bb4b38
update
yagagagaga May 6, 2025
c24c5cc
update
yagagagaga May 6, 2025
e5b5576
update
yagagagaga May 6, 2025
47bf13d
add case
yagagagaga May 6, 2025
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
11 changes: 10 additions & 1 deletion fe/fe-core/src/main/java/org/apache/doris/analysis/CreateStorageVaultStmt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.doris.common.FeNameFormat;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.PrintableMap;
import org.apache.doris.datasource.property.PropertyConverter;
import org.apache.doris.mysql.privilege.PrivPredicate;
import org.apache.doris.qe.ConnectContext;

Expand All @@ -46,7 +47,7 @@ public class CreateStorageVaultStmt extends DdlStmt implements NotFallbackInPars

private final boolean ifNotExists;
private final String vaultName;
private final ImmutableMap<String, String> properties;
private ImmutableMap<String, String> properties;
private boolean setAsDefault;
private int pathVersion = 0;
private int numShard = 0;
Expand Down Expand Up @@ -145,6 +146,14 @@ public void analyze(Analyzer analyzer) throws UserException {
}
setAsDefault = Boolean.parseBoolean(properties.getOrDefault(SET_AS_DEFAULT, "false"));
setStorageVaultType(StorageVault.StorageVaultType.fromString(type));

if (vaultType == StorageVault.StorageVaultType.S3
&& !properties.containsKey(PropertyConverter.USE_PATH_STYLE)) {
properties = ImmutableMap.<String, String>builder()
.putAll(properties)
.put(PropertyConverter.USE_PATH_STYLE, "true")
.build();
}
}

@Override
Expand Down
5 changes: 0 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/StorageVault.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.doris.cloud.proto.Cloud;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.UserException;
import org.apache.doris.datasource.property.PropertyConverter;
import org.apache.doris.qe.ShowResultSetMetaData;

import com.google.common.base.Preconditions;
Expand Down Expand Up @@ -147,10 +146,6 @@ public void setId(String id) {
vault.modifyProperties(stmt.getProperties());
break;
case S3:
if (!stmt.getProperties().containsKey(PropertyConverter.USE_PATH_STYLE)) {
stmt.getProperties().put(PropertyConverter.USE_PATH_STYLE, "true");
}

CreateResourceStmt resourceStmt =
new CreateResourceStmt(false, ifNotExists, name, stmt.getProperties());
resourceStmt.analyzeResourceType();
Expand Down
15 changes: 15 additions & 0 deletions regression-test/suites/vault_p0/create/test_create_vault.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,21 @@ suite("test_create_vault", "nonConcurrent") {
);
"""

sql """
CREATE STORAGE VAULT IF NOT EXISTS ${s3VaultName}
PROPERTIES (
"type"="S3",
"s3.endpoint"="${getS3Endpoint()}",
"s3.region" = "${getS3Region()}",
"s3.access_key" = "${getS3AK()}",
"s3.secret_key" = "${getS3SK()}",
"s3.root.path" = "${s3VaultName}",
"s3.bucket" = "${getS3BucketName()}",
"s3.external_endpoint" = "",
"provider" = "${getS3Provider()}"
);
"""

sql """
CREATE TABLE ${s3VaultName} (
C_CUSTKEY INTEGER NOT NULL,
Expand Down