HPCC-33587 Add option to set minimum query execution time

richardkchapman · richardkchapman · commit 6083350b6ec9 · 2025-03-05T16:27:14.000Z
Changes following review

Signed-off-by: Richard Chapman &lt;rchapman@hpccsystems.com&gt;
diff --git a/roxie/ccd/ccdcontext.cpp b/roxie/ccd/ccdcontext.cpp
@@ -2623,10 +2623,11 @@ class CRoxieServerContext : public CRoxieContextBase, implements IRoxieServerCon
     {
         logctx.mergeStats(0, globalStats);
         unsigned __int64 elapsed = elapsedTimer.elapsedNs();
-        if (nanoToMilli(elapsed) < options.minTimeLimit)
+        unsigned __int64 minTime = milliToNano(options.minTimeLimit);
+        if (nanoToMilli(elapsed) < minTime)
         {
-            unsigned delay = options.minTimeLimit - nanoToMilli(elapsed);
-            MilliSleep(delay);
+            unsigned __int64 delay = minTime - elapsed;
+            MilliSleep(nanoToMilli(delay));  // nano sleep would be better?
             logctx.noteStatistic(StTimeDelayed, delay);
         }
         logctx.setStatistic(StTimeTotalExecute, elapsed);  // Should this include delay?

Original file line number	Diff line number	Diff line change
`@@ -2623,10 +2623,11 @@ class CRoxieServerContext : public CRoxieContextBase, implements IRoxieServerCon`
`2623`	`2623`	`{`
`2624`	`2624`	`logctx.mergeStats(0, globalStats);`
`2625`	`2625`	`unsigned __int64 elapsed = elapsedTimer.elapsedNs();`
`2626`		`- if (nanoToMilli(elapsed) < options.minTimeLimit)`
	`2626`	`+ unsigned __int64 minTime = milliToNano(options.minTimeLimit);`
	`2627`	`+ if (nanoToMilli(elapsed) < minTime)`
`2627`	`2628`	`{`
`2628`		`- unsigned delay = options.minTimeLimit - nanoToMilli(elapsed);`
`2629`		`- MilliSleep(delay);`
	`2629`	`+ unsigned __int64 delay = minTime - elapsed;`
	`2630`	`+ MilliSleep(nanoToMilli(delay)); // nano sleep would be better?`
`2630`	`2631`	`logctx.noteStatistic(StTimeDelayed, delay);`
`2631`	`2632`	`}`
`2632`	`2633`	`logctx.setStatistic(StTimeTotalExecute, elapsed); // Should this include delay?`