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 c223d9e7d008c063b36e9b2bd4be1acb471f06a5
Author: Calvin Kirs <k...@apache.org>
AuthorDate: Fri Mar 22 19:15:47 2024 +0800
[Fix](Test)Reduce the Sleep time and ensure that the corresponding thread
resources are released after the case is executed. (#32665)
* [Fix](Test)Reduce the Sleep time and ensure that the corresponding thread
resources are released after the case is executed.
* Fix load job id error
---
.../commands/insert/AbstractInsertExecutor.java | 1 +
.../suites/job_p0/test_base_insert_job.groovy | 286 +++++++++++++++++++++
2 files changed, 287 insertions(+)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
index 922dae6d40b..a9b3ae6d632 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/AbstractInsertExecutor.java
@@ -107,6 +107,7 @@ public abstract class AbstractInsertExecutor {
protected final void execImpl(StmtExecutor executor, long jobId) throws
Exception {
String queryId = DebugUtil.printId(ctx.queryId());
+ this.jobId = jobId;
coordinator.setLoadZeroTolerance(ctx.getSessionVariable().getEnableInsertStrict());
coordinator.setQueryType(TQueryType.LOAD);
executor.getProfile().addExecutionProfile(coordinator.getExecutionProfile());
diff --git a/regression-test/suites/job_p0/test_base_insert_job.groovy
b/regression-test/suites/job_p0/test_base_insert_job.groovy
new file mode 100644
index 00000000000..8fe7c0e7749
--- /dev/null
+++ b/regression-test/suites/job_p0/test_base_insert_job.groovy
@@ -0,0 +1,286 @@
+// 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 java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.Instant;
+import java.time.ZoneId;
+
+suite("test_base_insert_job") {
+ def tableName = "t_test_BASE_inSert_job"
+ def jobName = "insert_recovery_test_base_insert_job"
+ def jobMixedName = "Insert_recovery_Test_base_insert_job"
+ sql """drop table if exists `${tableName}` force"""
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobName}'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'JOB'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'DO'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'AT'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'SCHEDULE'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'STARTS'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'ENDS'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobMixedName}'
+ """
+
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobName}'
+ """
+
+ sql """
+ CREATE TABLE IF NOT EXISTS `${tableName}`
+ (
+ `timestamp` DATE NOT NULL COMMENT "['0000-01-01', '9999-12-31']",
+ `type` TINYINT NOT NULL COMMENT "[-128, 127]",
+ `user_id` BIGINT COMMENT "[-9223372036854775808,
9223372036854775807]"
+ )
+ DUPLICATE KEY(`timestamp`, `type`)
+ DISTRIBUTED BY HASH(`type`) BUCKETS 1
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1"
+ );
+ """
+ sql """
+ CREATE JOB ${jobName} ON SCHEDULE every 1 second comment 'test' DO
insert into ${tableName} (timestamp, type, user_id) values
('2023-03-18','1','12213');
+ """
+ Thread.sleep(2500)
+ sql """
+ PAUSE JOB where jobname = '${jobName}'
+ """
+ def tblDatas = sql """select * from ${tableName}"""
+ println tblDatas
+ assert 3 >= tblDatas.size() >= (2 as Boolean) //at least 2 records, some
times 3 records
+ def pauseJobId = sql """select id from jobs("type"="insert") where
Name='${jobName}'"""
+ def taskStatus = sql """select status from tasks("type"="insert") where
jobid= '${pauseJobId.get(0).get(0)}'"""
+ println taskStatus
+ for (int i = 0; i < taskStatus.size(); i++) {
+ assert taskStatus.get(i).get(0) != "FAILED"||taskStatus.get(i).get(0)
!= "STOPPED"||taskStatus.get(i).get(0) != "STOPPED"
+ }
+ sql """
+ CREATE JOB ${jobMixedName} ON SCHEDULE every 1 second DO insert into
${tableName} (timestamp, type, user_id) values ('2023-03-18','1','12213');
+ """
+ def mixedNameJobs = sql """select name,comment from jobs("type"="insert")
where Name='${jobMixedName}'"""
+ println mixedNameJobs
+ assert mixedNameJobs.size() == 1 && mixedNameJobs.get(0).get(0) ==
jobMixedName
+ assert mixedNameJobs.get(0).get(1) == ''
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobName}'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobMixedName}'
+ """
+
+ sql """drop table if exists `${tableName}` force """
+ sql """
+ CREATE TABLE IF NOT EXISTS `${tableName}`
+ (
+ `timestamp` DATE NOT NULL COMMENT "['0000-01-01', '9999-12-31']",
+ `type` TINYINT NOT NULL COMMENT "[-128, 127]",
+ `user_id` BIGINT COMMENT "[-9223372036854775808,
9223372036854775807]"
+ )
+ DUPLICATE KEY(`timestamp`, `type`)
+ DISTRIBUTED BY HASH(`type`) BUCKETS 1
+ PROPERTIES (
+ "replication_allocation" = "tag.location.default: 1"
+ );
+ """
+ def dataCount = sql """select count(*) from ${tableName}"""
+ assert dataCount.get(0).get(0) == 0
+ sql """
+ CREATE JOB ${jobName} ON SCHEDULE at current_timestamp comment
'test for test&68686781jbjbhj//ncsa' DO insert into ${tableName} values
('2023-07-19', 2, 1001);
+ """
+
+ Thread.sleep(2000)
+ def onceJob = sql """ select id,ExecuteSql from jobs("type"="insert")
where Name like '%${jobName}%' and ExecuteType='ONE_TIME' """
+ assert onceJob.size() == 1
+ def onceJobId = onceJob.get(0).get(0);
+ def onceJobSql = onceJob.get(0).get(1);
+ println onceJobSql
+ // test cancel task
+ def datas = sql """select status,taskid from tasks("type"="insert") where
jobid= ${onceJobId}"""
+ println datas
+ assert datas.size() == 1
+ assert datas.get(0).get(0) == "FINISHED"
+ // check table data
+ def dataCount1 = sql """select count(1) from ${tableName}"""
+ assert dataCount1.get(0).get(0) == 1
+ // check job status
+ def oncejob = sql """select status,comment from jobs("type"="insert")
where Name='${jobName}' """
+ println oncejob
+ assert oncejob.get(0).get(0) == "FINISHED"
+ //assert comment
+ assert oncejob.get(0).get(1) == "test for test&68686781jbjbhj//ncsa"
+ sql """
+ DROP JOB IF EXISTS where jobname = 'press'
+ """
+
+ sql """
+ CREATE JOB press ON SCHEDULE every 10 hour starts CURRENT_TIMESTAMP
comment 'test for test&68686781jbjbhj//ncsa' DO insert into ${tableName}
values ('2023-07-19', 99, 99);
+ """
+ Thread.sleep(5000)
+ def pressJob = sql """ select * from jobs("type"="insert") where
name='press' """
+ println pressJob
+
+ def recurringTableDatas = sql """ select count(1) from ${tableName} where
user_id=99 and type=99 """
+ assert recurringTableDatas.get(0).get(0) == 1
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobName}'
+ """
+ sql """
+ CREATE JOB ${jobName} ON SCHEDULE every 1 second comment 'test
for test&68686781jbjbhj//ncsa' DO insert into ${tableName} values
('2023-07-19',5, 1001);
+ """
+
+ Thread.sleep(2000)
+
+ sql """
+ PAUSE JOB where jobname = '${jobName}'
+ """
+ def job = sql """ select id,ExecuteSql from jobs("type"="insert") where
Name like '%${jobName}%' """
+ assert job.size() == 1
+ def jobId = job.get(0).get(0);
+ def tasks = sql """ select status from tasks("type"="insert") where jobid=
${jobId} """
+ sql """
+ RESUME JOB where jobname = '${jobName}'
+ """
+ Thread.sleep(2500)
+ def afterResumeTasks = sql """ select status from tasks("type"="insert")
where jobid= ${jobId} """
+ println afterResumeTasks
+ assert afterResumeTasks.size() >tasks.size
+ // assert same job name
+ try {
+ sql """
+ CREATE JOB ${jobName} ON SCHEDULE EVERY 10 second comment 'test
for test&68686781jbjbhj//ncsa' DO insert into ${tableName} values
('2023-07-19', 10, 1001);
+ """
+ } catch (Exception e) {
+ assert e.getMessage().contains("job name exist,
jobName:insert_recovery_test_base_insert_job")
+ }
+ // assert not support stmt
+ try {
+ sql """
+ CREATE JOB ${jobName} ON SCHEDULE at current_timestamp comment
'test' DO update ${tableName} set type=2 where type=1;
+ """
+ } catch (Exception e) {
+ assert e.getMessage().contains("Not support UpdateStmt type in job")
+ }
+ // assert start time greater than current time
+ try {
+ sql """
+ CREATE JOB ${jobName} ON SCHEDULE at '2023-11-13 14:18:07'
comment 'test' DO insert into ${tableName} (timestamp, type, user_id) values
('2023-03-18','1','12213');
+ """
+ } catch (Exception e) {
+ assert e.getMessage().contains("startTimeMs must be greater than
current time")
+ }
+ // assert end time less than start time
+ try {
+ sql """
+ CREATE JOB test_one_time_error_starts ON SCHEDULE at '2023-11-13
14:18:07' comment 'test' DO insert into ${tableName} (timestamp, type,
user_id) values ('2023-03-18','1','12213');
+ """
+ } catch (Exception e) {
+ assert e.getMessage().contains("startTimeMs must be greater than
current time")
+ }
+ try {
+ sql """
+ CREATE JOB inner_test ON SCHEDULE at '2023-11-13 14:18:07'
comment 'test' DO insert into ${tableName} (timestamp, type, user_id) values
('2023-03-18','1','12213');
+ """
+ } catch (Exception e) {
+ assert e.getMessage().contains("job name can not start with inner_")
+ }
+ // assert end time less than start time
+ try {
+ sql """
+ CREATE JOB test_error_starts ON SCHEDULE every 1 second ends
'2023-11-13 14:18:07' comment 'test' DO insert into ${tableName} (timestamp,
type, user_id) values ('2023-03-18','1','12213');
+ """
+ } catch (Exception e) {
+ assert e.getMessage().contains("end time cannot be less than start
time")
+ }
+ // assert interval time unit can not be years
+ try {
+ sql """
+ CREATE JOB test_error_starts ON SCHEDULE every 1 years ends
'2023-11-13 14:18:07' comment 'test' DO insert into ${tableName} (timestamp,
type, user_id) values ('2023-03-18','1','12213');
+ """
+ } catch (Exception e) {
+ assert e.getMessage().contains("interval time unit can not be years")
+ }
+
+ // test keyword as job name
+ sql """
+ CREATE JOB JOB ON SCHEDULE every 20 second comment 'test' DO insert
into ${tableName} (timestamp, type, user_id) values ('2023-03-18','1','12213');
+ """
+ sql """
+ CREATE JOB SCHEDULE ON SCHEDULE every 20 second comment 'test' DO
insert into ${tableName} (timestamp, type, user_id) values
('2023-03-18','1','12213');
+ """
+ sql """
+ CREATE JOB DO ON SCHEDULE every 20 second comment 'test' DO insert
into ${tableName} (timestamp, type, user_id) values ('2023-03-18','1','12213');
+ """
+ sql """
+ CREATE JOB AT ON SCHEDULE every 20 second comment 'test' DO insert
into ${tableName} (timestamp, type, user_id) values ('2023-03-18','1','12213');
+ """
+
+ sql """
+ CREATE JOB STARTS ON SCHEDULE every 20 second comment 'test' DO
insert into ${tableName} (timestamp, type, user_id) values
('2023-03-18','1','12213');
+ """
+
+ sql """
+ CREATE JOB ENDS ON SCHEDULE every 20 second comment 'test' DO
insert into ${tableName} (timestamp, type, user_id) values
('2023-03-18','1','12213');
+ """
+
+ def jobCountRsp = sql """select count(1) from jobs("type"="insert") where
name in ('JOB','DO','SCHEDULE','AT','STARTS','ENDS')"""
+ assert jobCountRsp.get(0).get(0) == 6
+
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobName}'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'JOB'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'DO'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'AT'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'SCHEDULE'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'STARTS'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = 'ENDS'
+ """
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobMixedName}'
+ """
+
+ sql """
+ DROP JOB IF EXISTS where jobname = '${jobName}'
+ """
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
