This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 009bca96524e4f7a1e3d9201c01e33e28ed446a5
Author: Guangdong Liu <liug...@gmail.com>
AuthorDate: Mon Jan 29 21:58:31 2024 +0800

    [regression test](broker load) add partition load case (#28259)
---
 .../broker_load/broker_load_with_partition.csv     |   6 +
 .../test_broker_load_with_partition.out            |  10 ++
 .../test_broker_load_with_partition.groovy         | 122 +++++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git 
a/regression-test/data/load_p0/broker_load/broker_load_with_partition.csv 
b/regression-test/data/load_p0/broker_load/broker_load_with_partition.csv
new file mode 100644
index 00000000000..e665e0ae67d
--- /dev/null
+++ b/regression-test/data/load_p0/broker_load/broker_load_with_partition.csv
@@ -0,0 +1,6 @@
+11001,2023-09-01,1,1,10
+11001,2023-09-01,2,1,10
+11001,2023-09-01,1,2,10
+11001,2023-10-01,2,2,10
+11001,2023-10-01,1,3,10
+11001,2023-10-01,2,3,10
diff --git 
a/regression-test/data/load_p0/broker_load/test_broker_load_with_partition.out 
b/regression-test/data/load_p0/broker_load/test_broker_load_with_partition.out
new file mode 100644
index 00000000000..5015d98b3c9
--- /dev/null
+++ 
b/regression-test/data/load_p0/broker_load/test_broker_load_with_partition.out
@@ -0,0 +1,10 @@
+-- This file is automatically generated. You should know what you did if you 
want to edit this
+-- !select --
+1      \N      1       1       1
+11001  2023-10-01      1       3       10
+11001  2023-10-01      2       2       10
+11001  2023-10-01      2       3       10
+11001  2023-09-01      1       1       10
+11001  2023-09-01      1       2       10
+11001  2023-09-01      2       1       10
+
diff --git 
a/regression-test/suites/load_p0/broker_load/test_broker_load_with_partition.groovy
 
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_partition.groovy
new file mode 100644
index 00000000000..032b48baf60
--- /dev/null
+++ 
b/regression-test/suites/load_p0/broker_load/test_broker_load_with_partition.groovy
@@ -0,0 +1,122 @@
+// 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.
+
+suite("test_broker_load_with_partition", "load_p0") {
+    // define a sql table
+    def testTable = "tbl_test_broker_load_with_partition"
+
+    def create_test_table = {testTablex ->
+        def result1 = sql """
+            CREATE TABLE IF NOT EXISTS ${testTable} (
+                `k1` BIGINT NOT NULL,
+                `k2` DATE NULL,
+                `k3` INT(11) NOT NULL,
+                `k4` INT(11) NOT NULL,
+                `v5` BIGINT SUM NULL DEFAULT "0"
+            ) ENGINE=OLAP
+            AGGREGATE KEY(`k1`, `k2`, `k3`, `k4`)
+            COMMENT 'OLAP'
+            PARTITION BY RANGE(`k2`)
+            (
+                PARTITION `p202309` VALUES LESS THAN ("2023-10-01"),
+                PARTITION `p202310` VALUES LESS THAN ("2023-11-01")
+            )
+            DISTRIBUTED BY HASH(`k1`) BUCKETS 16
+            PROPERTIES (
+                "replication_allocation" = "tag.location.default: 1",
+                "storage_format" = "V2"
+            );
+            """
+
+        // DDL/DML return 1 row and 3 column, the only value is update row 
count
+        assertTrue(result1.size() == 1)
+        assertTrue(result1[0].size() == 1)
+        assertTrue(result1[0][0] == 0, "Create table should update 0 rows")
+
+        // insert 1 row to check whether the table is ok
+        def result2 = sql """ INSERT INTO ${testTable} VALUES
+                        (1,2023-09-01,1,1,1)
+                        """
+        assertTrue(result2.size() == 1)
+        assertTrue(result2[0].size() == 1)
+        assertTrue(result2[0][0] == 1, "Insert should update 1 rows")
+    }
+
+    def load_from_hdfs_partition = {testTablex, label, hdfsFilePath, format, 
brokerName, hdfsUser, hdfsPasswd ->
+        def result1= sql """
+                        LOAD LABEL ${label} (
+                            DATA INFILE("${hdfsFilePath}")
+                            INTO TABLE ${testTablex}
+                            PARTITION(`p202309`)
+                            COLUMNS TERMINATED BY ","
+                            FORMAT as "${format}"
+                        )
+                        with BROKER "${brokerName}" (
+                        "username"="${hdfsUser}",
+                        "password"="${hdfsPasswd}")
+                        PROPERTIES  (
+                        "timeout"="1200",
+                        "max_filter_ratio"="0.1");
+                        """
+
+        assertTrue(result1.size() == 1)
+        assertTrue(result1[0].size() == 1)
+        assertTrue(result1[0][0] == 0, "Query OK, 0 rows affected")
+    }
+
+    def check_load_result = {checklabel, testTablex ->
+        max_try_milli_secs = 10000
+        while(max_try_milli_secs) {
+            result = sql "show load where label = '${checklabel}'"
+            log.info("result: ${result}")
+            if(result[0][2] == "FINISHED") {
+                //sql "sync"
+                qt_select "select * from ${testTablex} order by k1"
+                break
+            } else {
+                sleep(1000) // wait 1 second every time
+                max_try_milli_secs -= 1000
+                if(max_try_milli_secs <= 0) {
+                    assertEquals(1, 2)
+                }
+            }
+        }
+    }
+
+    // if 'enableHdfs' in regression-conf.groovy has been set to true,
+    // the test will run these case as below.
+    if (enableHdfs()) {
+        brokerName = getBrokerName()
+        hdfsUser = getHdfsUser()
+        hdfsPasswd = getHdfsPasswd()
+        def hdfs_csv_file_path = uploadToHdfs 
"load_p0/broker_load/broker_load_with_partition.csv"
+        //def hdfs_csv_file_path = "hdfs://ip:port/testfile"
+
+        try {
+            sql "DROP TABLE IF EXISTS ${testTable}"
+            create_test_table.call(testTable)
+
+            def test_load_label = UUID.randomUUID().toString().replaceAll("-", 
"")
+            load_from_hdfs_partition.call(testTable, test_load_label, 
hdfs_csv_file_path, "csv",
+                                brokerName, hdfsUser, hdfsPasswd)
+
+            check_load_result.call(test_load_label, testTable)
+        } finally {
+            try_sql("DROP TABLE IF EXISTS ${testTable}")
+        }
+    }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to