Merge pull request #1126 from zacYL/issue_1125

feat: 当历史版本过多的情况下会导致拉取数据量过大，新增接口，不需要历史版本字段的业务可选用该接口查询包信息 #1125
TencentBlueKing · Sep 6, 2023 · 251a300 · 251a300
2 parents e8f4664 + 833c931
commit 251a300
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 16 deletions.
diff --git a/...repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/dao/PackageDao.kt b/...repository/biz-repository/src/main/kotlin/com/tencent/bkrepo/repository/dao/PackageDao.kt
@@ -48,6 +48,25 @@ import org.springframework.stereotype.Repository
 @Repository
 class PackageDao : SimpleMongoDao<TPackage>() {
 
+    /**
+     * 当历史版本过多的情况下会导致拉取数据量过大，针对不需要历史版本字段的业务可选用该接口查询包信息
+     */
+    fun findByKeyExcludeHistoryVersion(projectId: String, repoName: String, key: String): TPackage? {
+        if (key.isBlank()) {
+            return null
+        }
+        val query = PackageQueryHelper.packageQuery(projectId, repoName, key)
+        query.fields().exclude(HISTORY_VERSION)
+        return this.findOne(query)
+    }
+
+    fun checkExist(projectId: String, repoName: String, key: String): Boolean {
+        if (key.isBlank()) {
+            return false
+        }
+        return this.exists(PackageQueryHelper.packageQuery(projectId, repoName, key))
+    }
+
     fun findByKey(projectId: String, repoName: String, key: String): TPackage? {
         if (key.isBlank()) {
             return null
@@ -102,4 +121,8 @@ class PackageDao : SimpleMongoDao<TPackage>() {
         val update = Update().set(TPackage::latest.name, latestVersion)
         this.updateFirst(query, update)
     }
+
+    companion object {
+        private const val HISTORY_VERSION = "historyVersion"
+    }
 }
diff --git a/...otlin/com/tencent/bkrepo/repository/service/packages/impl/PackageDependentsServiceImpl.kt b/...otlin/com/tencent/bkrepo/repository/service/packages/impl/PackageDependentsServiceImpl.kt
@@ -78,7 +78,7 @@ class PackageDependentsServiceImpl(
     }
 
     protected fun checkPackage(projectId: String, repoName: String, packageKey: String): TPackage? {
-        return packageDao.findByKey(projectId, repoName, packageKey)
+        return packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)
     }
 
     companion object {

diff --git a/...kotlin/com/tencent/bkrepo/repository/service/packages/impl/PackageDownloadsServiceImpl.kt b/...kotlin/com/tencent/bkrepo/repository/service/packages/impl/PackageDownloadsServiceImpl.kt
@@ -117,7 +117,7 @@ class PackageDownloadsServiceImpl(
                 eqDate = date
             )
             val query = Query(criteria)
-            if (packageDownloadsDao.findOne(query) != null) {
+            if (packageDownloadsDao.exists(query)) {
                 return
             }
             val downloads = TPackageDownloads(
@@ -271,7 +271,7 @@ class PackageDownloadsServiceImpl(
      * 查找包，不存在则抛异常
      */
     private fun checkPackage(projectId: String, repoName: String, packageKey: String): TPackage {
-        return packageDao.findByKey(projectId, repoName, packageKey)
+        return packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)
             ?: throw ErrorCodeException(ArtifactMessageCode.PACKAGE_NOT_FOUND, packageKey)
     }
 

diff --git a/...src/main/kotlin/com/tencent/bkrepo/repository/service/packages/impl/PackageServiceImpl.kt b/...src/main/kotlin/com/tencent/bkrepo/repository/service/packages/impl/PackageServiceImpl.kt
@@ -97,7 +97,7 @@ class PackageServiceImpl(
         packageKey: String,
         versionName: String
     ): PackageVersion? {
-        val packageId = packageDao.findByKey(projectId, repoName, packageKey)?.id ?: return null
+        val packageId = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)?.id ?: return null
         return convert(packageVersionDao.findByName(packageId, versionName))
     }
 
@@ -107,7 +107,8 @@ class PackageServiceImpl(
         packageKey: String,
         tag: String
     ): String? {
-        val versionTag = packageDao.findByKey(projectId, repoName, packageKey)?.versionTag ?: return null
+        val versionTag = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)?.versionTag
+            ?: return null
         return versionTag[tag]
     }
 
@@ -116,7 +117,7 @@ class PackageServiceImpl(
         repoName: String,
         packageKey: String
     ): PackageVersion? {
-        val packageId = packageDao.findByKey(projectId, repoName, packageKey)?.id ?: return null
+        val packageId = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)?.id ?: return null
         return convert(packageVersionDao.findLatest(packageId))
     }
 
@@ -156,7 +157,7 @@ class PackageServiceImpl(
         Preconditions.checkArgument(pageSize >= 0, "pageSize")
         val stageTag = option.stageTag?.split(StringPool.COMMA)
         val pageRequest = Pages.ofRequest(pageNumber, pageSize)
-        val tPackage = packageDao.findByKey(projectId, repoName, packageKey)
+        val tPackage = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)
         return if (tPackage == null) {
             Pages.ofResponse(pageRequest, 0, emptyList())
         } else {
@@ -180,7 +181,7 @@ class PackageServiceImpl(
         option: VersionListOption
     ): List<PackageVersion> {
         val stageTag = option.stageTag?.split(StringPool.COMMA)
-        val tPackage = packageDao.findByKey(projectId, repoName, packageKey) ?: return emptyList()
+        val tPackage = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey) ?: return emptyList()
         val query = PackageQueryHelper.versionListQuery(
             packageId = tPackage.id!!,
             name = option.version,
@@ -248,7 +249,7 @@ class PackageServiceImpl(
     }
 
     override fun deletePackage(projectId: String, repoName: String, packageKey: String, realIpAddress: String?) {
-        val tPackage = packageDao.findByKey(projectId, repoName, packageKey) ?: return
+        val tPackage = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey) ?: return
         packageVersionDao.deleteByPackageId(tPackage.id!!)
         packageDao.deleteByKey(projectId, repoName, packageKey)
         publishEvent(
@@ -273,7 +274,7 @@ class PackageServiceImpl(
         versionName: String,
         realIpAddress: String?
     ) {
-        var tPackage = packageDao.findByKey(projectId, repoName, packageKey) ?: return
+        var tPackage = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey) ?: return
         val packageId = tPackage.id!!
         val tPackageVersion = packageVersionDao.findByName(packageId, versionName) ?: return
         checkCluster(tPackageVersion)
@@ -330,7 +331,7 @@ class PackageServiceImpl(
         } else {
             null
         }
-        val tPackage = checkPackage(projectId, repoName, packageKey)
+        val tPackage = findPackageExcludeHistoryVersion(projectId, repoName, packageKey)
         val packageId = tPackage.id.orEmpty()
         val tPackageVersion = checkPackageVersion(packageId, versionName).apply {
             checkCluster(this)
@@ -363,7 +364,7 @@ class PackageServiceImpl(
         versionName: String,
         realIpAddress: String?
     ) {
-        val tPackage = checkPackage(projectId, repoName, packageKey)
+        val tPackage = findPackageExcludeHistoryVersion(projectId, repoName, packageKey)
         val tPackageVersion = checkPackageVersion(tPackage.id!!, versionName)
         if (tPackageVersion.artifactPath.isNullOrBlank()) {
             throw ErrorCodeException(CommonMessageCode.METHOD_NOT_ALLOWED, "artifactPath is null")
@@ -415,7 +416,7 @@ class PackageServiceImpl(
         packageKey: String,
         packageVersionList: List<String>
     ): List<String> {
-        val tPackage = packageDao.findByKey(projectId, repoName, packageKey) ?: return emptyList()
+        val tPackage = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey) ?: return emptyList()
         val versionQuery = PackageQueryHelper.versionQuery(tPackage.id!!, packageVersionList)
         return packageVersionDao.find(versionQuery).map { it.name }
     }
@@ -465,6 +466,15 @@ class PackageServiceImpl(
             ?: throw ErrorCodeException(ArtifactMessageCode.PACKAGE_NOT_FOUND, packageKey)
     }
 
+    /**
+     * 查找包，不存在则抛异常
+     */
+    private fun findPackageExcludeHistoryVersion(projectId: String, repoName: String, packageKey: String): TPackage {
+        return packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)
+            ?: throw ErrorCodeException(ArtifactMessageCode.PACKAGE_NOT_FOUND, packageKey)
+    }
+
+
     /**
      * 查找版本，不存在则抛异常
      */

diff --git a/...y/src/main/kotlin/com/tencent/bkrepo/repository/service/packages/impl/StageServiceImpl.kt b/...y/src/main/kotlin/com/tencent/bkrepo/repository/service/packages/impl/StageServiceImpl.kt
@@ -84,7 +84,7 @@ class StageServiceImpl(
         packageKey: String,
         version: String
     ): TPackageVersion {
-        val tPackage = packageDao.findByKey(projectId, repoName, packageKey)
+        val tPackage = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)
             ?: throw ErrorCodeException(CommonMessageCode.RESOURCE_NOT_FOUND, packageKey)
         return packageVersionDao.findByName(tPackage.id!!, version)
             ?: throw ErrorCodeException(CommonMessageCode.RESOURCE_NOT_FOUND, version)

diff --git a/...o/repository/service/packages/impl/center/CommitEdgeCenterPackageDependentsServiceImpl.kt b/...o/repository/service/packages/impl/center/CommitEdgeCenterPackageDependentsServiceImpl.kt
@@ -46,7 +46,7 @@ class CommitEdgeCenterPackageDependentsServiceImpl(
 ) {
     override fun checkPackage(projectId: String, repoName: String, packageKey: String): TPackage? {
         return packageDao
-            .findByKey(projectId, repoName, packageKey)
+            .findByKeyExcludeHistoryVersion(projectId, repoName, packageKey)
             ?.also { ClusterUtils.checkIsSrcCluster(it.clusterNames) }
     }
 }
diff --git a/...cent/bkrepo/repository/service/packages/impl/center/CommitEdgeCenterPackageServiceImpl.kt b/...cent/bkrepo/repository/service/packages/impl/center/CommitEdgeCenterPackageServiceImpl.kt
@@ -131,7 +131,7 @@ class CommitEdgeCenterPackageServiceImpl(
     }
 
     override fun deletePackage(projectId: String, repoName: String, packageKey: String, realIpAddress: String?) {
-        val tPackage = packageDao.findByKey(projectId, repoName, packageKey) ?: return
+        val tPackage = packageDao.findByKeyExcludeHistoryVersion(projectId, repoName, packageKey) ?: return
         val srcCluster = srcCluster()
 
         if (ClusterUtils.isUniqueSrcCluster(tPackage.clusterNames)) {