Skip to content

Feature/removed hardcoded column handling #352

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 18, 2025
Merged

Feature/removed hardcoded column handling #352

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a58d1eb
column orientation of rntuple field orientation
Krmjn09 Jul 17, 2025
d0611e1
Doing the suggested changes
Krmjn09 Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 26 additions & 16 deletions modules/rntuple.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ class RNTupleDescriptorBuilder {
values.push(val);
}

console.log(`Deserialized ${values.length} values for column:`, values);
return values;
}


Expand Down Expand Up @@ -721,11 +721,11 @@ async function readHeaderFooter(tuple) {
// Read and process the next data cluster from the RNTuple
function readNextCluster(rntuple, selector) {
const builder = rntuple.builder,
clusterIndex = selector.currentCluster,
clusterSummary = builder.clusterSummaries[clusterIndex],
clusterIndex = selector.currentCluster,
clusterSummary = builder.clusterSummaries[clusterIndex],

// Gather all pages for this cluster from all columns
pages = [];
// Gather all pages for this cluster from all columns
pages = [];

for (const columns of Object.values(rntuple.fieldToColumns)) {
for (const colDesc of columns) {
Expand All @@ -744,23 +744,33 @@ function readNextCluster(rntuple, selector) {

return rntuple.$file.readBuffer(dataToRead).then(blobsRaw => {
const blobs = Array.isArray(blobsRaw) ? blobsRaw : [blobsRaw],
unzipPromises = blobs.map((blob, idx) => {
unzipPromises = blobs.map((blob, idx) => {
const { page, colDesc } = pages[idx],
numElements = Number(page.numElements),
elementSize = colDesc.bitsOnStorage / 8;
return R__unzip(blob, numElements * elementSize);
});
numElements = Number(page.numElements),
elementSize = colDesc.bitsOnStorage / 8;
return R__unzip(blob, numElements * elementSize);
});

return Promise.all(unzipPromises).then(unzipBlobs => {
rntuple._clusterData = {}; // store deserialized data per field

for (let i = 0; i < unzipBlobs.length; ++i) {
const { colDesc } = pages[i],
field = builder.fieldDescriptors[colDesc.fieldId];
rntuple.builder.deserializePage(unzipBlobs[i], colDesc, field);
const {
colDesc
} = pages[i],
field = builder.fieldDescriptors[colDesc.fieldId],
values = rntuple.builder.deserializePage(unzipBlobs[i], colDesc, field);

// TODO: Handle fields with multiple columns (e.g., data + metadata).
// For now, we only store the first column's data to avoid overwriting.
if (!rntuple._clusterData[field.fieldName])
rntuple._clusterData[field.fieldName] = values;
}

const reader = new RBufferReader(unzipBlobs[0].buffer); // pick one column as example
for (let i = 0; i < clusterSummary.numEntries; ++i) {
selector.tgtobj.myDouble = reader.readF64(); // TODO: Replace with real field extraction later
const numEntries = clusterSummary.numEntries;
for (let i = 0; i < numEntries; ++i) {
for (const [fieldName, values] of Object.entries(rntuple._clusterData))
selector.tgtobj[fieldName] = values[i];
selector.Process();
}

Expand Down
Loading