eldenmoon opened a new pull request, #70643:
URL: https://github.com/apache/doris/pull/70643
cherry-pick #69995
4.2 adaptation: `variant_escape_dots_in_keys` is allowed only when
`enable_variant_v2=true`.
The global default of `enable_variant_v2` remains `false`. This pick does
not implement V1 escaped-key encode/decode or turn V2 on cluster-wide.
## Conflicts
Resolved 26 conflicts (22 content + 4 modify/delete) against `branch-4.2` at
`d83fc096278`.
- Kept 4.2 V1/V2 iterator and writer selection; ported only the incoming
escape-dots encoding pieces.
- Protocol fields used after rechecking unused numbers on this tip:
- `TabletSchemaPB.variant_escape_dots_in_keys = 47`
- `TabletSchemaCloudPB.variant_escape_dots_in_keys = 48`
- `TTabletSchema.variant_escape_dots_in_keys = 34`
- `ColumnMetaPB.variant_path_encoding = 28`
- Did not add master's unrelated `commit_tso` / `row_lsn` / `row_ttl` /
`ttl_col_idx` / `seq_map` fields; thrift 25-33 left unused.
- Dropped four master-only files that do not exist on 4.2 and ported any
needed logic into existing 4.2 counterparts:
`variant_compaction_paths_test.cpp`, `OlapTableWrapper.java`,
`PluginDrivenExternalCatalog.java`,
`CloudInternalCatalogBloomFilterMaterializationTest.java`.
- FE code/tests were adapted to Java 8 / 4.2 APIs.
## V2-only restriction
- Creating or inheriting `variant_escape_dots_in_keys=true` (CREATE TABLE,
CTAS, CREATE TABLE LIKE, async/sync MV, rollup, later VARIANT column addition)
requires `enable_variant_v2=true`; default/false remains accepted.
- ALTER TABLE / ALTER MV SET still reject the property; column-level
`VARIANT PROPERTIES("variant_escape_dots_in_keys"=...)` is still rejected as a
table-only property.
- If an escaped table already exists and `enable_variant_v2` is later turned
off, replica/cloud metadata creation and V1 writer inputs fail closed instead
of writing or labeling legacy encoding as escaped. Restore
`enable_variant_v2=true` to keep using those tables through V2.
- Escaped storage maintenance keeps the persisted V2 contract; empty escaped
writers use V2, unescaped empty writers keep previous V1 behavior.
## Validation
Verified on `ca75fbd2edebe6d7d4906c2e32774fac4cc87cf0`:
- FE checkstyle on touched Java files: 0 violations.
- FE UT (`run-fe-ut.sh --run` 10 classes): 103 tests, failures=0, errors=0,
skipped=0, including V1 fail-closed creation/inheritance coverage in
`VariantEscapeTableTest` and related analyzer/MTMV tests.
- Focused BE ASAN object compile of 14 related production sources and 8 test
sources: compile passed.
Not run (left to CI / a 4.2-compatible full package environment):
- Full BE UT (branch-4.2 `lance_reader` cannot be built with the available
thirdparty set).
- Linked/executed BE test binaries.
- Regression suites (`dotted_key_escape*` / `dotted_key_legacy*` were
adapted to explicit V2/V1 config but not executed).
- Complete FE/BE package build, cluster start, Cloud runtime, physical
escaped-byte / compaction / load / MOW / row-store checks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]