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
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 6c9167d9d93 branch-2.1: [test](doc) add job-scheduler example in
doris's doc to regression test #42904 (#45968)
6c9167d9d93 is described below
commit 6c9167d9d9355b11525377a2ec54b2245ebd7ea8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Mon Dec 30 10:44:58 2024 +0800
branch-2.1: [test](doc) add job-scheduler example in doris's doc to
regression test #42904 (#45968)
Cherry-picked from #42904
Co-authored-by: yagagagaga <zhangmi...@selectdb.com>
---
.../jdbc/test_jdbc_catalog_ddl.out | 20 ----
.../org/apache/doris/regression/suite/Suite.groovy | 5 +
.../data-operate/scheduler/job-scheduler.md.groovy | 133 +++++++++++++++++++++
.../jdbc/test_jdbc_catalog_ddl.groovy | 6 +-
4 files changed, 143 insertions(+), 21 deletions(-)
diff --git
a/regression-test/data/external_table_p0/jdbc/test_jdbc_catalog_ddl.out
b/regression-test/data/external_table_p0/jdbc/test_jdbc_catalog_ddl.out
index 9629269ea3c..3d654597cf3 100644
--- a/regression-test/data/external_table_p0/jdbc/test_jdbc_catalog_ddl.out
+++ b/regression-test/data/external_table_p0/jdbc/test_jdbc_catalog_ddl.out
@@ -1,27 +1,7 @@
-- This file is automatically generated. You should know what you did if you
want to edit this
--- !show_db --
-DORIS
-Doris
-doris
-doris_test
-information_schema
-init_db
-mysql
-show_test_do_not_modify
-
-- !sql01 --
12345
--- !show_db --
-DORIS
-Doris
-doris
-doris_test
-information_schema
-init_db
-mysql
-show_test_do_not_modify
-
-- !sql01 --
12345
diff --git
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
index e9367e2bcc8..60953b84916 100644
---
a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
+++
b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Suite.groovy
@@ -776,6 +776,11 @@ class Suite implements GroovyInterceptable {
return localFile;
}
+ boolean enableJdbcTest() {
+ String enable = context.config.otherConfigs.get("enableJdbcTest")
+ return enable != null && enable.equalsIgnoreCase("true")
+ }
+
boolean enableBrokerLoad() {
String enableBrokerLoad =
context.config.otherConfigs.get("enableBrokerLoad");
return (enableBrokerLoad != null && enableBrokerLoad.equals("true"));
diff --git
a/regression-test/suites/doc/data-operate/scheduler/job-scheduler.md.groovy
b/regression-test/suites/doc/data-operate/scheduler/job-scheduler.md.groovy
new file mode 100644
index 00000000000..9f85844ceef
--- /dev/null
+++ b/regression-test/suites/doc/data-operate/scheduler/job-scheduler.md.groovy
@@ -0,0 +1,133 @@
+// 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.
+
+import org.junit.jupiter.api.Assertions;
+
+suite("docs/data-operate/scheduler/job-scheduler.md",
"p0,external,mysql,external_docker,external_docker_mysql") {
+ def dropJobIfExists = { job_name ->
+ sql "DROP JOB IF EXISTS where jobName='${job_name}'"
+ }
+ def createJobButMuteOutdateTime = { sqlText ->
+ try {
+ sql sqlText
+ } catch (Exception e) {
+ if (!e.getMessage().contains("startTimeMs must be greater than
current time")) {
+ throw e
+ }
+ }
+ }
+
+ try {
+ multi_sql """
+ create database if not exists db1;
+ create table if not exists db1.tbl1 (
+ create_time date
+ ) properties ("replication_num" = "1");
+ create database if not exists db2;
+ create table if not exists db2.tbl2 (
+ create_time date
+ ) properties ("replication_num" = "1");
+ """
+ dropJobIfExists("my_job")
+ createJobButMuteOutdateTime "CREATE JOB my_job ON SCHEDULE AT
'2025-01-01 00:00:00' DO INSERT INTO db1.tbl1 SELECT * FROM db2.tbl2"
+ dropJobIfExists("my_job")
+ createJobButMuteOutdateTime "CREATE JOB my_job ON SCHEDULE EVERY 1 DAY
STARTS '2025-01-01 00:00:00' DO INSERT INTO db1.tbl1 SELECT * FROM db2.tbl2
WHERE create_time >= days_add(now(),-1)"
+ dropJobIfExists("my_job")
+ createJobButMuteOutdateTime "CREATE JOB my_job ON SCHEDULE EVERY 1 DAY
STARTS '2025-01-01 00:00:00' ENDS '2026-01-01 00:10:00' DO INSERT INTO db1.tbl1
SELECT * FROM db2.tbl2 WHERE create_time >= days_add(now(),-1)"
+ dropJobIfExists("my_job")
+ createJobButMuteOutdateTime "CREATE JOB my_job ON SCHEDULE AT
current_timestamp DO INSERT INTO db1.tbl1 SELECT * FROM db2.tbl2"
+
+ sql """
+ CREATE TABLE IF NOT EXISTS user_activity (
+ `user_id` LARGEINT NOT NULL COMMENT "User ID",
+ `date` DATE NOT NULL COMMENT "Data import date",
+ `city` VARCHAR(20) COMMENT "User city",
+ `age` SMALLINT COMMENT "User age",
+ `sex` TINYINT COMMENT "User gender",
+ `last_visit_date` DATETIME REPLACE DEFAULT "1970-01-01 00:00:00"
COMMENT "Last visit date",
+ `cost` BIGINT SUM DEFAULT "0" COMMENT "Total spending",
+ `max_dwell_time` INT MAX DEFAULT "0" COMMENT "Max dwell time",
+ `min_dwell_time` INT MIN DEFAULT "99999" COMMENT "Min dwell time"
+ ) AGGREGATE KEY(`user_id`, `date`, `city`, `age`, `sex`)
+ DISTRIBUTED BY HASH(`user_id`) BUCKETS 1
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1"
+ );
+ """
+
+ if (enableJdbcTest()) {
+ def externalEnvIp =
context.config.otherConfigs.get("externalEnvIp")
+ def mysql_port = context.config.otherConfigs.get("mysql_57_port")
+ String s3_endpoint = getS3Endpoint()
+ String bucket = getS3BucketName()
+ String driver_url =
"https://${bucket}.${s3_endpoint}/regression/jdbc_driver/mysql-connector-java-8.0.25.jar";
+ String driver_class = "com.mysql.cj.jdbc.Driver"
+
+ multi_sql """
+ DROP CATALOG IF EXISTS activity;
+ CREATE CATALOG activity PROPERTIES (
+ "type"="jdbc",
+ "user"="root",
+ "password"="123456",
+ "jdbc_url" =
"jdbc:mysql://${externalEnvIp}:${mysql_port}/doris_test?useSSL=false&zeroDateTimeBehavior=convertToNull",
+ "driver_url" = "${driver_url}",
+ "driver_class" = "${driver_class}"
+ );
+ CALL EXECUTE_STMT("activity", "CREATE DATABASE IF NOT EXISTS
user");
+ CALL EXECUTE_STMT("activity", "DROP TABLE IF EXISTS
user.activity");
+ CALL EXECUTE_STMT("activity", "CREATE TABLE IF NOT EXISTS
user.activity (
+ `user_id` INT NOT NULL,
+ `date` DATE NOT NULL,
+ `city` VARCHAR(20),
+ `age` SMALLINT,
+ `sex` TINYINT,
+ `last_visit_date` DATETIME DEFAULT '1970-01-01 00:00:00',
+ `cost` BIGINT DEFAULT '0',
+ `max_dwell_time` INT DEFAULT '0',
+ `min_dwell_time` INT DEFAULT '99999'
+ )");
+ CALL EXECUTE_STMT("activity", "INSERT INTO user.activity VALUES
+ (10000, '2017-10-01', 'Beijing', 20, 0, '2017-10-01
06:00:00', 20, 10, 10),
+ (10000, '2017-10-01', 'Beijing', 20, 0, '2017-10-01
07:00:00', 15, 2, 2),
+ (10001, '2017-10-01', 'Beijing', 30, 1, '2017-10-01
17:05:00', 2, 22, 22),
+ (10002, '2017-10-02', 'Shanghai', 20, 1, '2017-10-02
12:59:00', 200, 5, 5),
+ (10003, '2017-10-02', 'Guangzhou', 32, 0, '2017-10-02
11:20:00', 30, 11, 11),
+ (10004, '2017-10-01', 'Shenzhen', 35, 0, '2017-10-01
10:00:00', 100, 3, 3),
+ (10004, '2017-10-03', 'Shenzhen', 35, 0, '2017-10-03
10:20:00', 11, 6, 6)
+ ");
+ """
+
+ dropJobIfExists("one_time_load_job")
+ createJobButMuteOutdateTime """
+ CREATE JOB one_time_load_job
+ ON SCHEDULE
+ AT '2024-8-10 03:00:00'
+ DO
+ INSERT INTO user_activity SELECT * FROM activity.user.activity
+ """
+ dropJobIfExists("schedule_load")
+ createJobButMuteOutdateTime """
+ CREATE JOB schedule_load
+ ON SCHEDULE EVERY 1 DAY
+ DO
+ INSERT INTO user_activity SELECT * FROM
activity.user.activity where last_visit_date >= days_add(now(),-1)
+ """
+ }
+ } catch (Throwable t) {
+ Assertions.fail("examples in
docs/data-operate/scheduler/job-scheduler.md failed to exec, please fix it", t)
+ }
+}
diff --git
a/regression-test/suites/external_table_p0/jdbc/test_jdbc_catalog_ddl.groovy
b/regression-test/suites/external_table_p0/jdbc/test_jdbc_catalog_ddl.groovy
index c31a98895fb..c6c73aa6325 100644
--- a/regression-test/suites/external_table_p0/jdbc/test_jdbc_catalog_ddl.groovy
+++ b/regression-test/suites/external_table_p0/jdbc/test_jdbc_catalog_ddl.groovy
@@ -38,7 +38,11 @@ suite("test_jdbc_catalog_ddl",
"p0,external,mysql,external_docker,external_docke
"driver_class" = "com.mysql.jdbc.Driver",
"use_meta_cache" = "${useMetaCache}"
);"""
- order_qt_show_db """ show databases from ${catalog_name}; """
+ def res = sql(""" show databases from ${catalog_name};
""").collect {x -> x[0] as String}
+ def containedDb = ['mysql', 'doris_test', 'information_schema']
+ for (final def db in containedDb) {
+ assertTrue(res.contains(db), 'Not contains db: `' + db + '` in
mysql catalog')
+ }
// test wrong catalog and db
test {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
