[Chore](build) fix conflict field id#60743
Conversation
|
run buildall |
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
|
skip buildall |
|
PR approved by at least one committer and no changes requested. |
|
PR approved by anyone and no changes requested. |
There was a problem hiding this comment.
Pull request overview
This PR updates the TQueryOptions struct in gensrc/thrift/PaloInternalService.thrift to resolve a Thrift field-id conflict by moving enable_aggregate_function_null_v2 to a new field id and position in the struct.
Changes:
- Remove
enable_aggregate_function_null_v2from Thrift field id186. - Re-add
enable_aggregate_function_null_v2as field id189after the other186/187/188passthrough options.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| 188: optional bool enable_broadcast_join_force_passthrough; | ||
|
|
||
| 189: optional bool enable_aggregate_function_null_v2 = false; |
There was a problem hiding this comment.
This change does more than reorder fields: it changes the Thrift field id for enable_aggregate_function_null_v2 from 186 to 189. That alters the wire serialization contract, so the PR description claiming “no functionality is affected” is inaccurate; please update the description (and release notes if required) to reflect the compatibility impact and rationale for picking the new id.
| 186: optional bool enable_streaming_agg_hash_join_force_passthrough; | ||
|
|
||
| 187: optional bool enable_distinct_streaming_agg_force_passthrough; | ||
|
|
||
| 188: optional bool enable_broadcast_join_force_passthrough; | ||
|
|
||
| 189: optional bool enable_aggregate_function_null_v2 = false; |
There was a problem hiding this comment.
Changing a TQueryOptions field id can break mixed-version compatibility: any serialized payload that previously set field 186 for enable_aggregate_function_null_v2 will now be interpreted as enable_streaming_agg_hash_join_force_passthrough. If this struct crosses FE/BE boundaries across versions, consider keeping the existing id for the already-released option (and renumbering the newer/conflicting one), or otherwise document/enforce an upgrade constraint to avoid misinterpretation.
FE UT Coverage ReportIncrement line coverage `` 🎉 |
|
skip buildall |
What problem does this PR solve?
This pull request makes a minor update to the
TQueryOptionsstruct ingensrc/thrift/PaloInternalService.thrift. The change simply reorders the declaration of theenable_aggregate_function_null_v2option, moving it a few lines down in the struct definition. No functionality is affected.(gensrc/thrift/PaloInternalService.thriftL428-R436)
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)