Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ntuple] Clean up utility definitions #17359

Open
wants to merge 18 commits into
base: master
Choose a base branch
from

Conversation

jblomer
Copy link
Contributor

@jblomer jblomer commented Jan 7, 2025

Preparation to move the common definitions from RNTupleUtil.h out of the experimental namespace. Some definitions are removed or moved to ROOT::Internal. Some API improvements for the remaining public types.

Part of the PR series to move an initial set of RNTuple APIs out of the experimental namespace.

@jblomer jblomer self-assigned this Jan 7, 2025
@jblomer jblomer force-pushed the ntuple-cleanup-utils branch from d2d61ea to 8f0cb39 Compare January 7, 2025 09:32
@jblomer jblomer changed the title [ntuple] Move utility definitions out of experimental [ntuple] Clean up utility definitions Jan 7, 2025
Copy link

github-actions bot commented Jan 7, 2025

Test Results

    17 files      17 suites   3d 20h 51m 17s ⏱️
 2 694 tests  2 679 ✅ 0 💤 15 ❌
43 990 runs  43 904 ✅ 0 💤 86 ❌

For more details on these failures, see this check.

Results for commit 0dff097.

♻️ This comment has been updated with latest results.

@jblomer jblomer force-pushed the ntuple-cleanup-utils branch from 94af528 to cfc6ab2 Compare January 7, 2025 12:29
Copy link
Member

@hahnjo hahnjo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally LGTM, but some comments especially regarding NBytesOnDisk. Not sure if giving up abstraction is an improvement...

tree/ntuple/v7/inc/ROOT/RNTupleUtil.hxx Show resolved Hide resolved
/// TODO(jblomer): consider moving this to `RNTupleDescriptor`
struct RNTupleLocator {
class RNTupleLocator {
public:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, what's the advantage of a class if we have getters and setters without further checks? Looking at the changes in this commit, a struct feels more ergonomic...

Copy link
Contributor Author

@jblomer jblomer Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's to be more resilient to future changes. Maybe we want to rename a member, or add a check (e.g., if the type used in fPosition fits the locator type).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. There is still a forward declaration of struct RNTupleLocator; in RPageStorageFile.hxx that is now causing warnings...

tree/ntuple/v7/inc/ROOT/RNTupleUtil.hxx Outdated Show resolved Hide resolved
tree/ntuple/v7/inc/ROOT/RNTupleDescriptor.hxx Outdated Show resolved Hide resolved
@jblomer jblomer changed the title [ntuple] Clean up utility definitions [ntuple] Clean up public utility definitions Jan 7, 2025
@jblomer jblomer changed the title [ntuple] Clean up public utility definitions [ntuple] Clean up utility definitions Jan 7, 2025
@jblomer jblomer force-pushed the ntuple-cleanup-utils branch from cfc6ab2 to f12814c Compare January 7, 2025 15:23
@jblomer jblomer force-pushed the ntuple-cleanup-utils branch from f12814c to 75be5ac Compare January 7, 2025 15:24
/// TODO(jblomer): consider moving this to `RNTupleDescriptor`
struct RNTupleLocator {
class RNTupleLocator {
public:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. There is still a forward declaration of struct RNTupleLocator; in RPageStorageFile.hxx that is now causing warnings...

@jblomer jblomer force-pushed the ntuple-cleanup-utils branch from 75be5ac to 0dff097 Compare January 8, 2025 09:11
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.

2 participants