From 4afee403877fc2e855d484eafdfc5c65a5fa0f18 Mon Sep 17 00:00:00 2001
From: Vallish Pai <vallishpai@gmail.com>
Date: Fri, 22 Nov 2024 09:55:18 +0530
Subject: [PATCH] [fix](drop sql) add force in the tosql for drop table and
 drop database (#43227)

1. What problem was fixed (it's best to include specific error reporting
information). How it was fixed.
2. Which behaviors were modified. What was the previous behavior, what
is it now, why was it modified, and what possible impacts might there
be.
3. What features were added. Why this function was added.
4. Which codes were refactored and why this part of the code was
refactored.
5. Which functions were optimized and what is the difference before and
after the optimization.
---
 .../java/org/apache/doris/analysis/DropDbStmt.java   |  3 +++
 .../org/apache/doris/analysis/DropTableStmt.java     |  3 +++
 .../org/apache/doris/analysis/DropDbStmtTest.java    | 12 +++++++++++-
 .../org/apache/doris/analysis/DropTableStmtTest.java |  5 +++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java
index 2715bd1f6da2f9..47fdfdce4e23c8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropDbStmt.java
@@ -88,6 +88,9 @@ public void analyze(Analyzer analyzer) throws UserException {
     public String toSql() {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("DROP DATABASE ").append("`").append(dbName).append("`");
+        if (forceDrop) {
+            stringBuilder.append(" FORCE");
+        }
         return stringBuilder.toString();
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropTableStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropTableStmt.java
index 5e06fce75ee074..d6a19e81f8e3f4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DropTableStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DropTableStmt.java
@@ -100,6 +100,9 @@ public void analyze(Analyzer analyzer) throws UserException {
     public String toSql() {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append("DROP TABLE ").append(tableName.toSql());
+        if (forceDrop) {
+            stringBuilder.append(" FORCE");
+        }
         return stringBuilder.toString();
     }
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java
index 67b44adc565534..f14f5113d8feea 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropDbStmtTest.java
@@ -45,7 +45,7 @@ public void setUp() {
 
     @Test
     public void testNormal() throws UserException, AnalysisException {
-        DropDbStmt stmt = new DropDbStmt(false, new DbName("test", "test"), true);
+        DropDbStmt stmt = new DropDbStmt(false, new DbName("test", "test"), false);
 
         stmt.analyze(analyzer);
         Assert.assertEquals("test", stmt.getCtlName());
@@ -53,6 +53,16 @@ public void testNormal() throws UserException, AnalysisException {
         Assert.assertEquals("DROP DATABASE `test`", stmt.toString());
     }
 
+    @Test
+    public void testForce() throws UserException, AnalysisException {
+        DropDbStmt stmt = new DropDbStmt(false, new DbName("test", "test"), true);
+
+        stmt.analyze(analyzer);
+        Assert.assertEquals("test", stmt.getCtlName());
+        Assert.assertEquals("test", stmt.getDbName());
+        Assert.assertEquals("DROP DATABASE `test` FORCE", stmt.toString());
+    }
+
     @Test(expected = AnalysisException.class)
     public void testFailed() throws UserException, AnalysisException {
         DropDbStmt stmt = new DropDbStmt(false, new DbName("", ""), true);
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java
index da6d5b8d4c44d0..437e54f58f20e6 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/DropTableStmtTest.java
@@ -72,12 +72,13 @@ public void testNormal() throws UserException, AnalysisException {
         stmt.analyze(analyzer);
         Assert.assertEquals("db1", stmt.getDbName());
         Assert.assertEquals("table1", stmt.getTableName());
-        Assert.assertEquals("DROP TABLE `db1`.`table1`", stmt.toString());
+        // one with force.
+        Assert.assertEquals("DROP TABLE `db1`.`table1` FORCE", stmt.toString());
     }
 
     @Test
     public void testDefaultNormal() throws UserException, AnalysisException {
-        DropTableStmt stmt = new DropTableStmt(false, noDbTbl, true);
+        DropTableStmt stmt = new DropTableStmt(false, noDbTbl, false);
         stmt.analyze(analyzer);
         Assert.assertEquals("testDb", stmt.getDbName());
         Assert.assertEquals("table1", stmt.getTableName());