update

apache · Sep 30, 2024 · 0bb8654 · 0bb8654
1 parent 4a58a0d
commit 0bb8654
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 43 deletions.
diff --git a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4 b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisLexer.g4
@@ -518,7 +518,6 @@ TABLET: 'TABLET';
 TABLETS: 'TABLETS';
 TASK: 'TASK';
 TASKS: 'TASKS';
-TEMP: 'TEMP';
 TEMPORARY: 'TEMPORARY';
 TERMINATED: 'TERMINATED';
 TEXT: 'TEXT';

diff --git a/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4 b/fe/fe-core/src/main/antlr4/org/apache/doris/nereids/DorisParser.g4
@@ -174,7 +174,7 @@ supportedCreateStatement
     | CREATE (EXTERNAL)? TABLE (IF NOT EXISTS)? name=multipartIdentifier
         LIKE existedTable=multipartIdentifier
         (WITH ROLLUP (rollupNames=identifierList)?)?                      #createTableLike
-    | CREATE (TEMP | TEMPORARY)? TABLE (IF NOT EXISTS)? name=multipartIdentifier
+    | CREATE (TEMPORARY)? TABLE (IF NOT EXISTS)? name=multipartIdentifier
         LIKE existedTable=multipartIdentifier
         (WITH ROLLUP (rollupNames=identifierList)?)?                      #createTableLike
     | CREATE ROW POLICY (IF NOT EXISTS)? name=identifier

diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeTblStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeTblStmt.java
@@ -137,7 +137,6 @@ public void analyze(Analyzer analyzer) throws UserException {
         DatabaseIf db = catalog.getDbOrAnalysisException(dbName);
         dbId = db.getId();
         table = db.getTableOrAnalysisException(tblName);
-
         isAllColumns = columnNames == null;
         check();
     }
@@ -146,9 +145,6 @@ public void check() throws AnalysisException {
         if (table instanceof View) {
             throw new AnalysisException("Analyze view is not allowed");
         }
-        //if (table.getType() == TableType.TEMP) {
-        //    throw new AnalysisException("Analyze temporary table is not supported");
-        //}
         checkAnalyzePriv(tableName.getCtl(), tableName.getDb(), tableName.getTbl());
         if (columnNames == null) {
             columnNames = table.getSchemaAllIndexes(false).stream()

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -839,7 +839,7 @@ public void cleanPhantomTempTable() {
                 getInternalCatalog().dropTableWithoutCheck(getInternalCatalog().getDb(table.getDBName()).get(),
                         table, true);
             } catch (DdlException e) {
-                LOG.error("drop temp table error: db: {}, table: {}", table.getDBName(), table.getName(), e);
+                LOG.error("drop temporary table error: db: {}, table: {}", table.getDBName(), table.getName(), e);
             }
         }
         phantomTempTableList.clear();

diff --git a/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java b/fe/fe-core/src/main/java/org/apache/doris/load/routineload/RoutineLoadJob.java
@@ -31,6 +31,7 @@
 import org.apache.doris.catalog.Env;
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.Table;
+import org.apache.doris.catalog.TableIf.TableType;
 import org.apache.doris.cloud.qe.ComputeGroupException;
 import org.apache.doris.cloud.system.CloudSystemInfoService;
 import org.apache.doris.common.AnalysisException;
@@ -48,6 +49,7 @@
 import org.apache.doris.common.util.LogKey;
 import org.apache.doris.common.util.SqlParserUtils;
 import org.apache.doris.common.util.TimeUtils;
+import org.apache.doris.common.util.Util;
 import org.apache.doris.load.RoutineLoadDesc;
 import org.apache.doris.load.loadv2.LoadTask;
 import org.apache.doris.load.routineload.kafka.KafkaConfiguration;
@@ -1351,6 +1353,10 @@ protected static void checkMeta(OlapTable olapTable, RoutineLoadDesc routineLoad
             return;
         }
 
+        if (olapTable.getType() == TableType.TEMP) {
+            throw new DdlException("Cannot create routine load for temporary table "
+                + Util.getTempTableOuterName(olapTable.getName()));
+        }
         // check partitions
         olapTable.readLock();
         try {

diff --git a/fe/fe-core/src/main/java/org/apache/doris/policy/PolicyMgr.java b/fe/fe-core/src/main/java/org/apache/doris/policy/PolicyMgr.java
@@ -29,12 +29,14 @@
 import org.apache.doris.catalog.OlapTable;
 import org.apache.doris.catalog.PartitionInfo;
 import org.apache.doris.catalog.Table;
+import org.apache.doris.catalog.TableIf.TableType;
 import org.apache.doris.cluster.ClusterNamespace;
 import org.apache.doris.common.AnalysisException;
 import org.apache.doris.common.DdlException;
 import org.apache.doris.common.UserException;
 import org.apache.doris.common.io.Text;
 import org.apache.doris.common.io.Writable;
+import org.apache.doris.common.util.Util;
 import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.persist.gson.GsonUtils;
 import org.apache.doris.qe.ShowResultSet;
@@ -183,12 +185,16 @@ public void dropPolicy(DropPolicyStmt stmt) throws DdlException, AnalysisExcepti
                 for (Table table : tables) {
                     if (table instanceof OlapTable) {
                         OlapTable olapTable = (OlapTable) table;
+                        String tableName = table.getName();
+                        if (table.getType() == TableType.TEMP) {
+                            tableName = Util.getTempTableOuterName(tableName);
+                        }
                         PartitionInfo partitionInfo = olapTable.getPartitionInfo();
                         for (Long partitionId : olapTable.getPartitionIds()) {
                             String policyName = partitionInfo.getDataProperty(partitionId).getStoragePolicy();
                             if (policyName.equals(dropPolicyLog.getPolicyName())) {
                                 throw new DdlException("the policy " + policyName + " is used by table: "
-                                    + table.getName());
+                                    + tableName);
                             }
                         }
                     }

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -894,7 +894,7 @@ protected void deleteTempTable() {
                     Env.getCurrentEnv().getInternalCatalog()
                         .dropTableWithoutCheck(db, db.getTable(tableName).get(), true);
                 } catch (DdlException e) {
-                    LOG.error("drop temp table error: db: {}, table: {}", dbName, tableName, e);
+                    LOG.error("drop temporary table error: db: {}, table: {}", dbName, tableName, e);
                 }
             }
         }

diff --git a/regression-test/data/nereids_p0/cte/test_cte_filter_pushdown.out b/regression-test/data/nereids_p0/cte/test_cte_filter_pushdown.out
@@ -8,7 +8,7 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
 ----------PhysicalOlapScan[test]
 --PhysicalResultSink
 ----hashJoin[INNER_JOIN] hashCondition=((m1.k1 = m2.k1)) otherCondition=()
-------filter((temp1.k1 = 1))
+------filter((temp.k1 = 1))
 --------PhysicalCteConsumer ( cteId=CTEId#0 )
 ------filter((m2.k1 = 1))
 --------PhysicalCteConsumer ( cteId=CTEId#0 )
@@ -22,7 +22,7 @@ PhysicalCteAnchor ( cteId=CTEId#0 )
 ----------PhysicalOlapScan[test]
 --PhysicalResultSink
 ----hashJoin[INNER_JOIN] hashCondition=((m1.k1 = m2.k1)) otherCondition=()
-------filter((temp1.k1 = 1))
+------filter((temp.k1 = 1))
 --------PhysicalCteConsumer ( cteId=CTEId#0 )
 ------filter((m2.k1 = 1))
 --------PhysicalCteConsumer ( cteId=CTEId#0 )

diff --git a/regression-test/suites/cloud_p1/schema_change/ddl/date_load.sql b/regression-test/suites/cloud_p1/schema_change/ddl/date_load.sql
@@ -2,5 +2,5 @@ LOAD LABEL ${loadLabel} (
     DATA INFILE("s3://${s3BucketName}/regression/ssb/sf100/date.tbl.gz")
     INTO TABLE date
     COLUMNS TERMINATED BY "|"
-    (d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,temp1)
+    (d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,temp)
 )
diff --git a/...on-test/suites/cold_heat_separation/empty_table_use_policy/create_table_use_policy.groovy b/...on-test/suites/cold_heat_separation/empty_table_use_policy/create_table_use_policy.groovy
@@ -111,6 +111,9 @@ suite("create_table_use_policy") {
     // storage policy is disabled on mow table
     assertEquals(create_temp_table_use_created_policy.size(), 1);
 
+    sql """
+    DROP TABLE IF EXISTS create_temp_table_use_created_policy
+    """
     sql """
     DROP TABLE IF EXISTS create_table_use_created_policy
     """

diff --git a/...ession-test/suites/load_p0/broker_load/test_domain_connection_and_ak_sk_correction.groovy b/...ession-test/suites/load_p0/broker_load/test_domain_connection_and_ak_sk_correction.groovy
@@ -111,8 +111,7 @@ suite("test_domain_connection_and_ak_sk_correction",  "load_p0") {
                 DATA INFILE("s3://${getS3BucketName()}/regression/tpch/sf1/part.tbl")
                 INTO TABLE ${tableName}
                 COLUMNS TERMINATED BY "|"
-                (p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment, temp
-)
+                (p_partkey, p_name, p_mfgr, p_brand, p_type, p_size, p_container, p_retailprice, p_comment, temp)
             )
             WITH S3
             (

diff --git a/regression-test/suites/ssb_sf100_p2/ddl/date_load.sql b/regression-test/suites/ssb_sf100_p2/ddl/date_load.sql
@@ -2,5 +2,5 @@ LOAD LABEL ${loadLabel} (
     DATA INFILE("s3://${s3BucketName}/regression/ssb/sf100/date.tbl.gz")
     INTO TABLE date
     COLUMNS TERMINATED BY "|"
-    (d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,temp1)
+    (d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,temp)
 )
diff --git a/regression-test/suites/table_p0/test_temp_table.groovy b/regression-test/suites/table_p0/test_temp_table.groovy
@@ -321,33 +321,6 @@ suite("test_temp_table") {
     select_result3 = sql "select * from t_test_temp_table2"
     assertEquals(select_result3.size(), 0)
 
-    // test stream load
-    streamLoad {
-        table 't_test_temp_table2'
-        set 'column_separator', ','
-        file 'temp_table_data.csv'
-    }
-    sql "sync"
-    select_result3 = sql "select * from t_test_temp_table2"
-    assertEquals(select_result3.size(), 3)
-
-    // truncate
-    sql "truncate table t_test_temp_table2"
-    select_result3 = sql "select * from t_test_temp_table2"
-    assertEquals(select_result3.size(), 0)
-
-    // test mysql load
-    def filepath = getLoalFilePath "temp_table_data.csv"
-    sql """
-        LOAD DATA LOCAL
-        INFILE '${filepath}'
-        INTO TABLE t_test_temp_table2
-        COLUMNS TERMINATED BY ','
-        """
-    sql "sync"
-    select_result3 = sql "select * from t_test_temp_table2"
-    assertEquals(select_result3.size(), 3)
-
     // alter
     try {
         sql "alter table t_test_temp_table2 rename t_test_temp_table2_new"

diff --git a/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/ddl/date_load.sql b/regression-test/suites/unique_with_mow_p2/ssb_unique_load_zstd/ddl/date_load.sql
@@ -2,5 +2,5 @@ LOAD LABEL ${loadLabel} (
     DATA INFILE("s3://${s3BucketName}/regression/ssb/sf100/date.tbl.gz")
     INTO TABLE date
     COLUMNS TERMINATED BY "|"
-    (d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,temp1)
+    (d_datekey,d_date,d_dayofweek,d_month,d_year,d_yearmonthnum,d_yearmonth, d_daynuminweek,d_daynuminmonth,d_daynuminyear,d_monthnuminyear,d_weeknuminyear, d_sellingseason,d_lastdayinweekfl,d_lastdayinmonthfl,d_holidayfl,d_weekdayfl,temp)
 )