Merge pull request #17238 from ghalliday/issue29369

HPCC-29369 Avoid including 'randrow' compression in unittests Reviewed-By: Attila Vamos <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Apr 17, 2023 · c4b2df9 · c4b2df9
2 parents 3aa3c72 + 42cf2a9
commit c4b2df9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/system/jlib/jlzw.cpp b/system/jlib/jlzw.cpp
@@ -1651,7 +1651,7 @@ class jlib_decl CRandRDiffCompressor : public ICompressor, public CInterface
     void close()
     {
         header->rowofs[0] = (unsigned short)diffbuf.length();
-        ASSERT((size32_t)(header->totsize+header->firstrlesize)<=max);
+        ASSERT((size32_t)(header->totsize+header->firstrlesize)<=max || max == 0);
         unsigned short hofs = header->hsize();
         ASSERT(header->totsize==hofs+diffbuf.length());
         if (outBufMb)
@@ -1661,9 +1661,12 @@ class jlib_decl CRandRDiffCompressor : public ICompressor, public CInterface
             outBufMb = NULL;
         }
         byte *out = (byte *)outbuf+hofs;
-        memcpy(out,diffbuf.toByteArray(),diffbuf.length());
-        out += diffbuf.length();
-        diffbuf.clear();
+        if (diffbuf.length())
+        {
+            memcpy(out,diffbuf.toByteArray(),diffbuf.length());
+            out += diffbuf.length();
+            diffbuf.clear();
+        }
         memcpy(out,firstrle.bufferBase(),header->firstrlesize);
         header->totsize += header->firstrlesize;
         firstrle.clear();

diff --git a/testing/unittests/jlibtests.cpp b/testing/unittests/jlibtests.cpp
@@ -2686,6 +2686,9 @@ class JlibCompressionTestsStress : public CppUnit::TestFixture
             {
                 compressed.clear();
                 ICompressHandler &handler = iter->query();
+                //Ignore unusual compressors with no expanders...
+                if (strieq(handler.queryType(), "randrow"))
+                    continue;
                 Owned<ICompressor> compressor = handler.getCompressor(streq("AES", handler.queryType()) ? aesKey: nullptr);
 
                 CCycleTimer timer;