TASK: only fetch content store sizes for the right keys, not all keys

skurfuerst · skurfuerst · commit f02764a029f2 · 2021-09-16T10:15:37.000+02:00
diff --git a/Classes/BackendUi/BackendUiDataService.php b/Classes/BackendUi/BackendUiDataService.php
@@ -101,17 +101,15 @@ public function loadBackendOverviewData(RedisInstanceIdentifier $redisInstanceId
     private function calculateReleaseSize(RedisInstanceIdentifier $redisInstanceIdentifier, ContentReleaseIdentifier $contentReleaseIdentifier)
     {
         $redis = $this->redisClientManager->getRedis($redisInstanceIdentifier);
-        $allKeys = $redis->keys('*');
+        $allKeys = $redis->keys('contentStore:' . $contentReleaseIdentifier->getIdentifier() . ':*');
         $size = 0;
 
         foreach ($allKeys as $key) {
-            if (str_contains($key, $contentReleaseIdentifier->getIdentifier())) {
-                $size += $redis->rawCommand('memory', 'usage', $key);
-            }
+            $size += $redis->rawCommand('memory', 'usage', $key);
         }
 
         // bytes are returned, convert to megabytes
-        return round($size / 100000, 2);
+        return round($size / 1000000, 2);
     }
 
     public function loadDetailsData(ContentReleaseIdentifier $contentReleaseIdentifier, RedisInstanceIdentifier $redisInstanceIdentifier): ContentReleaseDetails

Original file line number	Diff line number	Diff line change
`@@ -101,17 +101,15 @@ public function loadBackendOverviewData(RedisInstanceIdentifier $redisInstanceId`
`101`	`101`	`private function calculateReleaseSize(RedisInstanceIdentifier $redisInstanceIdentifier, ContentReleaseIdentifier $contentReleaseIdentifier)`
`102`	`102`	`{`
`103`	`103`	`$redis = $this->redisClientManager->getRedis($redisInstanceIdentifier);`
`104`		`- $allKeys = $redis->keys('*');`
	`104`	`+ $allKeys = $redis->keys('contentStore:' . $contentReleaseIdentifier->getIdentifier() . ':*');`
`105`	`105`	`$size = 0;`
`106`	`106`
`107`	`107`	`foreach ($allKeys as $key) {`
`108`		`- if (str_contains($key, $contentReleaseIdentifier->getIdentifier())) {`
`109`		`- $size += $redis->rawCommand('memory', 'usage', $key);`
`110`		`- }`
	`108`	`+ $size += $redis->rawCommand('memory', 'usage', $key);`
`111`	`109`	`}`
`112`	`110`
`113`	`111`	`// bytes are returned, convert to megabytes`
`114`		`- return round($size / 100000, 2);`
	`112`	`+ return round($size / 1000000, 2);`
`115`	`113`	`}`
`116`	`114`
`117`	`115`	`public function loadDetailsData(ContentReleaseIdentifier $contentReleaseIdentifier, RedisInstanceIdentifier $redisInstanceIdentifier): ContentReleaseDetails`