Merge pull request #10820 from richardkchapman/hpcc18808

HPCC-18808 Roxie and hthor are interpreting skipFileFormatCrcCheck wrongly

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

ecl/hthor/hthor.cpp

@@ -549,7 +549,7 @@ void CHThorDiskWriteActivity::open()
     unsigned rwFlags = rw_autoflush;
     if(grouped)
         rwFlags |= rw_grouped;
-    if(!agent.queryWorkUnit()->getDebugValueBool("skipFileFormatCrcCheck", false) && !(helper.getFlags() & TDRnocrccheck))
+    if(!(helper.getFlags() & TDRnocrccheck))
         rwFlags |= rw_crc;
     IExtRowWriter * writer = createRowWriter(diskout, rowIf, rwFlags);
     outSeq.setown(writer);

roxie/ccd/ccdserver.cpp

@@ -11633,7 +11633,7 @@ public:
         diskout.setown(createBufferedIOStream(io));
         if (extend)
             diskout->seek(0, IFSend);
-        tallycrc = !factory->queryQueryFactory().queryOptions().skipFileFormatCrcCheck && !(helper.getFlags() & TDRnocrccheck) && !blockcompressed;
+        tallycrc = !(helper.getFlags() & TDRnocrccheck) && !blockcompressed;
         Owned<IRowInterfaces> rowIf = createRowInterfaces(input->queryOutputMeta(), activityId, factory->getHeapFlags(), ctx->queryCodeContext());
         rowSerializer.set(rowIf->queryRowSerializer());
         unsigned rwFlags = rw_autoflush;