database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

branch-2.1: [chore](information schema) rename routine_load_job system table to routine_load_jobs (#49515) (#53246)

Browse Source 
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 <!-- At least one of them must be included. -->
    - [ ] 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 <!-- Add your reason?  -->

- Behavior changed:
    - [ ] No.
    - [ ] Yes. <!-- Explain the behavior change -->

- Does this need documentation?
    - [ ] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->

### Check List (For Reviewer who merge this PR)

- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
This commit is contained in:
hui lai
2025-07-16 09:26:00 +08:00
committed by GitHub
parent 4b261d43b6
commit 1e19a3d852
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
be/src/exec/schema_scanner.cpp
View File

@ -238,7 +238,7 @@ std::unique_ptr<SchemaScanner> 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();

2
be/src/exec/schema_scanner/schema_routine_load_job_scanner.cpp
View File

@ -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() {}

4
fe/fe-core/src/main/java/org/apache/doris/analysis/SchemaTableType.java
View File

@ -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;

4
fe/fe-core/src/main/java/org/apache/doris/catalog/SchemaTable.java
View File

@ -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())

2
gensrc/thrift/Descriptors.thrift
View File

@ -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 {

2
regression-test/suites/load_p0/routine_load/test_routine_load_job_info_system_table.groovy
View File

@ -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 {