fix

Signed-off-by: Andy Lok <andylokandy@hotmail.com>

Author: andylokandy

src/request/keyspace.rs

@@ -151,8 +151,18 @@ impl TruncateKeyspace for Vec<KvPair> {
 
 impl TruncateKeyspace for Vec<crate::proto::kvrpcpb::LockInfo> {
     fn truncate_keyspace(mut self, keyspace: Keyspace) -> Self {
-        for lock in self.locks.iter_mut() {
-            lock.key.truncate_keyspace(self.keyspace);
+        for lock in &mut self {
+            take_mut::take(&mut lock.key, |key| {
+                Key::from(key).truncate_keyspace(keyspace).into()
+            });
+            take_mut::take(&mut lock.primary_lock, |primary| {
+                Key::from(primary).truncate_keyspace(keyspace).into()
+            });
+            for secondary in lock.secondaries.iter_mut() {
+                take_mut::take(secondary, |secondary| {
+                    Key::from(secondary).truncate_keyspace(keyspace).into()
+                });
+            }
         }
         self
     }

src/transaction/lock.rs

@@ -121,8 +121,7 @@ async fn resolve_lock_with_retry(
         let store = pd_client.clone().store_for_key(key.into()).await?;
         let ver_id = store.region_with_leader.ver_id();
         let request = requests::new_resolve_lock_request(start_version, commit_version);
-        let encoded_req = EncodedRequest::new(request, pd_client.get_codec());
-        let plan = crate::request::PlanBuilder::new(pd_client.clone(), encoded_req)
+        let plan = crate::request::PlanBuilder::new(pd_client.clone(), keyspace, request)
             .single_region_with_store(store)
             .await?
             .resolve_lock(Backoff::no_backoff(), keyspace)