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

[regression test](broker load) add case for without filepath (#27658)

Browse Source
This commit is contained in:
Guangdong Liu
2023-12-07 10:15:37 +08:00
committed by GitHub
parent e3e78a79d7
commit 42b3dd35bb
6 changed files with 105 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/analysis/BrokerLoadStmt.java
View File

@ -88,7 +88,7 @@ public class BrokerLoadStmt extends InsertStmt {
String location = brokerDesc.getFileLocation(dataDescription.getFilePaths().get(i));
dataDescription.getFilePaths().set(i, location);
StorageBackend.checkPath(dataDescription.getFilePaths().get(i),
brokerDesc.getStorageType());
brokerDesc.getStorageType(), "DATA INFILE must be specified.");
dataDescription.getFilePaths().set(i, dataDescription.getFilePaths().get(i));
}
}

2
fe/fe-core/src/main/java/org/apache/doris/analysis/ExportStmt.java
View File

@ -178,7 +178,7 @@ public class ExportStmt extends StatementBase {
}
// check path is valid
StorageBackend.checkPath(path, brokerDesc.getStorageType());
StorageBackend.checkPath(path, brokerDesc.getStorageType(), null);
if (brokerDesc.getStorageType() == StorageBackend.StorageType.BROKER) {
BrokerMgr brokerMgr = analyzer.getEnv().getBrokerMgr();
if (!brokerMgr.containsBroker(brokerDesc.getName())) {

2
fe/fe-core/src/main/java/org/apache/doris/analysis/LoadStmt.java
View File

@ -434,7 +434,7 @@ public class LoadStmt extends DdlStmt {
String location = brokerDesc.getFileLocation(dataDescription.getFilePaths().get(i));
dataDescription.getFilePaths().set(i, location);
StorageBackend.checkPath(dataDescription.getFilePaths().get(i),
brokerDesc.getStorageType());
brokerDesc.getStorageType(), "DATA INFILE must be specified.");
dataDescription.getFilePaths().set(i, dataDescription.getFilePaths().get(i));
}
}

7
fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java
View File

@ -35,9 +35,10 @@ public class StorageBackend implements ParseNode {
private String location;
private StorageDesc storageDesc;
public static void checkPath(String path, StorageBackend.StorageType type) throws AnalysisException {
public static void checkPath(String path, StorageBackend.StorageType type, String exceptionMsg)
throws AnalysisException {
if (Strings.isNullOrEmpty(path)) {
throw new AnalysisException("No destination path specified.");
throw new AnalysisException(exceptionMsg == null ? "No destination path specified." : exceptionMsg);
}
checkUri(URI.create(path), type);
}
@ -120,7 +121,7 @@ public class StorageBackend implements ParseNode {
if (Strings.isNullOrEmpty(location)) {
throw new AnalysisException("You must specify a location on the repository");
}
checkPath(location, storageType);
checkPath(location, storageType, null);
}
@Override

2
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/ExportCommand.java
View File

@ -220,7 +220,7 @@ public class ExportCommand extends Command implements ForwardWithSync {
private void checkBrokerDesc(ConnectContext ctx) throws UserException {
// check path is valid
StorageBackend.checkPath(this.path, this.brokerDesc.get().getStorageType());
StorageBackend.checkPath(this.path, this.brokerDesc.get().getStorageType(), null);
if (brokerDesc.get().getStorageType() == StorageBackend.StorageType.BROKER) {
BrokerMgr brokerMgr = ctx.getEnv().getBrokerMgr();