Pārlūkot izejas kodu

Merge pull request #15972 from AttilaVamos/HPCC-27472-fix-master

HPCC-27472 All ECL test code fails in Debug build.

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 3 gadi atpakaļ
vecāks
revīzija
f26cee6843
3 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 2 2
      common/workunit/wuattr.cpp
  2. 1 1
      common/workunit/wuattr.hpp
  3. 1 1
      ecl/hqlcpp/hqlhtcpp.cpp

+ 2 - 2
common/workunit/wuattr.cpp

@@ -150,7 +150,7 @@ const static WuAttrInfo attrInfo[] = {
     CHILD(DiskFormat, SMeasureText, "diskFormat"),
     CHILD(RecordFormat, SMeasureText, "recordFormat"),
     CHILD(ServiceName, SMeasureText, "serviceName"),
-    CHILD(ComplexHelperSize, SMeasureSize, "complexHelperSize"),
+    CHILD(SizeComplexHelper, SMeasureSize, "complexHelperSize"),
     { WaMax, SMeasureNone, nullptr, nullptr, nullptr, nullptr, nullptr, WaNone, WaNone }
 };
 
@@ -175,7 +175,7 @@ MODULE_INIT(INIT_PRIORITY_STANDARD)
         if (info.name && prefix && *prefix)
         {
             if (!startsWith(info.name, prefix))
-                printf("Mismatched prefix %s %s\n", info.name, prefix);
+                printf("Mismatched prefix of the attribute name:'%s'. The expected prefix is: '%s'\n", info.name, prefix);
         }
 #endif
 

+ 1 - 1
common/workunit/wuattr.hpp

@@ -135,7 +135,7 @@ enum WuAttr : unsigned
     WaDiskFormat,
     WaRecordFormat,
     WaServiceName,
-    WaComplexHelperSize,
+    WaSizeComplexHelper,
     WaMax
 };
 inline WuAttr & operator++(WuAttr & x) { assert(x<WaMax); x = (WuAttr)(x+1); return x; }

+ 1 - 1
ecl/hqlcpp/hqlhtcpp.cpp

@@ -2411,7 +2411,7 @@ void ActivityInstance::buildSuffix()
             if ((options.complexClassesActivityFilter == 0) || (kind == options.complexClassesActivityFilter))
             {
                 translator.WARNING2(CategoryEfficiency, HQLWRN_ComplexHelperClass, activityId, approxSize);
-                addAttributeInt(WaComplexHelperSize, approxSize);
+                addAttributeInt(WaSizeComplexHelper, approxSize);
             }
         }
         if (!options.obfuscateOutput && options.showActivitySizeInGraph)