This is an automated email from the ASF dual-hosted git repository.
starocean999 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5ca18a42abc [Chore](nereids) Remove DropFileStmt (#53346)
5ca18a42abc is described below
commit 5ca18a42abc6063b3ce3f9a82510c5a2f1923d3a
Author: csding <[email protected]>
AuthorDate: Wed Jul 16 16:24:48 2025 +0800
[Chore](nereids) Remove DropFileStmt (#53346)
---
fe/fe-core/src/main/cup/sql_parser.cup | 4 -
.../org/apache/doris/analysis/DropFileStmt.java | 117 ---------------------
.../org/apache/doris/common/util/SmallFileMgr.java | 7 --
.../main/java/org/apache/doris/qe/DdlExecutor.java | 3 -
4 files changed, 131 deletions(-)
diff --git a/fe/fe-core/src/main/cup/sql_parser.cup
b/fe/fe-core/src/main/cup/sql_parser.cup
index b3ee4f4099c..7b2c7fbe219 100644
--- a/fe/fe-core/src/main/cup/sql_parser.cup
+++ b/fe/fe-core/src/main/cup/sql_parser.cup
@@ -2690,10 +2690,6 @@ drop_stmt ::=
{:
RESULT = new DropRoleStmt(ifExists, role);
:}
- | KW_DROP KW_FILE STRING_LITERAL:fileName opt_db:dbName KW_PROPERTIES
LPAREN key_value_map:properties RPAREN
- {:
- RESULT = new DropFileStmt(fileName, dbName, properties);
- :}
| KW_DROP KW_INDEX opt_if_exists:ifExists ident:indexName KW_ON
table_name:tableName
{:
RESULT = new AlterTableStmt(tableName, Lists.newArrayList(new
DropIndexClause(indexName, ifExists, tableName, false)));
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropFileStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropFileStmt.java
deleted file mode 100644
index 94bdaf463e1..00000000000
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropFileStmt.java
+++ /dev/null
@@ -1,117 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-package org.apache.doris.analysis;
-
-import org.apache.doris.catalog.Env;
-import org.apache.doris.common.AnalysisException;
-import org.apache.doris.common.ErrorCode;
-import org.apache.doris.common.ErrorReport;
-import org.apache.doris.common.UserException;
-import org.apache.doris.common.util.PrintableMap;
-import org.apache.doris.mysql.privilege.PrivPredicate;
-import org.apache.doris.qe.ConnectContext;
-
-import com.google.common.base.Strings;
-
-import java.util.Map;
-import java.util.Optional;
-
-public class DropFileStmt extends DdlStmt implements NotFallbackInParser {
- public static final String PROP_CATALOG = "catalog";
-
- private String fileName;
- private String dbName;
- private Map<String, String> properties;
-
- private String catalogName;
-
- public DropFileStmt(String fileName, String dbName, Map<String, String>
properties) {
- this.fileName = fileName;
- this.dbName = dbName;
- this.properties = properties;
- }
-
- public String getFileName() {
- return fileName;
- }
-
- public String getDbName() {
- return dbName;
- }
-
- public String getCatalogName() {
- return catalogName;
- }
-
- @Override
- public void analyze(Analyzer analyzer) throws AnalysisException,
UserException {
- super.analyze(analyzer);
-
- // check operation privilege
- if
(!Env.getCurrentEnv().getAccessManager().checkGlobalPriv(ConnectContext.get(),
PrivPredicate.ADMIN)) {
-
ErrorReport.reportAnalysisException(ErrorCode.ERR_SPECIFIC_ACCESS_DENIED_ERROR,
"ADMIN");
- }
-
- if (dbName == null) {
- dbName = analyzer.getDefaultDb();
- }
-
- if (Strings.isNullOrEmpty(dbName)) {
- ErrorReport.reportAnalysisException(ErrorCode.ERR_NO_DB_ERROR);
- }
-
- if (Strings.isNullOrEmpty(fileName)) {
- throw new AnalysisException("File name is not specified");
- }
-
- Optional<String> optional = properties.keySet().stream().filter(
- entity -> !PROP_CATALOG.equals(entity)).findFirst();
- if (optional.isPresent()) {
- throw new AnalysisException(optional.get() + " is invalid
property");
- }
-
- catalogName = properties.get(PROP_CATALOG);
- if (Strings.isNullOrEmpty(catalogName)) {
- throw new AnalysisException("catalog name is missing");
- }
- }
-
- @Override
- public String toSql() {
- StringBuilder sb = new StringBuilder();
- sb.append("DROP FILE \"").append(fileName).append("\"");
- if (dbName != null) {
- sb.append(" FROM ").append(dbName);
- }
-
- sb.append(" PROPERTIES(");
- PrintableMap<String, String> map = new PrintableMap<>(properties, ",",
true, false);
- sb.append(map.toString());
- return sb.toString();
- }
-
- @Override
- public RedirectStatus getRedirectStatus() {
- return RedirectStatus.FORWARD_WITH_SYNC;
- }
-
- @Override
- public StmtType stmtType() {
- return StmtType.DROP;
- }
-}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java
index 53cd3ad208f..4347003d000 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/util/SmallFileMgr.java
@@ -17,7 +17,6 @@
package org.apache.doris.common.util;
-import org.apache.doris.analysis.DropFileStmt;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
import org.apache.doris.cloud.security.SecurityChecker;
@@ -157,12 +156,6 @@ public class SmallFileMgr {
downloadAndAddFile(db.getId(), catalog, fileName, downloadUrl, md5sum,
saveContent);
}
- public void dropFile(DropFileStmt stmt) throws DdlException {
- String dbName = stmt.getDbName();
- Database db =
Env.getCurrentInternalCatalog().getDbOrDdlException(dbName);
- removeFile(db.getId(), stmt.getCatalogName(), stmt.getFileName(),
false);
- }
-
private void downloadAndAddFile(long dbId, String catalog, String
fileName, String downloadUrl, String md5sum,
boolean saveContent) throws DdlException {
synchronized (files) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
index ebb489e6ebe..adc3e8506e1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/DdlExecutor.java
@@ -54,7 +54,6 @@ import org.apache.doris.analysis.DdlStmt;
import org.apache.doris.analysis.DropCatalogStmt;
import org.apache.doris.analysis.DropDbStmt;
import org.apache.doris.analysis.DropEncryptKeyStmt;
-import org.apache.doris.analysis.DropFileStmt;
import org.apache.doris.analysis.DropFunctionStmt;
import org.apache.doris.analysis.DropIndexPolicyStmt;
import org.apache.doris.analysis.DropRepositoryStmt;
@@ -199,8 +198,6 @@ public class DdlExecutor {
env.getBackupHandler().dropRepository((DropRepositoryStmt)
ddlStmt);
} else if (ddlStmt instanceof SyncStmt) {
return;
- } else if (ddlStmt instanceof DropFileStmt) {
- env.getSmallFileMgr().dropFile((DropFileStmt) ddlStmt);
} else if (ddlStmt instanceof InstallPluginStmt) {
env.installPlugin((InstallPluginStmt) ddlStmt);
} else if (ddlStmt instanceof UninstallPluginStmt) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
