Repository navigation
Commit 7916b62
committed
[fix](fe) Allow unrelated alters on legacy HA catalogs
### What problem does this PR solve?
Issue Number: None
Related PR: #68585
Problem Summary: A legacy HMS catalog can contain an empty HDFS nameservice list, such as `dfs.nameservices=,`. Runtime binding tolerates this persisted value, but ALTER validation checked the merged catalog properties and rejected even an unrelated statement such as `ALTER CATALOG ... SET PROPERTIES ("test_connection"="false")`.
Validate empty nameservice values against the properties submitted by the current statement. CREATE and ALTER still reject explicitly submitted empty values, while unrelated ALTERs preserve legacy values. The complete merged configuration continues through storage binding and HA validation.
### Release note
Allow unrelated property changes on legacy Hive catalogs containing an empty HDFS nameservice list.
### Check List (For Author)
- Test
- [x] Unit Test
- Added `PluginDrivenExternalCatalogConcurrencyTest` coverage for legacy comma-only, whitespace, and empty-string nameservice values during unrelated ALTERs, and explicit CREATE/ALTER rejection of these values.
- Community FE UT and COMPILE passed on commit `2fcc2ef6e0c93582414a50037394f094012f34f9`.
- Local focused FE UT compiled and reached execution, but all 18 tests failed during Mockito initialization because the inline mock maker could not self-attach. This local run is not counted as passing.
- [x] Regression test
- Community External, P0, NonConcurrent, Cloud P0, and Vault P0 checks passed on the same commit. No new regression suite was added; the legacy persisted-property case is covered by FE unit tests.
- Behavior changed:
- [ ] No.
- [x] Yes. Unrelated ALTERs accept legacy empty nameservice values; explicitly submitted empty values remain rejected.
- Does this need documentation?
- [x] No.
- [ ] Yes.1 parent 7d23148 commit 7916b62
2 files changed
Lines changed: 40 additions & 5 deletions
File tree
- fe/fe-core/src
- main/java/org/apache/doris/datasource/plugin
- test/java/org/apache/doris/datasource/plugin
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
232 | 232 | | |
233 | 233 | | |
234 | 234 | | |
235 | | - | |
| 235 | + | |
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
| |||
256 | 256 | | |
257 | 257 | | |
258 | 258 | | |
259 | | - | |
| 259 | + | |
260 | 260 | | |
261 | 261 | | |
262 | 262 | | |
| |||
266 | 266 | | |
267 | 267 | | |
268 | 268 | | |
269 | | - | |
| 269 | + | |
| 270 | + | |
270 | 271 | | |
271 | 272 | | |
272 | 273 | | |
273 | | - | |
| 274 | + | |
| 275 | + | |
274 | 276 | | |
275 | | - | |
| 277 | + | |
276 | 278 | | |
277 | 279 | | |
278 | 280 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
123 | 123 | | |
124 | 124 | | |
125 | 125 | | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
126 | 159 | | |
127 | 160 | | |
128 | 161 | | |
| |||
0 commit comments