feat: 代码调整 TencentBlueKing#2313

zacYL · Jul 8, 2024 · da9c32a · da9c32a
1 parent 1fd311d
commit da9c32a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.../src/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/ActiveProjectNodeFolderStatJob.kt b/.../src/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/ActiveProjectNodeFolderStatJob.kt
@@ -134,6 +134,6 @@ class ActiveProjectNodeFolderStatJob(
 
     companion object {
         private val logger = LoggerFactory.getLogger(ActiveProjectNodeFolderStatJob::class.java)
-        private val KEY_PREFIX = "activeProjectNode"
+        private const val KEY_PREFIX = "activeProjectNode"
     }
 }
diff --git a/.../job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/EmptyFolderCleanup.kt b/.../job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/EmptyFolderCleanup.kt
@@ -139,7 +139,7 @@ class EmptyFolderCleanup(
         if (context.folders.isEmpty()) return
         val movedToRedis: MutableList<String> = mutableListOf()
         val storedFolderPrefix = if (collectionName.isNullOrEmpty()) {
-            FolderUtils.buildCacheKey(collectionName = collectionName, projectId = projectId)+StringPool.COLON
+            FolderUtils.buildCacheKey(collectionName = collectionName, projectId = projectId) + StringPool.COLON
         } else {
             FolderUtils.buildCacheKey(collectionName = collectionName, projectId = StringPool.EMPTY)
         }
@@ -154,7 +154,9 @@ class EmptyFolderCleanup(
                     fullPath = folderInfo.fullPath, tag = NODE_NUM
                 )
 
-                val key = keyPrefix + StringPool.COLON + FolderUtils.buildCacheKey(collectionName = collectionName, projectId = projectId)
+                val key = keyPrefix + StringPool.COLON + FolderUtils.buildCacheKey(
+                    collectionName = collectionName, projectId = projectId
+                )
                 hashCommands.hIncrBy(key.toByteArray(), nodeNumHKey.toByteArray(), entry.value.nodeNum.toLong())
                 entry.value.id?.let {
                     val idHKey = FolderUtils.buildCacheKey(
@@ -250,7 +252,7 @@ class EmptyFolderCleanup(
         deleteFolderRepos: List<String>,
         id: String,
         context: EmptyFolderCleanupJobContext,
-        ) {
+    ) {
         if (emptyFolderDoubleCheck(
                 projectId = folderInfo.projectId,
                 repoName = folderInfo.repoName,

diff --git a/...ain/kotlin/com/tencent/bkrepo/job/batch/task/stat/InactiveProjectEmptyFolderCleanupJob.kt b/...ain/kotlin/com/tencent/bkrepo/job/batch/task/stat/InactiveProjectEmptyFolderCleanupJob.kt
@@ -189,6 +189,6 @@ class InactiveProjectEmptyFolderCleanupJob(
         private val logger = LoggerFactory.getLogger(InactiveProjectEmptyFolderCleanupJob::class.java)
         const val FULL_PATH_IDX = "projectId_repoName_fullPath_idx"
         private const val COLLECTION_NAME_PREFIX = "node_"
-        private val KEY_PREFIX = "inactiveEmptyFolder"
+        private const val KEY_PREFIX = "inactiveEmptyFolder"
     }
 }
diff --git a/...rc/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/InactiveProjectNodeFolderStatJob.kt b/...rc/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/InactiveProjectNodeFolderStatJob.kt
@@ -204,7 +204,7 @@ class InactiveProjectNodeFolderStatJob(
     companion object {
         private val logger = LoggerFactory.getLogger(InactiveProjectNodeFolderStatJob::class.java)
         private const val COLLECTION_NAME_PREFIX = "node_"
-        private val KEY_PREFIX = "inactiveProjectNode"
+        private const val KEY_PREFIX = "inactiveProjectNode"
 
     }
 }
diff --git a/...kend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/NodeFolderStat.kt b/...kend/job/biz-job/src/main/kotlin/com/tencent/bkrepo/job/batch/task/stat/NodeFolderStat.kt
@@ -144,7 +144,7 @@ class NodeFolderStat(
         if (context.folderCache.isEmpty()) return
         val movedToRedis: MutableList<String> = mutableListOf()
         val storedFolderPrefix = if (collectionName.isNullOrEmpty()) {
-            FolderUtils.buildCacheKey(collectionName = collectionName, projectId = projectId)+StringPool.COLON
+            FolderUtils.buildCacheKey(collectionName = collectionName, projectId = projectId) + StringPool.COLON
         } else {
             FolderUtils.buildCacheKey(collectionName = collectionName, projectId = StringPool.EMPTY)
         }
@@ -163,7 +163,9 @@ class NodeFolderStat(
                     projectId = folderInfo.projectId, repoName = folderInfo.repoName,
                     fullPath = folderInfo.fullPath, tag = NODE_NUM
                 )
-                val key = keyPrefix + StringPool.COLON + FolderUtils.buildCacheKey(collectionName = collectionName, projectId = projectId)
+                val key = keyPrefix + StringPool.COLON + FolderUtils.buildCacheKey(
+                    collectionName = collectionName, projectId = projectId
+                )
                 // hkey为projectId:repoName:fullPath:size或者nodenum, hvalue为对应值,
                 hashCommands.hIncrBy(key.toByteArray(), sizeHKey.toByteArray(), entry.value.capSize.toLong())
                 hashCommands.hIncrBy(key.toByteArray(), nodeNumHKey.toByteArray(), entry.value.nodeNum.toLong())