This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new ad4dd621cfe [chore](information schema) rename routine_load_job system
table to routine_load_jobs (#49515) (#49663)
ad4dd621cfe is described below
commit ad4dd621cfe4c787031bc0db55692766e7f4dba7
Author: hui lai <[email protected]>
AuthorDate: Mon Mar 31 12:10:05 2025 +0800
[chore](information schema) rename routine_load_job system table to
routine_load_jobs (#49515) (#49663)
pick #49515
---
be/src/exec/schema_scanner.cpp | 2 +-
be/src/exec/schema_scanner/schema_routine_load_job_scanner.cpp | 2 +-
.../src/main/java/org/apache/doris/analysis/SchemaTableType.java | 4 ++--
fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java | 4 ++--
gensrc/thrift/Descriptors.thrift | 2 +-
.../routine_load/test_routine_load_job_info_system_table.groovy | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/be/src/exec/schema_scanner.cpp b/be/src/exec/schema_scanner.cpp
index ad3009823b4..5bf990e7c55 100644
--- a/be/src/exec/schema_scanner.cpp
+++ b/be/src/exec/schema_scanner.cpp
@@ -242,7 +242,7 @@ std::unique_ptr<SchemaScanner>
SchemaScanner::create(TSchemaTableType::type type
return SchemaFileCacheStatisticsScanner::create_unique();
case TSchemaTableType::SCH_CATALOG_META_CACHE_STATISTICS:
return SchemaCatalogMetaCacheStatsScanner::create_unique();
- case TSchemaTableType::SCH_ROUTINE_LOAD_JOB:
+ case TSchemaTableType::SCH_ROUTINE_LOAD_JOBS:
return SchemaRoutineLoadJobScanner::create_unique();
default:
return SchemaDummyScanner::create_unique();
diff --git a/be/src/exec/schema_scanner/schema_routine_load_job_scanner.cpp
b/be/src/exec/schema_scanner/schema_routine_load_job_scanner.cpp
index e061ab790cf..11f5fb376bc 100644
--- a/be/src/exec/schema_scanner/schema_routine_load_job_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_routine_load_job_scanner.cpp
@@ -59,7 +59,7 @@ std::vector<SchemaScanner::ColumnDesc>
SchemaRoutineLoadJobScanner::_s_tbls_colu
};
SchemaRoutineLoadJobScanner::SchemaRoutineLoadJobScanner()
- : SchemaScanner(_s_tbls_columns,
TSchemaTableType::SCH_ROUTINE_LOAD_JOB) {}
+ : SchemaScanner(_s_tbls_columns,
TSchemaTableType::SCH_ROUTINE_LOAD_JOBS) {}
SchemaRoutineLoadJobScanner::~SchemaRoutineLoadJobScanner() {}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
index 62ab5fa1969..f8fcfe19b04 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
@@ -89,8 +89,8 @@ public enum SchemaTableType {
TSchemaTableType.SCH_FILE_CACHE_STATISTICS),
SCH_CATALOG_META_CACHE_STATISTICS("CATALOG_META_CACHE_STATISTICS",
"CATALOG_META_CACHE_STATISTICS",
TSchemaTableType.SCH_CATALOG_META_CACHE_STATISTICS),
- SCH_ROUTINE_LOAD_JOB("ROUTINE_LOAD_JOB", "ROUTINE_LOAD_JOB",
- TSchemaTableType.SCH_ROUTINE_LOAD_JOB);
+ SCH_ROUTINE_LOAD_JOBS("ROUTINE_LOAD_JOBS", "ROUTINE_LOAD_JOBS",
+ TSchemaTableType.SCH_ROUTINE_LOAD_JOBS);
private static final String dbName = "INFORMATION_SCHEMA";
private static SelectList fullSelectLists;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
index 17be2a5e240..898b10ed973 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
@@ -575,8 +575,8 @@ public class SchemaTable extends Table {
.column("METRIC_VALUE",
ScalarType.createStringType())
.build())
)
- .put("routine_load_job",
- new SchemaTable(SystemIdGenerator.getNextId(),
"routine_load_job", TableType.SCHEMA,
+ .put("routine_load_jobs",
+ new SchemaTable(SystemIdGenerator.getNextId(),
"routine_load_jobs", TableType.SCHEMA,
builder().column("JOB_ID",
ScalarType.createStringType())
.column("JOB_NAME",
ScalarType.createStringType())
.column("CREATE_TIME",
ScalarType.createStringType())
diff --git a/gensrc/thrift/Descriptors.thrift b/gensrc/thrift/Descriptors.thrift
index 03b7540b8c8..d95f4150a76 100644
--- a/gensrc/thrift/Descriptors.thrift
+++ b/gensrc/thrift/Descriptors.thrift
@@ -140,7 +140,7 @@ enum TSchemaTableType {
SCH_FILE_CACHE_STATISTICS = 51,
SCH_CATALOG_META_CACHE_STATISTICS = 52;
// consistent with the master
- SCH_ROUTINE_LOAD_JOB = 54;
+ SCH_ROUTINE_LOAD_JOBS = 54;
}
enum THdfsCompression {
diff --git
a/regression-test/suites/load_p0/routine_load/test_routine_load_job_info_system_table.groovy
b/regression-test/suites/load_p0/routine_load/test_routine_load_job_info_system_table.groovy
index 3fa360bf281..bfe170b7520 100644
---
a/regression-test/suites/load_p0/routine_load/test_routine_load_job_info_system_table.groovy
+++
b/regression-test/suites/load_p0/routine_load/test_routine_load_job_info_system_table.groovy
@@ -131,7 +131,7 @@ suite("test_routine_load_job_info_system_table","p0") {
sleep(1000)
count++
}
- def res = sql "SELECT JOB_NAME FROM
information_schema.routine_load_job WHERE CURRENT_ABORT_TASK_NUM > 0 OR
IS_ABNORMAL_PAUSE = TRUE"
+ def res = sql "SELECT JOB_NAME FROM
information_schema.routine_load_jobs WHERE CURRENT_ABORT_TASK_NUM > 0 OR
IS_ABNORMAL_PAUSE = TRUE"
log.info("res: ${res}".toString())
assertTrue(res.toString().contains("${jobName}"))
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
