From 7e4f22417e7e3ed17c68bb667f0c7762eac751e1 Mon Sep 17 00:00:00 2001 From: Shamser Ahmed Date: Thu, 2 Jul 2020 13:29:21 +0100 Subject: [PATCH] HPCC-24354 Generate StNumIndexWildSeeks for hThor Signed-off-by: Shamser Ahmed --- ecl/hthor/hthorkey.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ecl/hthor/hthorkey.cpp b/ecl/hthor/hthorkey.cpp index 261250702cb..ff76057b53d 100644 --- a/ecl/hthor/hthorkey.cpp +++ b/ecl/hthor/hthorkey.cpp @@ -254,6 +254,7 @@ class CHThorIndexReadActivityBase : public CHThorActivityBase progress.addStatistic(StNumPostFiltered, queryPostFiltered()); progress.addStatistic(StNumIndexSeeks, querySeeks()); progress.addStatistic(StNumIndexScans, queryScans()); + progress.addStatistic(StNumIndexWildSeeks, queryWildSeeks()); } virtual unsigned querySeeks() const @@ -264,6 +265,10 @@ class CHThorIndexReadActivityBase : public CHThorActivityBase { return scans + (klManager ? klManager->queryScans() : 0); } + virtual unsigned queryWildSeeks() const + { + return wildseeks + (klManager ? klManager->queryWildSeeks() : 0); + } virtual unsigned queryPostFiltered() const { return postFiltered; @@ -330,6 +335,7 @@ class CHThorIndexReadActivityBase : public CHThorActivityBase unsigned seeks; unsigned scans; unsigned postFiltered; + unsigned wildseeks; bool singlePart = false; // a single part index, not part of a super file - optimize so never reload the part. bool localSortKey = false; bool initializedFileInfo = false; @@ -360,6 +366,7 @@ CHThorIndexReadActivityBase::CHThorIndexReadActivityBase(IAgentContext &_agent, postFiltered = 0; seeks = 0; scans = 0; + wildseeks = 0; helper.setCallback(&callback); limitTransformExtra = nullptr; if (_node) @@ -631,6 +638,7 @@ void CHThorIndexReadActivityBase::killPart() { seeks += klManager->querySeeks(); scans += klManager->queryScans(); + wildseeks += klManager->queryWildSeeks(); klManager.clear(); } } @@ -3450,6 +3458,7 @@ class CHThorKeyedJoinActivity : public CHThorThreadedActivityBase, implements I atomic_t skips; unsigned seeks; unsigned scans; + unsigned wildseeks; OwnedRowArray extractedRows; Owned ldFile; IDistributedFile * dFile; @@ -4053,6 +4062,7 @@ class CHThorKeyedJoinActivity : public CHThorThreadedActivityBase, implements I CriticalBlock b(statsCrit); seeks += manager->querySeeks(); scans += manager->queryScans(); + wildseeks += manager->queryWildSeeks(); } virtual bool addMatch(MatchSet * ms, IKeyManager * manager) @@ -4124,6 +4134,7 @@ class CHThorKeyedJoinActivity : public CHThorThreadedActivityBase, implements I progress.addStatistic(StNumIndexSkips, atomic_read(&skips)); progress.addStatistic(StNumIndexSeeks, seeks); progress.addStatistic(StNumIndexScans, scans); + progress.addStatistic(StNumIndexWildSeeks, wildseeks); } protected: