From caf496a67e7fed0d0c2f38c01f6541dd13861f1d Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Fri, 11 Aug 2023 12:02:20 +0800 Subject: [PATCH] [Chore](RoutineLoad)Change max_batch_interval minimum limit from 5 to 1 (#22858) --- .../Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md | 2 +- .../Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md | 2 +- .../java/org/apache/doris/analysis/AlterRoutineLoadStmt.java | 2 +- .../java/org/apache/doris/analysis/CreateRoutineLoadStmt.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md b/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md index 2814d3b20c..7acd012770 100644 --- a/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md +++ b/docs/en/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md @@ -159,7 +159,7 @@ FROM data_source [data_source_properties] These three parameters represent: - 1. The maximum execution time of each subtask, in seconds. The range is 5 to 60. Default is 10. + 1. The maximum execution time of each subtask, in seconds. The range is 1 to 60. Default is 10. 2. The maximum number of lines read by each subtask. Must be greater than or equal to 200000. The default is 200000. 3. The maximum number of bytes read by each subtask. The unit is bytes and the range is 100MB to 1GB. The default is 100MB. diff --git a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md index 60bce047a0..1206c53305 100644 --- a/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md +++ b/docs/zh-CN/docs/sql-manual/sql-reference/Data-Manipulation-Statements/Load/CREATE-ROUTINE-LOAD.md @@ -156,7 +156,7 @@ FROM data_source [data_source_properties] 这三个参数分别表示： - 1. 每个子任务最大执行时间，单位是秒。范围为 5 到 60。默认为10。 + 1. 每个子任务最大执行时间，单位是秒。范围为 1 到 60。默认为10。 2. 每个子任务最多读取的行数。必须大于等于200000。默认是200000。 3. 每个子任务最多读取的字节数。单位是字节，范围是 100MB 到 1GB。默认是 100MB。 diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRoutineLoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRoutineLoadStmt.java index 0e25725cce..7da268dcf2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRoutineLoadStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AlterRoutineLoadStmt.java @@ -171,7 +171,7 @@ public class AlterRoutineLoadStmt extends DdlStmt { long maxBatchIntervalS = Util.getLongPropertyOrDefault( jobProperties.get(CreateRoutineLoadStmt.MAX_BATCH_INTERVAL_SEC_PROPERTY), -1, CreateRoutineLoadStmt.MAX_BATCH_INTERVAL_PRED, - CreateRoutineLoadStmt.MAX_BATCH_INTERVAL_SEC_PROPERTY + " should between 5 and 60"); + CreateRoutineLoadStmt.MAX_BATCH_INTERVAL_SEC_PROPERTY + " should between 1 and 60"); analyzedJobProperties.put(CreateRoutineLoadStmt.MAX_BATCH_INTERVAL_SEC_PROPERTY, String.valueOf(maxBatchIntervalS)); } diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java index 3d0720a10c..b1fb17c58e 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/CreateRoutineLoadStmt.java @@ -185,7 +185,7 @@ public class CreateRoutineLoadStmt extends DdlStmt { public static final Predicate DESIRED_CONCURRENT_NUMBER_PRED = (v) -> v > 0L; public static final Predicate MAX_ERROR_NUMBER_PRED = (v) -> v >= 0L; - public static final Predicate MAX_BATCH_INTERVAL_PRED = (v) -> v >= 5 && v <= 60; + public static final Predicate MAX_BATCH_INTERVAL_PRED = (v) -> v >= 1 && v <= 60; public static final Predicate MAX_BATCH_ROWS_PRED = (v) -> v >= 200000; public static final Predicate MAX_BATCH_SIZE_PRED = (v) -> v >= 100 * 1024 * 1024 && v <= 1024 * 1024 * 1024; public static final Predicate EXEC_MEM_LIMIT_PRED = (v) -> v >= 0L; @@ -449,7 +449,7 @@ public class CreateRoutineLoadStmt extends DdlStmt { maxBatchIntervalS = Util.getLongPropertyOrDefault(jobProperties.get(MAX_BATCH_INTERVAL_SEC_PROPERTY), RoutineLoadJob.DEFAULT_MAX_INTERVAL_SECOND, MAX_BATCH_INTERVAL_PRED, - MAX_BATCH_INTERVAL_SEC_PROPERTY + " should between 5 and 60"); + MAX_BATCH_INTERVAL_SEC_PROPERTY + " should between 1 and 60"); maxBatchRows = Util.getLongPropertyOrDefault(jobProperties.get(MAX_BATCH_ROWS_PROPERTY), RoutineLoadJob.DEFAULT_MAX_BATCH_ROWS, MAX_BATCH_ROWS_PRED,