From aabd94c2113ebe71132fcf36eb8ca9f7ffed4dc2 Mon Sep 17 00:00:00 2001 From: Vadim Davydenko Date: Mon, 18 Nov 2024 13:16:04 +0400 Subject: [PATCH] DDEV-1965 fix updateGauge and updateCounter --- src/Storage/OctaneCache.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Storage/OctaneCache.php b/src/Storage/OctaneCache.php index ee4b694..1159edd 100644 --- a/src/Storage/OctaneCache.php +++ b/src/Storage/OctaneCache.php @@ -159,17 +159,16 @@ public function updateGauge(array $data): void 'valueKeys' => '', ]; } - if (!$this->gaugeValues->get($valueKey)) { - $value = 0; - } - if (!$this->gaugeValues->get($valueKey)) { - $value = $this->gaugeValues->get($valueKey) ?? 0; + + $value = $this->сounterValues->get($valueKey); + if (!$value) { + $value = ['value' => 0]; $metaKeyValue['valueKeys'] = $this->implodeKeysString($metaKeyValue['valueKeys'], $valueKey); } if ($data['command'] === Adapter::COMMAND_SET) { $this->gaugeValues->set($valueKey, ['value' => $data['value']]); } else { - $this->gaugeValues->set($valueKey, ['value' => $value + $data['value']]); + $this->gaugeValues->set($valueKey, ['value' => $value['value'] + $data['value']]); } $this->gauges->set($metaKey, $metaKeyValue); @@ -191,14 +190,15 @@ public function updateCounter(array $data): void 'valueKeys' => '', ]; } - $value = $this->сounterValues->get($valueKey) ?? 0; + $value = $this->сounterValues->get($valueKey); if (!$value) { + $value = ['value' => 0]; $metaKeyValue['valueKeys'] = $this->implodeKeysString($metaKeyValue['valueKeys'], $valueKey); } if ($data['command'] === Adapter::COMMAND_SET) { $this->сounterValues->set($valueKey, ['value' => 0]); } else { - $this->сounterValues->set($valueKey, ['value' => $value + $data['value']]); + $this->сounterValues->set($valueKey, ['value' => $value['value'] + $data['value']]); } $this->сounters->set($metaKey, $metaKeyValue);