feat: 修复字段顺序变更导致索引更新失败问题TencentBlueKing#2725

felixncheng · Nov 1, 2024 · a96e0fe · a96e0fe
1 parent 4f902ea
commit a96e0fe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/.../biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/artifact/repository/RpmLocalRepository.kt b/.../biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/artifact/repository/RpmLocalRepository.kt
@@ -239,7 +239,7 @@ class RpmLocalRepository(
                     rpmMetadata.packages[0].format.changeLogs
                 )
             ),
-            1L
+            packageNum = 1L
         )
         stopWatch.start("storeOthers")
         storeIndexMarkFile(
@@ -256,7 +256,7 @@ class RpmLocalRepository(
                         rpmMetadata.packages[0].format.files
                     )
                 ),
-                1L
+                packageNum = 1L
             )
             stopWatch.start("storeFilelists")
             storeIndexMarkFile(

diff --git a/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/rpm/RpmMetadataUtils.kt b/src/backend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/rpm/RpmMetadataUtils.kt
@@ -113,7 +113,7 @@ object RpmMetadataUtils {
                     )
                 )
             ),
-            1L
+            packageNum = 1L
         )
     }
 

diff --git a/...ckend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadata.kt b/...ckend/rpm/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadata.kt
@@ -40,14 +40,14 @@ class RpmMetadata(
     @XStreamImplicit(itemFieldName = "package")
     override val packages: List<RpmPackage>,
     @XStreamAsAttribute
-    @XStreamAlias("packages")
-    override var packageNum: Long
-) : RpmXmlMetadata(packages, packageNum) {
-    @XStreamAsAttribute
-    val xmlns: String = "http://linux.duke.edu/metadata/common"
+    val xmlns: String = "http://linux.duke.edu/metadata/common",
     @XStreamAsAttribute
     @XStreamAlias("xmlns:rpm")
-    val rpm: String = "http://linux.duke.edu/metadata/rpm"
+    val rpm: String = "http://linux.duke.edu/metadata/rpm",
+    @XStreamAsAttribute
+    @XStreamAlias("packages")
+    override var packageNum: Long,
+) : RpmXmlMetadata(packages, packageNum) {
 
     fun filterRpmFileLists() {
         packages[0].format.files = packages[0].format.files.filter {

diff --git a/.../biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataChangeLog.kt b/.../biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataChangeLog.kt
@@ -40,9 +40,8 @@ class RpmMetadataChangeLog(
     @XStreamImplicit(itemFieldName = "package")
     override val packages: List<RpmPackageChangeLog>,
     @XStreamAsAttribute
+    val xmlns: String = "http://linux.duke.edu/metadata/other",
+    @XStreamAsAttribute
     @XStreamAlias("packages")
     override var packageNum: Long
-) : RpmXmlMetadata(packages, packageNum) {
-    @XStreamAsAttribute
-    val xmlns: String = "http://linux.duke.edu/metadata/other"
-}
+) : RpmXmlMetadata(packages, packageNum)
diff --git a/...m/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataFileList.kt b/...m/biz-rpm/src/main/kotlin/com/tencent/bkrepo/rpm/util/xStream/pojo/RpmMetadataFileList.kt
@@ -40,9 +40,8 @@ class RpmMetadataFileList(
     @XStreamImplicit(itemFieldName = "package")
     override val packages: List<RpmPackageFileList>,
     @XStreamAsAttribute
+    val xmlns: String = "http://linux.duke.edu/metadata/filelists",
+    @XStreamAsAttribute
     @XStreamAlias("packages")
     override var packageNum: Long
-) : RpmXmlMetadata(packages, packageNum) {
-    @XStreamAsAttribute
-    val xmlns: String = "http://linux.duke.edu/metadata/filelists"
-}
+) : RpmXmlMetadata(packages, packageNum)