feat: blockNode抽取至公共模块 TencentBlueKing#2413

yaoxuwan · Aug 5, 2024 · 3e48f5e · 3e48f5e
1 parent fe9b542
commit 3e48f5e
Show file tree

Hide file tree

Showing 7 changed files with 263 additions and 73 deletions.
diff --git a/...service/src/main/kotlin/com/tencent/bkrepo/common/metadata/condition/ReactiveCondition.kt b/...service/src/main/kotlin/com/tencent/bkrepo/common/metadata/condition/ReactiveCondition.kt
@@ -1,3 +1,30 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package com.tencent.bkrepo.common.metadata.condition
 
 import org.springframework.context.annotation.Condition

diff --git a/...ata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/condition/SyncCondition.kt b/...ata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/condition/SyncCondition.kt
@@ -1,3 +1,30 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package com.tencent.bkrepo.common.metadata.condition
 
 import org.springframework.context.annotation.Condition

diff --git a/...a/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/dao/BlockNodeDao.kt b/...a/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/dao/BlockNodeDao.kt
@@ -1,3 +1,30 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package com.tencent.bkrepo.common.metadata.dao
 
 import com.tencent.bkrepo.common.metadata.condition.SyncCondition

diff --git a/...src/main/kotlin/com/tencent/bkrepo/common/metadata/service/blocknode/RBlockNodeService.kt b/...src/main/kotlin/com/tencent/bkrepo/common/metadata/service/blocknode/RBlockNodeService.kt
@@ -1,3 +1,30 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package com.tencent.bkrepo.common.metadata.service.blocknode
 
 import com.tencent.bkrepo.common.artifact.stream.Range

diff --git a/...lin/com/tencent/bkrepo/common/metadata/service/blocknode/impl/AbstractBlockNodeService.kt b/...lin/com/tencent/bkrepo/common/metadata/service/blocknode/impl/AbstractBlockNodeService.kt
@@ -27,24 +27,20 @@
 
 package com.tencent.bkrepo.common.metadata.service.blocknode.impl
 
-import com.tencent.bkrepo.common.api.util.EscapeUtils
 import com.tencent.bkrepo.common.artifact.stream.Range
 import com.tencent.bkrepo.common.metadata.constant.ID
 import com.tencent.bkrepo.common.metadata.dao.BlockNodeDao
 import com.tencent.bkrepo.common.metadata.model.TBlockNode
 import com.tencent.bkrepo.common.metadata.service.blocknode.BlockNodeService
+import com.tencent.bkrepo.common.metadata.util.BlockNodeQueryHelper
 import com.tencent.bkrepo.common.storage.credentials.StorageCredentials
 import com.tencent.bkrepo.repository.pojo.node.NodeDetail
 import org.slf4j.LoggerFactory
-import org.springframework.data.domain.Sort
 import org.springframework.data.mongodb.core.query.Criteria
 import org.springframework.data.mongodb.core.query.Query
 import org.springframework.data.mongodb.core.query.Update
 import org.springframework.data.mongodb.core.query.and
-import org.springframework.data.mongodb.core.query.gt
 import org.springframework.data.mongodb.core.query.isEqualTo
-import org.springframework.data.mongodb.core.query.lt
-import org.springframework.data.mongodb.core.query.where
 import java.time.LocalDateTime
 
 abstract class AbstractBlockNodeService(
@@ -67,16 +63,7 @@ abstract class AbstractBlockNodeService(
         fullPath: String,
         createdDate: String
     ): List<TBlockNode> {
-        val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-            .and(TBlockNode::projectId.name).isEqualTo(projectId)
-            .and(TBlockNode::repoName.name).isEqualTo(repoName)
-            .and(TBlockNode::deleted).isEqualTo(null)
-            .and(TBlockNode::createdDate).gt(LocalDateTime.parse(createdDate))
-            .norOperator(
-                TBlockNode::startPos.gt(range.end),
-                TBlockNode::endPos.lt(range.start)
-            )
-        val query = Query(criteria).with(Sort.by(TBlockNode::createdDate.name))
+        val query = BlockNodeQueryHelper.listQuery(projectId, repoName, fullPath, createdDate, range)
         return blockNodeDao.find(query)
     }
 
@@ -85,34 +72,25 @@ abstract class AbstractBlockNodeService(
         repoName: String,
         fullPath: String
     ) {
-        val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-            .and(TBlockNode::projectId.name).isEqualTo(projectId)
-            .and(TBlockNode::repoName.name).isEqualTo(repoName)
-            .and(TBlockNode::deleted).isEqualTo(null)
-        val update = Update().set(TBlockNode::deleted.name, LocalDateTime.now())
+        val criteria = BlockNodeQueryHelper.fullPathCriteria(projectId, repoName, fullPath, false)
+        val update = BlockNodeQueryHelper.deleteUpdate()
         blockNodeDao.updateMulti(Query(criteria), update)
         logger.info("Delete node blocks[$projectId/$repoName$fullPath] success.")
     }
 
     override fun moveBlocks(projectId: String, repoName: String, fullPath: String, dstFullPath: String) {
         val nodeDetail = getNodeDetail(projectId, repoName, dstFullPath)
         if (nodeDetail.folder) {
-            val criteria = where(TBlockNode::nodeFullPath).regex("^${EscapeUtils.escapeRegex(fullPath)}/")
-                .and(TBlockNode::projectId.name).isEqualTo(projectId)
-                .and(TBlockNode::repoName.name).isEqualTo(repoName)
-                .and(TBlockNode::deleted).isEqualTo(null)
+            val criteria = BlockNodeQueryHelper.fullPathCriteria(projectId, repoName, fullPath, true)
             val blocks = blockNodeDao.find(Query(criteria))
             blocks.forEach {
                 val update = Update().set(TBlockNode::nodeFullPath.name, it.nodeFullPath.replace(fullPath, dstFullPath))
                 val query = Query(Criteria.where(ID).isEqualTo(it.id).and(TBlockNode::repoName).isEqualTo(repoName))
                 blockNodeDao.updateMulti(query, update)
             }
         } else {
-            val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-                .and(TBlockNode::projectId.name).isEqualTo(projectId)
-                .and(TBlockNode::repoName.name).isEqualTo(repoName)
-                .and(TBlockNode::deleted).isEqualTo(null)
-            val update = Update().set(TBlockNode::nodeFullPath.name, dstFullPath)
+            val criteria = BlockNodeQueryHelper.fullPathCriteria(projectId, repoName, fullPath, false)
+            val update = BlockNodeQueryHelper.moveUpdate(dstFullPath)
             blockNodeDao.updateMulti(Query(criteria), update)
         }
         logger.info("Move node[$projectId/$repoName$fullPath] to node[$projectId/$repoName$dstFullPath] success.")
@@ -127,11 +105,9 @@ abstract class AbstractBlockNodeService(
         nodeCreateDate: LocalDateTime,
         nodeDeleteDate: LocalDateTime
     ) {
-        val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-            .and(TBlockNode::projectId.name).isEqualTo(projectId)
-            .and(TBlockNode::repoName.name).isEqualTo(repoName)
-            .and(TBlockNode::createdDate).gt(nodeCreateDate).lt(nodeDeleteDate)
-        val update = Update().set(TBlockNode::deleted.name, null)
+        val criteria =
+            BlockNodeQueryHelper.deletedCriteria(projectId, repoName, fullPath, nodeCreateDate, nodeDeleteDate)
+        val update = BlockNodeQueryHelper.restoreUpdate()
         val result = blockNodeDao.updateMulti(Query(criteria), update)
         logger.info("Restore ${result.modifiedCount} blocks node[$projectId/$repoName$fullPath] " +
             "between $nodeCreateDate and $nodeDeleteDate success.")

diff --git a/...in/com/tencent/bkrepo/common/metadata/service/blocknode/impl/RAbstractBlockNodeService.kt b/...in/com/tencent/bkrepo/common/metadata/service/blocknode/impl/RAbstractBlockNodeService.kt
@@ -1,23 +1,45 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
+ *
+ * Copyright (C) 2024 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
+ *
+ *  A copy of the MIT License is included in this file.
+ *
+ *
+ *  Terms of the MIT License:
+ *  ---------------------------------------------------
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ *  documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+ *  permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ *  the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+ *  LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ *  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ *  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 package com.tencent.bkrepo.common.metadata.service.blocknode.impl
 
-import com.tencent.bkrepo.common.api.util.EscapeUtils
 import com.tencent.bkrepo.common.artifact.stream.Range
 import com.tencent.bkrepo.common.metadata.constant.ID
 import com.tencent.bkrepo.common.metadata.dao.RBlockNodeDao
 import com.tencent.bkrepo.common.metadata.model.TBlockNode
 import com.tencent.bkrepo.common.metadata.service.blocknode.RBlockNodeService
+import com.tencent.bkrepo.common.metadata.util.BlockNodeQueryHelper
 import com.tencent.bkrepo.common.storage.credentials.StorageCredentials
 import com.tencent.bkrepo.repository.pojo.node.NodeDetail
 import org.slf4j.LoggerFactory
-import org.springframework.data.domain.Sort
 import org.springframework.data.mongodb.core.query.Criteria
 import org.springframework.data.mongodb.core.query.Query
-import org.springframework.data.mongodb.core.query.Update
 import org.springframework.data.mongodb.core.query.and
-import org.springframework.data.mongodb.core.query.gt
 import org.springframework.data.mongodb.core.query.isEqualTo
-import org.springframework.data.mongodb.core.query.lt
-import org.springframework.data.mongodb.core.query.where
 import java.time.LocalDateTime
 
 abstract class RAbstractBlockNodeService(
@@ -40,16 +62,7 @@ abstract class RAbstractBlockNodeService(
         fullPath: String,
         createdDate: String
     ): List<TBlockNode> {
-        val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-            .and(TBlockNode::projectId.name).isEqualTo(projectId)
-            .and(TBlockNode::repoName.name).isEqualTo(repoName)
-            .and(TBlockNode::deleted).isEqualTo(null)
-            .and(TBlockNode::createdDate).gt(LocalDateTime.parse(createdDate))
-            .norOperator(
-                TBlockNode::startPos.gt(range.end),
-                TBlockNode::endPos.lt(range.start)
-            )
-        val query = Query(criteria).with(Sort.by(TBlockNode::createdDate.name))
+        val query = BlockNodeQueryHelper.listQuery(projectId, repoName, fullPath, createdDate, range)
         return rBlockNodeDao.find(query)
     }
 
@@ -58,56 +71,46 @@ abstract class RAbstractBlockNodeService(
         repoName: String,
         fullPath: String
     ) {
-        val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-            .and(TBlockNode::projectId.name).isEqualTo(projectId)
-            .and(TBlockNode::repoName.name).isEqualTo(repoName)
-            .and(TBlockNode::deleted).isEqualTo(null)
-        val update = Update().set(TBlockNode::deleted.name, LocalDateTime.now())
+        val criteria = BlockNodeQueryHelper.fullPathCriteria(projectId, repoName, fullPath, false)
+        val update = BlockNodeQueryHelper.deleteUpdate()
         rBlockNodeDao.updateMulti(Query(criteria), update)
         logger.info("Delete node blocks[$projectId/$repoName$fullPath] success.")
     }
 
     override suspend fun moveBlocks(projectId: String, repoName: String, fullPath: String, dstFullPath: String) {
         val nodeDetail = getNodeDetail(projectId, repoName, dstFullPath)
         if (nodeDetail.folder) {
-            val criteria = where(TBlockNode::nodeFullPath).regex("^${EscapeUtils.escapeRegex(fullPath)}/")
-                .and(TBlockNode::projectId.name).isEqualTo(projectId)
-                .and(TBlockNode::repoName.name).isEqualTo(repoName)
-                .and(TBlockNode::deleted).isEqualTo(null)
+            val criteria = BlockNodeQueryHelper.fullPathCriteria(projectId, repoName, fullPath, true)
             val blocks = rBlockNodeDao.find(Query(criteria))
             blocks.forEach {
-                val update = Update().set(TBlockNode::nodeFullPath.name, it.nodeFullPath.replace(fullPath, dstFullPath))
+                val update = BlockNodeQueryHelper.moveUpdate(it.nodeFullPath.replace(fullPath, dstFullPath))
                 val query = Query(Criteria.where(ID).isEqualTo(it.id).and(TBlockNode::repoName).isEqualTo(repoName))
                 rBlockNodeDao.updateMulti(query, update)
             }
         } else {
-            val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-                .and(TBlockNode::projectId.name).isEqualTo(projectId)
-                .and(TBlockNode::repoName.name).isEqualTo(repoName)
-                .and(TBlockNode::deleted).isEqualTo(null)
-            val update = Update().set(TBlockNode::nodeFullPath.name, dstFullPath)
+            val criteria = BlockNodeQueryHelper.fullPathCriteria(projectId, repoName, fullPath, false)
+            val update = BlockNodeQueryHelper.moveUpdate(dstFullPath)
             rBlockNodeDao.updateMulti(Query(criteria), update)
         }
         logger.info("Move node[$projectId/$repoName$fullPath] to node[$projectId/$repoName$dstFullPath] success.")
     }
 
 
-
     override suspend fun restoreBlocks(
         projectId: String,
         repoName: String,
         fullPath: String,
         nodeCreateDate: LocalDateTime,
         nodeDeleteDate: LocalDateTime
     ) {
-        val criteria = where(TBlockNode::nodeFullPath).isEqualTo(fullPath)
-            .and(TBlockNode::projectId.name).isEqualTo(projectId)
-            .and(TBlockNode::repoName.name).isEqualTo(repoName)
-            .and(TBlockNode::createdDate).gt(nodeCreateDate).lt(nodeDeleteDate)
-        val update = Update().set(TBlockNode::deleted.name, null)
+        val criteria =
+            BlockNodeQueryHelper.deletedCriteria(projectId, repoName, fullPath, nodeCreateDate, nodeDeleteDate)
+        val update = BlockNodeQueryHelper.restoreUpdate()
         val result = rBlockNodeDao.updateMulti(Query(criteria), update)
-        logger.info("Restore ${result.modifiedCount} blocks node[$projectId/$repoName$fullPath] " +
-            "between $nodeCreateDate and $nodeDeleteDate success.")
+        logger.info(
+            "Restore ${result.modifiedCount} blocks node[$projectId/$repoName$fullPath] " +
+                "between $nodeCreateDate and $nodeDeleteDate success."
+        )
     }
 
     abstract suspend fun incFileRef(sha256: String, credentialsKey: String?)