fix(foundationdb): make proper use of pack/unpack

Author: PierreZ

foundationdb/src/directory/mod.rs

@@ -18,7 +18,7 @@ use crate::directory::error::DirectoryError;
 use crate::directory::node::Node;
 use crate::future::FdbSlice;
 use crate::tuple::hca::HighContentionAllocator;
-use crate::tuple::{pack_into, Subspace};
+use crate::tuple::Subspace;
 use crate::{FdbError, FdbResult, Transaction};
 use byteorder::{LittleEndian, WriteBytesExt};
 
@@ -378,9 +378,10 @@ impl DirectoryLayer {
 
         for path_name in paths {
             node_path.push(path_name.to_owned());
-            let mut next_node_key = vec![DEFAULT_SUB_DIRS];
-            pack_into(&path_name, &mut next_node_key);
-            subspace = subspace.subspace(&next_node_key);
+            subspace = subspace.subspace::<(&[u8], String)>(&(
+                vec![DEFAULT_SUB_DIRS].as_slice(),
+                path_name.to_owned(),
+            ));
 
             let mut node = Node {
                 paths: node_path.clone(),

foundationdb/src/directory/node.rs

@@ -96,24 +96,8 @@ impl Node {
         for fdb_value in fdb_values {
             let subspace = Subspace::from_bytes(fdb_value.key());
             // stripping from subspace
-            let sub_directory: Vec<u8> = self.node_subspace.unpack(subspace.bytes())?;
-            match String::from_utf8(sub_directory.to_owned()) {
-                Ok(mut s) => {
-                    // s is like "\u{0}\u{2}node-0\u{0}"
-                    // we need to remove DEFAULT_SUB_DIRS at the beginning and the padding at the end.
-                    // maybe there is a better way to clean it? Unpack?
-                    s.remove(0);
-                    s.remove(0);
-                    s.remove(s.len() - 1);
-                    results.push(s);
-                }
-                Err(err) => {
-                    return Err(DirectoryError::Message(format!(
-                        "could not decode '{:?}' in utf-8: {}",
-                        sub_directory, err
-                    )))
-                }
-            }
+            let sub_directory: (Vec<u8>, String) = self.node_subspace.unpack(subspace.bytes())?;
+            results.push(sub_directory.1);
         }
         Ok(results)
     }