fix: change the task ID generation order in id_generator to apply revision before piece_length (#1714)

Signed-off-by: Gaius <gaius.qi@gmail.com>

Author: gaius-qi

Cargo.lock

@@ -13,7 +13,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.2.14"
+version = "1.2.15"
 authors = ["The Dragonfly Developers"]
 homepage = "https://d7y.io/"
 repository = "https://github.com/dragonflyoss/client.git"
@@ -23,14 +23,14 @@ readme = "README.md"
 edition = "2021"
 
 [workspace.dependencies]
-dragonfly-client = { path = "dragonfly-client", version = "1.2.14" }
-dragonfly-client-core = { path = "dragonfly-client-core", version = "1.2.14" }
-dragonfly-client-config = { path = "dragonfly-client-config", version = "1.2.14" }
-dragonfly-client-storage = { path = "dragonfly-client-storage", version = "1.2.14" }
-dragonfly-client-backend = { path = "dragonfly-client-backend", version = "1.2.14" }
-dragonfly-client-metric = { path = "dragonfly-client-metric", version = "1.2.14" }
-dragonfly-client-util = { path = "dragonfly-client-util", version = "1.2.14" }
-dragonfly-client-init = { path = "dragonfly-client-init", version = "1.2.14" }
+dragonfly-client = { path = "dragonfly-client", version = "1.2.15" }
+dragonfly-client-core = { path = "dragonfly-client-core", version = "1.2.15" }
+dragonfly-client-config = { path = "dragonfly-client-config", version = "1.2.15" }
+dragonfly-client-storage = { path = "dragonfly-client-storage", version = "1.2.15" }
+dragonfly-client-backend = { path = "dragonfly-client-backend", version = "1.2.15" }
+dragonfly-client-metric = { path = "dragonfly-client-metric", version = "1.2.15" }
+dragonfly-client-util = { path = "dragonfly-client-util", version = "1.2.15" }
+dragonfly-client-init = { path = "dragonfly-client-init", version = "1.2.15" }
 dragonfly-api = "=2.2.24"
 thiserror = "2.0"
 futures = "0.3.32"

Cargo.toml

@@ -159,15 +159,17 @@ impl IDGenerator {
                     hasher.update(application);
                 }
 
+                // Add the revision to generate the task id for the artifact with the same url but
+                // different revisions, such as git repository.
+                if let Some(revision) = revision {
+                    hasher.update(revision);
+                }
+
                 // Add the piece length to generate the task id.
                 if let Some(piece_length) = piece_length {
                     hasher.update(piece_length.to_string());
                 }
 
-                if let Some(revision) = revision {
-                    hasher.update(revision);
-                }
-
                 hasher.update(TaskType::Standard.as_str_name().as_bytes());
 
                 // Generate the task id.
@@ -313,7 +315,7 @@ mod tests {
                     filtered_query_params: vec![],
                     revision: Some("v1.0".to_string()),
                 },
-                "91a1996a00d8ba39f7fecada21a7e24d0bde597842e5cb436ea99f77eca88a21",
+                "5844f27a257287e9b734256bb25603d8005422ced8c0377f15063ec11963b25f",
             ),
             (
                 IDGenerator::new("127.0.0.1".to_string(), "localhost".to_string(), false),