Skip to content

Commit fc507e4

Browse files
Merge pull request #19809 from M393/processes
Fix showing progress value in processes view
2 parents d53832d + 43982ba commit fc507e4

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

psalm-baseline.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8367,9 +8367,9 @@
83678367
<code><![CDATA[0 !== --$sortableColCount]]></code>
83688368
</RedundantCondition>
83698369
<RiskyTruthyFalsyComparison>
8370-
<code><![CDATA[empty($process['Progress'])]]></code>
8371-
<code><![CDATA[empty($process['Progress'])]]></code>
83728370
<code><![CDATA[empty($process['info'])]]></code>
8371+
<code><![CDATA[empty($process['progress'])]]></code>
8372+
<code><![CDATA[empty($process['progress'])]]></code>
83738373
<code><![CDATA[empty($process['state'])]]></code>
83748374
</RiskyTruthyFalsyComparison>
83758375
</file>

src/Server/Status/Processes.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public function getList(bool $showExecuting, bool $showFullSql, string $orderByF
5555
// to display column values
5656
$process = array_change_key_case($process, CASE_LOWER);
5757

58-
$progress = ! empty($process['Progress']) ? $process['Progress'] : '---';
59-
if ($useIS && ! empty($process['Progress'])) {
60-
$stage = array_key_exists('Stage', $process) ? (int) $process['Stage'] : null;
61-
$maxStage = array_key_exists('Max_stage', $process) ? (int) $process['Max_stage'] : null;
58+
$progress = ! empty($process['progress']) ? $process['progress'] : '---';
59+
if ($useIS && ! empty($process['progress'])) {
60+
$stage = array_key_exists('stage', $process) ? (int) $process['stage'] : null;
61+
$maxStage = array_key_exists('max_stage', $process) ? (int) $process['max_stage'] : null;
6262
if ($stage !== null && $maxStage !== null && $maxStage > 1) {
6363
$progress = number_format(($stage - 1) / $maxStage * 100 + ((float) $progress) / $maxStage, 3);
6464
}

0 commit comments

Comments
 (0)