Add the prefix for the keys.

Author: MathieuDutSik

linera-views/src/backends/dynamo_db.rs

@@ -167,12 +167,14 @@ const MAX_BATCH_GET_ITEM_SIZE: usize = 40;
 /// The second attribute is the actual key value, which is generated by concatenating the
 /// context prefix. `The Vec<u8>` expression is obtained from `self.derive_key`.
 fn build_key(start_key: &[u8], key: Vec<u8>) -> HashMap<String, AttributeValue> {
+    let mut prefixed_key = vec![1];
+    prefixed_key.extend(key);
     [
         (
             PARTITION_ATTRIBUTE.to_owned(),
             AttributeValue::B(Blob::new(start_key.to_vec())),
         ),
-        (KEY_ATTRIBUTE.to_owned(), AttributeValue::B(Blob::new(key))),
+        (KEY_ATTRIBUTE.to_owned(), AttributeValue::B(Blob::new(prefixed_key))),
     ]
     .into()
 }
@@ -183,12 +185,14 @@ fn build_key_value(
     key: Vec<u8>,
     value: Vec<u8>,
 ) -> HashMap<String, AttributeValue> {
+    let mut prefixed_key = vec![1];
+    prefixed_key.extend(key);
     [
         (
             PARTITION_ATTRIBUTE.to_owned(),
             AttributeValue::B(Blob::new(start_key.to_vec())),
         ),
-        (KEY_ATTRIBUTE.to_owned(), AttributeValue::B(Blob::new(key))),
+        (KEY_ATTRIBUTE.to_owned(), AttributeValue::B(Blob::new(prefixed_key))),
         (
             VALUE_ATTRIBUTE.to_owned(),
             AttributeValue::B(Blob::new(value)),
@@ -216,7 +220,7 @@ fn extract_key(
         .get(KEY_ATTRIBUTE)
         .ok_or(DynamoDbStoreInternalError::MissingKey)?;
     match key {
-        AttributeValue::B(blob) => Ok(&blob.as_ref()[prefix_len..]),
+        AttributeValue::B(blob) => Ok(&blob.as_ref()[1 + prefix_len..]),
         key => Err(DynamoDbStoreInternalError::wrong_key_type(key)),
     }
 }
@@ -602,6 +606,8 @@ impl DynamoDbStoreInternal {
     ) -> Result<QueryOutput, DynamoDbStoreInternalError> {
         let _guard = self.acquire().await;
         let start_key = start_key.to_vec();
+        let mut prefixed_key_prefix = vec![1];
+        prefixed_key_prefix.extend(key_prefix);
         let response = self
             .client
             .query()
@@ -611,7 +617,7 @@ impl DynamoDbStoreInternal {
                 "{PARTITION_ATTRIBUTE} = :partition and begins_with({KEY_ATTRIBUTE}, :prefix)"
             ))
             .expression_attribute_values(":partition", AttributeValue::B(Blob::new(start_key)))
-            .expression_attribute_values(":prefix", AttributeValue::B(Blob::new(key_prefix)))
+            .expression_attribute_values(":prefix", AttributeValue::B(Blob::new(prefixed_key_prefix)))
             .set_exclusive_start_key(start_key_map)
             .send()
             .boxed_sync()
@@ -746,7 +752,8 @@ impl DynamoDbStoreInternal {
                             .ok_or(DynamoDbStoreInternalError::MissingKey)?;
 
                         if let AttributeValue::B(blob) = key_attr {
-                            let key = blob.as_ref();
+                            let prefixed_key = blob.as_ref();
+                            let key = &prefixed_key[1..]; // Remove the [1] prefix
                             if let Some(indices) = key_to_index.get(key) {
                                 if let Some((&last, rest)) = indices.split_last() {
                                     let value = extract_value_owned(&mut item)?;