Build with TLeafG fix

Author: linev

build/jsroot.js

@@ -14,7 +14,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '16/02/2026',
+version_date = '17/02/2026',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -127242,6 +127242,7 @@ async function treeProcess(tree, selector, args) {
          case 'TLeafS': datakind = leaf.fIsUnsigned ? kUShort : kShort; break;
          case 'TLeafI': datakind = leaf.fIsUnsigned ? kUInt : kInt; break;
          case 'TLeafL': datakind = leaf.fIsUnsigned ? kULong64 : kLong64; break;
+         case 'TLeafG': datakind = leaf.fIsUnsigned ? kULong : kLong; break;
          case 'TLeafC': datakind = kTString; break;
          default: return null;
       }
@@ -177671,13 +177672,9 @@ class RNTupleDescriptorBuilder {
          return;
 
       const reader = new RBufferReader(header_blob),
-
             payloadStart = reader.offset,
             // Read the envelope metadata
-            {
-               envelopeLength
-            } = this._readEnvelopeMetadata(reader),
-
+            { envelopeLength } = this._readEnvelopeMetadata(reader),
             // Seek to end of envelope to get checksum
             checksumPos = payloadStart + envelopeLength - 8,
             currentPos = reader.offset;
@@ -177708,7 +177705,6 @@ class RNTupleDescriptorBuilder {
       // Read the envelope metadata
       this._readEnvelopeMetadata(reader);
 
-
       // Feature flag(32 bits)
       this._readFeatureFlags(reader);
       // Header checksum (64-bit xxhash3)
@@ -177730,7 +177726,6 @@ class RNTupleDescriptorBuilder {
 
    _readEnvelopeMetadata(reader) {
       const typeAndLength = reader.readU64(),
-
             // Envelope metadata
             // The 16 bits are the envelope type ID, and the 48 bits are the envelope length
             envelopeType = Number(typeAndLength & 0xFFFFn),
@@ -177791,7 +177786,6 @@ class RNTupleDescriptorBuilder {
                parentFieldId = reader.readU32(),
                structRole = reader.readU16(),
                flags = reader.readU16(),
-
                fieldName = reader.readString(),
                typeName = reader.readString(),
                typeAlias = reader.readString(),
@@ -177809,7 +177803,6 @@ class RNTupleDescriptorBuilder {
          if (flags & kFlagHasTypeChecksum)
             checksum = reader.readU32();
 
-
          fieldDescriptors.push({
             fieldVersion,
             typeVersion,
@@ -177915,7 +177908,6 @@ class RNTupleDescriptorBuilder {
          throw new Error('Extra type info frame is not a list frame, which is required.');
 
       const entryCount = reader.readU32(),
-
             extraTypeInfo = [];
       for (let i = 0; i < entryCount; ++i) {
          const recordStart = BigInt(reader.offset),
@@ -177963,10 +177955,7 @@ class RNTupleDescriptorBuilder {
          throw new Error('Non-standard locators (T=1) not supported yet');
       const size = sizeAndType,
             offset = reader.readU64(); // 8 bytes: offset
-      return {
-         size,
-         offset
-      };
+      return { size, offset };
    }
 
    deserializePageList(page_list_blob) {
@@ -178101,15 +178090,15 @@ class RNTupleDescriptorBuilder {
 async function readHeaderFooter(tuple) {
    // if already read - return immediately, make possible to call several times
    if (tuple?.builder)
-      return true;
+      return tuple.builder;
 
-   if (!tuple.$file)
-      return false;
+   if (!tuple?.$file)
+      return null;
 
    // request header and footer buffers from the file
    return tuple.$file.readBuffer([tuple.fSeekHeader, tuple.fNBytesHeader, tuple.fSeekFooter, tuple.fNBytesFooter]).then(blobs => {
       if (blobs?.length !== 2)
-         return false;
+         throw new Error('Failure reading header or footer blobs');
 
       // Handle both compressed and uncompressed cases
       const processBlob = (blob, uncompressedSize) => {
@@ -178122,47 +178111,47 @@ async function readHeaderFooter(tuple) {
       return Promise.all([
          processBlob(blobs[0], tuple.fLenHeader),
          processBlob(blobs[1], tuple.fLenFooter)
-      ]).then(unzip_blobs => {
-         const [header_blob, footer_blob] = unzip_blobs;
-         if (!header_blob || !footer_blob)
-            return false;
-
-         tuple.builder = new RNTupleDescriptorBuilder;
-         tuple.builder.deserializeHeader(header_blob);
-         tuple.builder.deserializeFooter(footer_blob);
-
-         // Deserialize Page List
-         const group = tuple.builder.clusterGroups?.[0];
-         if (!group || !group.pageListLocator)
-            throw new Error('No valid cluster group or page list locator found');
-
-         const offset = Number(group.pageListLocator.offset),
-               size = Number(group.pageListLocator.size),
-               uncompressedSize = Number(group.pageListLength);
-
-         return tuple.$file.readBuffer([offset, size]).then(page_list_blob => {
-            if (!(page_list_blob instanceof DataView))
-               throw new Error(`Expected DataView from readBuffer, got ${Object.prototype.toString.call(page_list_blob)}`);
-
-            // Check if page list data is uncompressed
-            if (page_list_blob.byteLength === uncompressedSize) {
-               // Data is uncompressed, use directly
-               tuple.builder.deserializePageList(page_list_blob);
-               return true;
-            }
-            // Attempt to decompress the page list
-            return R__unzip(page_list_blob, uncompressedSize).then(unzipped_blob => {
-               if (!(unzipped_blob instanceof DataView))
-                  throw new Error(`Unzipped page list is not a DataView, got ${Object.prototype.toString.call(unzipped_blob)}`);
-
-               tuple.builder.deserializePageList(unzipped_blob);
-               return true;
-            });
-         });
-      });
+      ]);
+   }).then(unzip_blobs => {
+      const [header_blob, footer_blob] = unzip_blobs;
+      if (!header_blob || !footer_blob)
+         throw new Error('Failure when uncompress header and footer blobs');
+
+      tuple.builder = new RNTupleDescriptorBuilder;
+      tuple.builder.deserializeHeader(header_blob);
+      tuple.builder.deserializeFooter(footer_blob);
+
+      // Deserialize Page List
+      const group = tuple.builder.clusterGroups?.[0];
+      if (!group || !group.pageListLocator)
+         throw new Error('No valid cluster group or page list locator found');
+
+      const offset = Number(group.pageListLocator.offset),
+            size = Number(group.pageListLocator.size);
+
+      return tuple.$file.readBuffer([offset, size]);
+   }).then(page_list_blob => {
+      if (!(page_list_blob instanceof DataView))
+         throw new Error(`Expected DataView from readBuffer, got ${Object.prototype.toString.call(page_list_blob)}`);
+
+      const group = tuple.builder.clusterGroups?.[0],
+            uncompressedSize = Number(group.pageListLength);
+
+      // Check if page list data is uncompressed
+      if (page_list_blob.byteLength === uncompressedSize)
+         return page_list_blob;
+
+      // Attempt to decompress the page list
+      return R__unzip(page_list_blob, uncompressedSize);
+   }).then(unzipped_blob => {
+      if (!(unzipped_blob instanceof DataView))
+         throw new Error(`Unzipped page list is not a DataView, got ${Object.prototype.toString.call(unzipped_blob)}`);
+
+      tuple.builder.deserializePageList(unzipped_blob);
+      return tuple.builder;
    }).catch(err => {
       console.error('Error during readHeaderFooter execution:', err);
-      throw err;
+      return null;
    });
 }
 
@@ -178210,6 +178199,8 @@ class ReaderItem {
       }
    }
 
+   reset_extras() {}
+
    shift_o(sz) {
       this.o += sz;
       while ((this.o >= this.view_len) && this.view_len) {
@@ -178451,6 +178442,10 @@ class StringReaderItem extends ReaderItem {
       this.off0 = 0;
    }
 
+   reset_extras() {
+      this.off0 = 0;
+   }
+
    func(tgtobj) {
       const tmp = {};
       this.items[0].func(tmp);
@@ -178510,6 +178505,10 @@ class CollectionReaderItem extends ReaderItem {
       items[1].set_not_simple();
    }
 
+   reset_extras() {
+      this.off0 = 0;
+   }
+
    func(tgtobj) {
       const arr = [], tmp = {};
       this.items[0].func(tmp);
@@ -178611,20 +178610,27 @@ async function rntupleProcess(rntuple, selector, args = {}) {
    };
 
    function readNextPortion(inc_cluster) {
-      if (inc_cluster) {
-         handle.current_cluster++;
-         handle.current_cluster_first_entry = handle.current_cluster_last_entry;
-      }
+      let do_again = true, numClusterEntries, locations;
 
-      const locations = rntuple.builder.pageLocations[handle.current_cluster];
-      if (!locations) {
-         selector.Terminate(true);
-         return selector;
-      }
+      while (do_again) {
+         if (inc_cluster) {
+            handle.current_cluster++;
+            handle.current_cluster_first_entry = handle.current_cluster_last_entry;
+         }
+
+         locations = rntuple.builder.pageLocations[handle.current_cluster];
+         if (!locations) {
+            selector.Terminate(true);
+            return selector;
+         }
 
-      const numClusterEntries = rntuple.builder.clusterSummaries[handle.current_cluster].numEntries;
+         numClusterEntries = rntuple.builder.clusterSummaries[handle.current_cluster].numEntries;
 
-      handle.current_cluster_last_entry = handle.current_cluster_first_entry + numClusterEntries;
+         handle.current_cluster_last_entry = handle.current_cluster_first_entry + numClusterEntries;
+
+         do_again = inc_cluster && handle.process_entries &&
+                    (handle.process_entries[handle.process_entries_indx] >= handle.current_cluster_last_entry);
+      }
 
       // calculate entries which can be extracted from the cluster
       let emin, emax;
@@ -178651,8 +178657,9 @@ async function rntupleProcess(rntuple, selector, args = {}) {
       }).then(unzipBlobs => {
          unzipBlobs.map((rawblob, idx) => itemsToRead[idx].reconstructBlob(rawblob, pagesToRead[idx]));
 
-         for (let indx = 0; indx < handle.columns.length; ++indx)
-            handle.columns[indx].init_o();
+         // reset reading pointer after all buffers are there
+         handle.columns.forEach(item => item.init_o());
+         handle.arr.forEach(item => item.reset_extras());
 
          let skip_entries = handle.current_entry - handle.current_cluster_first_entry;
 

changes.md

@@ -20,6 +20,7 @@
 1. Introduce `settings.ServerTimeout` global timeout for THttpServer operations
 1. Let set custom color palette with `setColorPalette` function
 1. Fix - paint frame border mode/size from TCanvas
+1. Fix - add TLeafG support to TTree #397
 
 
 ## Changes in 7.10.2

modules/core.mjs

@@ -6,7 +6,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '16/02/2026',
+version_date = '17/02/2026',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}