From 1e19a3d85213892b41ed4d7f4bd0cda8e6e36b47 Mon Sep 17 00:00:00 2001 From: hui lai Date: Wed, 16 Jul 2025 09:26:00 +0800 Subject: [PATCH] branch-2.1: [chore](information schema) rename routine_load_job system table to routine_load_jobs (#49515) (#53246) pick (#49515) ### What problem does this PR solve? Issue Number: close #xxx Related PR: #xxx Problem Summary: ### Release note None ### Check List (For Author) - Test - [ ] Regression test - [ ] Unit Test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test or manual test. Explain why: - [ ] This is a refactor/code format and no logic has been changed. - [ ] Previous test can cover this change. - [ ] No code files have been changed. - [ ] Other reason - Behavior changed: - [ ] No. - [ ] Yes. - Does this need documentation? - [ ] No. - [ ] Yes. ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label --- be/src/exec/schema_scanner.cpp | 2 +- .../exec/schema_scanner/schema_routine_load_job_scanner.cpp | 2 +- .../main/java/org/apache/doris/analysis/SchemaTableType.java | 4 ++-- .../src/main/java/org/apache/doris/catalog/SchemaTable.java | 4 ++-- gensrc/thrift/Descriptors.thrift | 2 +- .../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 43f9d618ac..7265a4cb4f 100644 --- a/be/src/exec/schema_scanner.cpp +++ b/be/src/exec/schema_scanner.cpp @@ -238,7 +238,7 @@ std::unique_ptr SchemaScanner::create(TSchemaTableType::type type return SchemaCatalogMetaCacheStatsScanner::create_unique(); case TSchemaTableType::SCH_TABLE_OPTIONS: return SchemaTableOptionsScanner::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 e061ab790c..11f5fb376b 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 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 18ec215f65..65bbad5fcd 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_CATALOG_META_CACHE_STATISTICS), SCH_TABLE_OPTIONS("TABLE_OPTIONS", "TABLE_OPTIONS", TSchemaTableType.SCH_TABLE_OPTIONS), - 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 8cd701be32..b98501562d 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 @@ -573,8 +573,8 @@ public class SchemaTable extends Table { .column("BUCKETS_NUM", ScalarType.createType(PrimitiveType.INT)) .column("PARTITION_NUM", ScalarType.createType(PrimitiveType.INT)) .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 04b53f253a..e5b5b02f19 100644 --- a/gensrc/thrift/Descriptors.thrift +++ b/gensrc/thrift/Descriptors.thrift @@ -138,7 +138,7 @@ enum TSchemaTableType { SCH_TABLE_PROPERTIES = 50, SCH_FILE_CACHE_STATISTICS = 51, SCH_CATALOG_META_CACHE_STATISTICS = 52, - 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 3fa360bf28..bfe170b752 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 {