jerryshao opened a new pull request, #12356:
URL: https://github.com/apache/gravitino/pull/12356
**Cherry-pick Information:**
- Original commit: 496f41e919f5adcc37ebd7a6bf371eec767fb484
- Target branch: `branch-1.3`
- Status: ⚠️ Conflicts manually resolved
**Conflict resolution notes:**
The original commit mechanically removes the "Since Version" column/prose
from 55 docs files.
Six files conflicted because main's docs had already diverged from
branch-1.3 in ways unrelated
to this commit:
- `docs/fileset-catalog-with-cos.md`: deleted rather than ported — Tencent
Cloud COS fileset
support doesn't exist on branch-1.3 (no `catalog-tencent` module or
bundle).
- `docs/fileset-catalog.md`: dropped the COS/`gravitino-tencent-bundle`
mentions main added, for
the same reason; the actual "Since Version" removal in the rest of the
file still applies.
- `docs/gravitino-mcp-server.md`: kept branch-1.3's actual (smaller) MCP
tool list rather than
main's expanded one — tools like `create_catalog`, `create_table`,
`list_of_partitions` don't
exist in branch-1.3's `mcp-server/mcp_server/tools/` source.
- `docs/jdbc-doris-catalog.md`: kept branch-1.3's original Table Properties
text instead of
main's new property table (`compression`, `bloom_filter_columns`, etc.) —
none of those
properties exist in branch-1.3's `DorisTablePropertiesMetadata.java`.
- `docs/security/credential-vending.md`: main fully restructured this file
in an earlier,
unrelated commit. Kept branch-1.3's original structure and manually
applied just this commit's
actual change (stripped the "Since Version" column from 10 tables, trimmed
3 "since X.Y.Z"
prose mentions), preserving the one version reference the original
commit's notes call out as
intentionally load-bearing (the backward-compatibility migration section).
Every other config/content difference was cross-checked against branch-1.3
source before being
excluded (verified via `MetadataObject.java`, `mcp_server/tools/`,
`DorisTablePropertiesMetadata.java`,
and the `catalogs-contrib`/bundle module list).
All 54 ported files (55 minus the one deleted) were verified to have zero
remaining "Since Version"
references, and markdown table structure (row cell-count vs. header) was
checked across the full
changeset — the only mismatch found is a pre-existing malformed row in
`fileset-catalog.md` that
the original commit's own notes already flag as out of scope.
--
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]
