diff --git a/system/jlib/jstats.cpp b/system/jlib/jstats.cpp index 0c91f8f221c..c24b8b6afa1 100644 --- a/system/jlib/jstats.cpp +++ b/system/jlib/jstats.cpp @@ -983,7 +983,7 @@ static const constexpr StatisticMeta statsMetaData[StMax] = { { NUMSTAT(MatchRightRowsMax), "The largest number of right rows in a join group" }, { NUMSTAT(MatchCandidates), "The number of candidate combinations of left and right rows forming join groups" }, { NUMSTAT(MatchCandidatesMax), "The largest number of candidate combinations of left and right rows in a single group" }, - { NUMSTAT(Threads), "The number of threads (strands) used by activity" }, + { NUMSTAT(Threads), "The number of threads used by activity" }, }; static MapStringTo statisticNameMap(true); diff --git a/thorlcr/graph/thgraphslave.hpp b/thorlcr/graph/thgraphslave.hpp index e1a3edf1125..ad1843bfc30 100644 --- a/thorlcr/graph/thgraphslave.hpp +++ b/thorlcr/graph/thgraphslave.hpp @@ -482,7 +482,7 @@ class graphslave_decl CThorStrandedActivity : public CSlaveActivity protected: void onStartStrands(); public: - CThorStrandedActivity(CGraphElementBase *container, const StatisticsMapping &statsMapping = strandedActivityStatistics) + CThorStrandedActivity(CGraphElementBase *container, const StatisticsMapping &statsMapping = basicActivityStatistics) : CSlaveActivity(container, statsMapping), strandOptions(*container), active(0) { } diff --git a/thorlcr/master/thactivitymaster.cpp b/thorlcr/master/thactivitymaster.cpp index f727bab2e70..f80ee0bd258 100644 --- a/thorlcr/master/thactivitymaster.cpp +++ b/thorlcr/master/thactivitymaster.cpp @@ -170,6 +170,7 @@ class CGenericMasterGraphElement : public CMasterGraphElement case TAKcase: case TAKchildcase: case TAKdegroup: + case TAKproject: case TAKprefetchproject: case TAKprefetchcountproject: case TAKxmlparse: @@ -208,9 +209,6 @@ class CGenericMasterGraphElement : public CMasterGraphElement case TAKemptyaction: ret = new CMasterActivity(this); break; - case TAKproject: - ret = new CMasterActivity(this, strandedActivityStatistics); - break; case TAKsplit: ret = new CMasterActivity(this, nsplitterActivityStatistics); break; diff --git a/thorlcr/thorutil/thormisc.cpp b/thorlcr/thorutil/thormisc.cpp index 8b7d7196749..65bfbcf84e8 100644 --- a/thorlcr/thorutil/thormisc.cpp +++ b/thorlcr/thorutil/thormisc.cpp @@ -75,8 +75,7 @@ static Owned ClusterMPAllocator; // stat. mappings shared between master and slave activities const StatisticsMapping spillStatistics({StTimeSpillElapsed, StTimeSortElapsed, StNumSpills, StSizeSpillFile, StSizePeakTempDisk}); const StatisticsMapping soapcallStatistics({StTimeSoapcall}); -const StatisticsMapping basicActivityStatistics({StTimeTotalExecute, StTimeLocalExecute, StTimeBlocked}); -const StatisticsMapping strandedActivityStatistics({StNumThreads}, basicActivityStatistics); +const StatisticsMapping basicActivityStatistics({StTimeTotalExecute, StTimeLocalExecute, StTimeBlocked, StNumThreads}); const StatisticsMapping groupActivityStatistics({StNumGroups, StNumGroupMax}, basicActivityStatistics); const StatisticsMapping hashJoinActivityStatistics({StNumLeftRows, StNumRightRows}, basicActivityStatistics); const StatisticsMapping indexReadFileStatistics({}, diskReadRemoteStatistics, jhtreeCacheStatistics); diff --git a/thorlcr/thorutil/thormisc.hpp b/thorlcr/thorutil/thormisc.hpp index 525af1192a2..cf0b92bb4b0 100644 --- a/thorlcr/thorutil/thormisc.hpp +++ b/thorlcr/thorutil/thormisc.hpp @@ -146,7 +146,6 @@ extern graph_decl const StatisticsMapping spillStatistics; extern graph_decl const StatisticsMapping jhtreeCacheStatistics; extern graph_decl const StatisticsMapping soapcallStatistics; extern graph_decl const StatisticsMapping basicActivityStatistics; -extern graph_decl const StatisticsMapping strandedActivityStatistics; extern graph_decl const StatisticsMapping groupActivityStatistics; extern graph_decl const StatisticsMapping hashJoinActivityStatistics; extern graph_decl const StatisticsMapping indexReadActivityStatistics;