Skip to content

[ntuple] Rename kTypeDAOS to kTypeObject64 and kTypeS3 to kTypeMulti#22434

Merged
jblomer merged 1 commit into
root-project:masterfrom
JasMehta08:locator-type-rename
Jun 5, 2026
Merged

[ntuple] Rename kTypeDAOS to kTypeObject64 and kTypeS3 to kTypeMulti#22434
jblomer merged 1 commit into
root-project:masterfrom
JasMehta08:locator-type-rename

Conversation

@JasMehta08
Copy link
Copy Markdown
Contributor

This Pull request:

Changes or fixes:

Consolidate locator type naming as suggested in the review of PR #22351. kTypeDAOS is renamed to kTypeObject64 since it is used by both DAOS and S3 Mode B backends. kTypeS3 is renamed to kTypeMulti since it represents a multi-field packed locator. Wire format values (0x02 and 0x03) are unchanged.

Updated BinaryFormatSpecification.md to register locator types 0x02 (Object64) and 0x03 (Multi) in the type table, and added an Object64 payload format diagram to the well-known payload formats section describing the shared layout used by both types.

Checklist:

  • tested changes locally
  • updated the docs (if necessary)

This PR is a follow-up to #22351

Comment thread tree/ntuple/doc/BinaryFormatSpecification.md
Comment thread tree/ntuple/inc/ROOT/RNTupleTypes.hxx
Comment thread tree/ntuple/inc/ROOT/RNTupleTypes.hxx
Comment thread tree/ntuple/src/RNTupleSerialize.cxx
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 2, 2026

Test Results

    22 files      22 suites   3d 12h 8m 10s ⏱️
 3 865 tests  3 865 ✅ 0 💤 0 ❌
76 256 runs  76 256 ✅ 0 💤 0 ❌

Results for commit 2fca8ca.

♻️ This comment has been updated with latest results.

@JasMehta08 JasMehta08 force-pushed the locator-type-rename branch from 38138a6 to d796341 Compare June 2, 2026 11:48
Comment thread tree/ntuple/src/RNTupleTypes.cxx Outdated
@JasMehta08 JasMehta08 force-pushed the locator-type-rename branch from d796341 to 2fca8ca Compare June 3, 2026 14:44
@jblomer jblomer merged commit 2ede37c into root-project:master Jun 5, 2026
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants