This is an automated email from the ASF dual-hosted git repository.
hello-stephen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new cbc30b98137 [fix](fe) Align Thrift wire IDs with branch-4.1 (#70057)
cbc30b98137 is described below
commit cbc30b98137f06353e8d5ce3953280d42849bef1
Author: hui lai <[email protected]>
AuthorDate: Wed Nov 4 10:06:53 2026 +0800
[fix](fe) Align Thrift wire IDs with branch-4.1 (#70057)
### What problem does this PR solve?
Problem Summary:
During a rolling upgrade from 4.1 to master, the same Thrift enum value
or field ID can have different meanings on FE and BE:
- `TSchemaTableType` diverges starting at value 62. For example, 4.1
sends `SCH_FILE_CACHE_INFO = 62`, which master interprets as
`SCH_BLACKHOLE`.
- `TRLTaskTxnCommitAttachment.firstErrorMsg` uses field 12 in 4.1 but
field 13 in master. Master uses field 12 for the Kinesis progress
struct, so mixed-version readers skip the error message because the wire
types do not match.
Align master's shared enum values with branch-4.1 (also matching
branch-4.2), place master-only database properties and table stream
values at 70–72, and preserve extensions/TSO at 73/74. Restore
`firstErrorMsg` to field 12 and move the optional Kinesis progress field
to 13.
Compatibility review: checked both definitions on branch-3.1,
branch-4.0, branch-4.1, branch-4.2 and master. Branch-4.0 already
differs from 4.1 for `SCH_BLACKHOLE`, `SCH_COLUMN_DATA_SIZES`,
`SCH_LOAD_JOBS` and `SCH_BE_COMPACTION_TASKS`; this master-only fix does
not resolve that existing release-to-release mismatch. These corrections
also change the affected wire IDs relative to unpatched master.
### Release note
Fix schema table enum values and routine load commit attachment field
IDs on master to match Doris 4.1 and 4.2 during rolling upgrades.
---
gensrc/thrift/Descriptors.thrift | 22 +++++++++++-----------
gensrc/thrift/FrontendService.thrift | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/gensrc/thrift/Descriptors.thrift b/gensrc/thrift/Descriptors.thrift
index 2faae590842..8c17ebb8ac8 100644
--- a/gensrc/thrift/Descriptors.thrift
+++ b/gensrc/thrift/Descriptors.thrift
@@ -219,17 +219,17 @@ enum TSchemaTableType {
SCH_SQL_BLOCK_RULE_STATUS = 59;
SCH_CLUSTER_SNAPSHOTS = 60;
SCH_CLUSTER_SNAPSHOT_PROPERTIES = 61;
- SCH_BLACKHOLE = 62;
- SCH_COLUMN_DATA_SIZES = 63;
- SCH_LOAD_JOBS = 64;
- SCH_FILE_CACHE_INFO = 65;
- SCH_DATABASE_PROPERTIES = 66;
- SCH_AUTHENTICATION_INTEGRATIONS = 67;
- SCH_TABLE_STREAMS = 68;
- SCH_TABLE_STREAM_CONSUMPTION = 69;
- SCH_BE_COMPACTION_TASKS = 70;
- SCH_ROLE_MAPPINGS = 71;
- SCH_BACKEND_MS_RPC_TABLE_THROTTLERS = 72;
+ SCH_FILE_CACHE_INFO = 62;
+ SCH_BLACKHOLE = 63;
+ SCH_COLUMN_DATA_SIZES = 64;
+ SCH_LOAD_JOBS = 65;
+ SCH_AUTHENTICATION_INTEGRATIONS = 66;
+ SCH_BE_COMPACTION_TASKS = 67;
+ SCH_ROLE_MAPPINGS = 68;
+ SCH_BACKEND_MS_RPC_TABLE_THROTTLERS = 69;
+ SCH_DATABASE_PROPERTIES = 70;
+ SCH_TABLE_STREAMS = 71;
+ SCH_TABLE_STREAM_CONSUMPTION = 72;
SCH_EXTENSIONS = 73;
SCH_TSO_STATUS = 74;
}
diff --git a/gensrc/thrift/FrontendService.thrift
b/gensrc/thrift/FrontendService.thrift
index 0f092db7ba8..63250ae7be9 100644
--- a/gensrc/thrift/FrontendService.thrift
+++ b/gensrc/thrift/FrontendService.thrift
@@ -703,8 +703,8 @@ struct TRLTaskTxnCommitAttachment {
9: optional i64 loadCostMs
10: optional TKafkaRLTaskProgress kafkaRLTaskProgress
11: optional string errorLogUrl
- 12: optional TKinesisRLTaskProgress kinesisRLTaskProgress
- 13: optional string firstErrorMsg
+ 12: optional string firstErrorMsg
+ 13: optional TKinesisRLTaskProgress kinesisRLTaskProgress
}
struct TTxnCommitAttachment {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
