瀏覽代碼

Merge pull request #15906 from ghalliday/binaryResource

HPCC-27346 Refactor workunit loading in preparation for binary switch

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 3 年之前
父節點
當前提交
4c23af915e
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      ecl/eclccserver/eclccserver.cpp
  2. 1 1
      ecl/hqlcpp/hqlecl.cpp

+ 1 - 1
ecl/eclccserver/eclccserver.cpp

@@ -709,7 +709,7 @@ class EclccCompileThread : implements IPooledThread, implements IErrorReporter,
                         workunit->setJobName(jobname);
                     if (!workunit->getDebugValueBool("obfuscateOutput", false))
                     {
-                        StringBuffer wuXML;
+                        StringBuffer wuXML; // Not sure this is a good idea.... better to always get it from the dll resource
                         Owned<IWUQuery> query = workunit->updateQuery();
                         if (getArchiveXMLFromFile(realdllfilename, wuXML.clear()))  // MORE - if what was submitted was an archive, this is probably pointless?
                             query->setQueryText(wuXML.str());

+ 1 - 1
ecl/hqlcpp/hqlecl.cpp

@@ -603,7 +603,7 @@ bool HqlDllGenerator::generateCode(HqlQueryContext & query)
 
 void HqlDllGenerator::addWorkUnitAsResource()
 {
-    bool defaultBinaryWorkunit = false;
+    bool defaultBinaryWorkunit = true;
     if (wu->getDebugValueInt("saveBinaryWorkunit", defaultBinaryWorkunit))
     {
         MemoryBuffer wuBinary;