Merge remote-tracking branch 'origin/candidate-9.6.x' into candidate-…

…9.8.x Signed-off-by: Gordon Smith <GordonJSmith@gmail.com> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # version.cmake
hpcc-systems · Dec 4, 2024 · a29e778 · a29e778
2 parents d920928 + a063c66
commit a29e778
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 13 deletions.
diff --git a/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayFixed.xml b/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayFixed.xml
@@ -156,7 +156,9 @@
           <entry><emphasis>compress</emphasis></entry>
 
           <entry>Optional. A boolean TRUE or FALSE flag indicating whether to
-          compress the new file. If omitted, the default is FALSE.</entry>
+          compress the new file. If omitted, the default is TRUE in a
+          containerized deployment and FALSE in a bare-metal
+          deployment.</entry>
         </row>
 
         <row>
@@ -215,7 +217,7 @@
 
           <entry>Override the number of parts to be created when spraying. The
           default is 0 which means it will create the same number of parts as
-          the target cluster. </entry>
+          the target cluster.</entry>
         </row>
 
         <row>

diff --git a/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayJson.xml b/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayJson.xml
@@ -183,7 +183,9 @@
           <entry><emphasis>compress</emphasis></entry>
 
           <entry>Optional. A boolean TRUE or FALSE flag indicating whether to
-          compress the new file. If omitted, the default is FALSE.</entry>
+          compress the new file. If omitted, the default is TRUE in a
+          containerized deployment and FALSE in a bare-metal
+          deployment.</entry>
         </row>
 
         <row>
@@ -242,7 +244,7 @@
 
           <entry>Override the number of parts to be created when spraying. The
           default is 0 which means it will create the same number of parts as
-          the target cluster. </entry>
+          the target cluster.</entry>
         </row>
 
         <row>

diff --git a/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayVariable.xml b/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayVariable.xml
@@ -208,7 +208,9 @@
           <entry><emphasis>compress</emphasis></entry>
 
           <entry>Optional. A boolean TRUE or FALSE flag indicating whether to
-          compress the new file. If omitted, the default is FALSE.</entry>
+          compress the new file. If omitted, the default is TRUE in a
+          containerized deployment and FALSE in a bare-metal
+          deployment.</entry>
         </row>
 
         <row>
@@ -300,7 +302,7 @@
 
           <entry>Override the number of parts to be created when spraying. The
           default is 0 which means it will create the same number of parts as
-          the target cluster. </entry>
+          the target cluster.</entry>
         </row>
 
         <row>

diff --git a/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayXML.xml b/docs/EN_US/ECLStandardLibraryReference/SLR-Mods/SprayXML.xml
@@ -182,7 +182,9 @@
           <entry><emphasis>compress</emphasis></entry>
 
           <entry>Optional. A boolean TRUE or FALSE flag indicating whether to
-          compress the new file. If omitted, the default is FALSE.</entry>
+          compress the new file. If omitted, the default is TRUE in a
+          containerized deployment and FALSE in a bare-metal
+          deployment.</entry>
         </row>
 
         <row>
@@ -241,7 +243,7 @@
 
           <entry>Override the number of parts to be created when spraying. The
           default is 0 which means it will create the same number of parts as
-          the target cluster. </entry>
+          the target cluster.</entry>
         </row>
 
         <row>

diff --git a/system/jhtree/jhtree.cpp b/system/jhtree/jhtree.cpp
@@ -1220,8 +1220,9 @@ CDiskKeyIndex::CDiskKeyIndex(unsigned _iD, IFileIO *_io, const char *_name, bool
     blockedIOSize = _blockedIOSize;
     io.setown(_io);
     KeyHdr hdr;
-    if (io->read(0, sizeof(hdr), &hdr) != sizeof(hdr))
-        throw MakeStringException(0, "Failed to read key header: file too small, could not read %u bytes", (unsigned) sizeof(hdr));
+    offset_t sizeRead = io->read(0, sizeof(hdr), &hdr);
+    if (sizeRead != sizeof(hdr))
+        throw MakeStringException(0, "Failed to read key '%s' header: file too small, could not read %u bytes - read %u", _name, (unsigned) sizeof(hdr), (unsigned)sizeRead);
 
 #ifdef _DEBUG
     //In debug mode always use the trailing header if it is available to ensure that code path is tested
@@ -1231,8 +1232,11 @@ CDiskKeyIndex::CDiskKeyIndex(unsigned _iD, IFileIO *_io, const char *_name, bool
 #endif
     {
         _WINREV(hdr.nodeSize);
-        if (!io->read(io->size() - hdr.nodeSize, sizeof(hdr), &hdr))
-            throw MakeStringException(4, "Invalid key %s: failed to read trailing key header", _name);
+        offset_t actualSize = io->size();
+        offset_t readOffset = actualSize - hdr.nodeSize;
+        sizeRead = io->read(readOffset, sizeof(hdr), &hdr);
+        if (sizeRead != sizeof(hdr))
+            throw MakeStringException(4, "Invalid key %s: failed to read trailing key header at offset %llu, read %u", _name, readOffset, (unsigned)sizeRead);
     }
     init(hdr, isTLK);
 }

diff --git a/system/jlib/jio.cpp b/system/jlib/jio.cpp
@@ -160,7 +160,7 @@ extern jlib_decl size32_t checked_pread(const char * filename, int file, void *b
                     readNow = 0;
                     break;
                 }
-                throw makeErrnoExceptionV(errno, "checked_pread for file '%s'", filename);
+                throw makeErrnoExceptionV(errno, "checked_pread for file '%s' @%lld", filename, pos);
             }
         }
         else if (!readNow)