[rntuple] remove old implementation

Author: linev

modules/rntuple.mjs

@@ -963,132 +963,6 @@ function getSelectorFieldName(selector, i) {
    return isStr(br) ? br : br?.fieldName;
 }
 
-// Read and process the next data cluster from the RNTuple
-async function readNextCluster(rntuple, selector) {
-   const builder = rntuple.builder;
-
-   // Add validation
-   if (!builder.clusterSummaries)
-      throw new Error('No cluster summaries available - possibly incomplete file reading');
-
-   const clusterIndex = selector.currentCluster,
-         clusterSummary = builder.clusterSummaries[clusterIndex],
-      // Gather all pages for this cluster from selected fields only
-         pages = [],
-      // Collect only selected field names from selector
-         selectedFields = [];
-
-   if (!clusterSummary) {
-      selector.Terminate(clusterIndex > 0);
-      return false;
-   }
-
-   for (let i = 0; i < selector.numBranches(); ++i)
-      selectedFields.push(getSelectorFieldName(selector, i));
-
-   // For each selected field, collect its columns' pages
-   for (const fieldName of selectedFields) {
-      const columns = rntuple.fieldToColumns[fieldName];
-      if (!columns)
-         throw new Error(`Selected field '${fieldName}' not found in RNTuple`);
-
-      for (const colDesc of columns) {
-         const colEntry = builder.pageLocations[clusterIndex]?.[colDesc.index];
-
-         // When the data is missing or broken
-         if (!colEntry || !colEntry.pages)
-            throw new Error(`No pages for column ${colDesc.index} in cluster ${clusterIndex}`);
-
-         for (const page of colEntry.pages)
-            pages.push({ page, colDesc, fieldName });
-      }
-   }
-
-   selector.currentCluster++;
-
-   // Early exit if no pages to read (i.e., no selected fields matched)
-   if (pages.length === 0) {
-      selector.Terminate(false);
-      return false;
-   }
-
-   // Build flat array of [offset, size, offset, size, ...] to read pages
-   const dataToRead = pages.flatMap(p =>
-      [Number(p.page.locator.offset), Number(p.page.locator.size)]
-   );
-
-   return rntuple.$file.readBuffer(dataToRead).then(blobsRaw => {
-      const blobs = Array.isArray(blobsRaw) ? blobsRaw : [blobsRaw],
-            unzipPromises = blobs.map((blob, idx) => {
-               const { page, colDesc } = pages[idx],
-                     colEntry = builder.pageLocations[clusterIndex][colDesc.index], // Access column entry
-                     numElements = Number(page.numElements),
-                     elementSize = colDesc.bitsOnStorage / 8;
-
-               // Check if data is compressed
-               if (colEntry.compression === 0)
-                  return Promise.resolve(blob); // Uncompressed: use blob directly
-               const expectedSize = numElements * elementSize;
-
-               // Special handling for boolean fields
-               if (colDesc.coltype === ENTupleColumnType.kBit) {
-                  const expectedBoolSize = Math.ceil(numElements / 8);
-                  if (blob.byteLength === expectedBoolSize)
-                     return Promise.resolve(blob);
-                  // Try decompression but catch errors for boolean fields
-                  return R__unzip(blob, expectedBoolSize).catch(err => {
-                     throw new Error(`Failed to unzip boolean page ${idx}: ${err.message}`);
-                  });
-               }
-
-               // If the blob is already the expected size, treat as uncompressed
-               if (blob.byteLength === expectedSize)
-                  return Promise.resolve(blob);
-
-               // Try decompression
-               return R__unzip(blob, expectedSize).then(result => {
-                  if (!result)
-                     return blob; // Fallback to original blob
-                  return result;
-               }).catch(err => {
-                  throw new Error(`Failed to unzip page ${idx}: ${err.message}`);
-               });
-            });
-
-      return Promise.all(unzipPromises).then(unzipBlobs => {
-         rntuple._clusterData = {}; // store deserialized data per column index
-
-         for (let i = 0; i < unzipBlobs.length; ++i) {
-            const blob = unzipBlobs[i];
-            // Ensure blob is a DataView
-            if (!(blob instanceof DataView))
-               throw new Error(`Invalid blob type for page ${i}: ${Object.prototype.toString.call(blob)}`);
-            const colDesc = pages[i].colDesc,
-                  values = builder.deserializePage(blob, colDesc, pages[i].page);
-
-            // Support multiple representations (e.g., string fields with offsets + payload)
-            if (!rntuple._clusterData[colDesc.index])
-               rntuple._clusterData[colDesc.index] = [];
-
-            rntuple._clusterData[colDesc.index].push(values);
-         }
-
-         const numEntries = clusterSummary.numEntries;
-         for (let i = 0; i < numEntries; ++i) {
-            for (let b = 0; b < selector.numBranches(); ++b) {
-               const fieldName = getSelectorFieldName(selector, b),
-                     tgtName = selector.nameOfBranch(b);
-
-               selector.tgtobj[tgtName] = readEntry(rntuple, fieldName, clusterIndex, i);
-            }
-            selector.Process(selector.currentEntry++);
-         }
-
-         return readNextCluster(rntuple, selector);
-      });
-   });
-}
-
 class ReaderItem {
 
    constructor(column, name) {
@@ -1523,21 +1397,6 @@ async function rntupleProcess(rntuple, selector, args) {
 }
 
 
-// TODO args can later be used to filter fields, limit entries, etc.
-// Create reader and deserialize doubles from the buffer
-function rntupleProcessOld(rntuple, selector, args) {
-   selector.Begin();
-   return readHeaderFooter(rntuple).then(res => {
-      if (!res) {
-         selector.Terminate(false);
-         return selector;
-      }
-      selector.currentCluster = 0;
-      selector.currentEntry = 0;
-      return readNextCluster(rntuple, selector, args);
-   }).then(() => selector);
-}
-
 class TDrawSelectorTuple extends TDrawSelector {
 
    /** @summary Return total number of entries