浏览代码

Merge pull request #11141 from shamser/issue19650

HPCC-19650 Ensure all activities have text/label associated with them

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 7 年之前
父节点
当前提交
359a804a7f
共有 1 个文件被更改,包括 21 次插入3 次删除
  1. 21 3
      common/thorhelper/thorcommon.cpp

+ 21 - 3
common/thorhelper/thorcommon.cpp

@@ -710,14 +710,19 @@ extern const char * getActivityText(ThorActivityKind kind)
     case TAKdiskaggregate:          return "Disk Aggregate";
     case TAKdiskcount:              return "Disk Count";
     case TAKdiskgroupaggregate:     return "Disk Grouped Aggregate";
+    case TAKdiskexists:             return "Disk Exists";
     case TAKindexread:              return "Index Read";   
     case TAKindexnormalize:         return "Index Normalize";
     case TAKindexaggregate:         return "Index Aggregate";
     case TAKindexcount:             return "Index Count";
     case TAKindexgroupaggregate:    return "Index Grouped Aggregate";
+    case TAKindexexists:            return "Index Exists";
+    case TAKchildread:              return "Child Read";
     case TAKchildnormalize:         return "Child Normalize";
     case TAKchildaggregate:         return "Child Aggregate";
+    case TAKchildcount:             return "Child Count";
     case TAKchildgroupaggregate:    return "Child Grouped Aggregate";
+    case TAKchildexists:            return "Child Exists";
     case TAKchildthroughnormalize:  return "Normalize";
     case TAKcsvread:                return "Csv Read";
     case TAKxmlread:                return "Xml Read";
@@ -730,6 +735,11 @@ extern const char * getActivityText(ThorActivityKind kind)
     case TAKcombinegroup:           return "Combine Group";
     case TAKlookupdenormalize:      return "Lookup Denormalize";
     case TAKalldenormalize:         return "All Denormalize";
+    case TAKsmartdenormalizegroup:  return "Smart Denormalize Group";
+    case TAKunknowndenormalizegroup1: return "Unknown Denormalize Group1";
+    case TAKunknowndenormalizegroup2: return "Unknown Denormalize Group2";
+    case TAKunknowndenormalizegroup3: return "Unknown Denormalize Group3";
+    case TAKlastdenormalizegroup:    return "Last Denormalize Group";
     case TAKdenormalizegroup:       return "Denormalize Group";
     case TAKhashdenormalizegroup:   return "Hash Denormalize Group";
     case TAKlookupdenormalizegroup: return "Lookup Denormalize Group";
@@ -775,11 +785,13 @@ extern const char * getActivityText(ThorActivityKind kind)
     case TAKcatch:                  return "Catch";
     case TAKskipcatch:              return "Skip Catch";
     case TAKcreaterowcatch:         return "OnFail Catch";
-    case TAKsectioninput:               return "Section Input";
+    case TAKsectioninput:           return "Section Input";
+    case TAKcaseaction:             return "Case Action";
     case TAKindexgroupcount:        return "Index Grouped Count";
-    case TAKindexgroupexists:   return "Index Grouped Exists";
+    case TAKindexgroupexists:       return "Index Grouped Exists";
     case TAKhashdistributemerge:    return "Distribute Merge";
     case TAKselfjoinlight:          return "Lightweight Self Join";
+    case TAKlastjoin:               return "Last Join";
     case TAKwhen_dataset:           return "When";
     case TAKhttp_rowdataset:        return "HTTP dataset";
     case TAKstreamediterator:       return "Streamed Dataset";
@@ -791,8 +803,14 @@ extern const char * getActivityText(ThorActivityKind kind)
     case TAKdictionaryworkunitwrite:return "Dictionary Write";
     case TAKdictionaryresultwrite:  return "Dictionary Result";
     case TAKsmartjoin:              return "Smart Join";
+    case TAKunknownjoin1:           return "Unknown Join1";
+    case TAKunknownjoin2:           return "Unknown Join2";
+    case TAKunknownjoin3:           return "Unknown Join3";
     case TAKsmartdenormalize:       return "Smart Denormalize";
-    case TAKsmartdenormalizegroup:  return "Smart Denormalize Group";
+    case TAKunknowndenormalize1:    return "Unknown Denormalize1";
+    case TAKunknowndenormalize2:    return "Unknown Denormalize2";
+    case TAKunknowndenormalize3:    return "Unknown Denormalize3";
+    case TAKlastdenormalize:        return "Last Denormalize";
     case TAKselfdenormalize:        return "Self Denormalize";
     case TAKselfdenormalizegroup:   return "Self Denormalize Group";
     case TAKtrace:                  return "Trace";