about summary refs log tree commit diff
path: root/tvix/store/src/pathinfoservice/sled.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-05-14T15·10+0300
committerflokli <flokli@flokli.de>2023-05-16T10·39+0000
commite815b680c0d7fdd99c0bdb4b198e3f4c591997b8 (patch)
tree3e3a262242c94422f84647f503f237771ab4eefd /tvix/store/src/pathinfoservice/sled.rs
parent71c29d0f4c6cbf4697bfaac84bcebd43a77a4b78 (diff)
refactor(tvix/store/pathinfosvc): drop ByWhat, use digest directly r/6146
We currently only support querying by the output hash digest.
This makes the interface a bit simpler.

Change-Id: I80b285373f1923e85cb0e404c4b15d51a7f259ef
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8570
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/store/src/pathinfoservice/sled.rs')
-rw-r--r--tvix/store/src/pathinfoservice/sled.rs51
1 files changed, 19 insertions, 32 deletions
diff --git a/tvix/store/src/pathinfoservice/sled.rs b/tvix/store/src/pathinfoservice/sled.rs
index b629d869f0fe..bccd6b141315 100644
--- a/tvix/store/src/pathinfoservice/sled.rs
+++ b/tvix/store/src/pathinfoservice/sled.rs
@@ -1,11 +1,9 @@
+use super::PathInfoService;
 use crate::{proto, Error};
-use nix_compat::store_path::DIGEST_SIZE;
 use prost::Message;
 use std::path::PathBuf;
 use tracing::warn;
 
-use super::PathInfoService;
-
 /// SledPathInfoService stores PathInfo in a [sled](https://github.com/spacejam/sled).
 ///
 /// The PathInfo messages are stored as encoded protos, and keyed by their output hash,
@@ -31,36 +29,25 @@ impl SledPathInfoService {
 }
 
 impl PathInfoService for SledPathInfoService {
-    fn get(
-        &self,
-        by_what: proto::get_path_info_request::ByWhat,
-    ) -> Result<Option<proto::PathInfo>, Error> {
-        match by_what {
-            proto::get_path_info_request::ByWhat::ByOutputHash(digest) => {
-                if digest.len() != DIGEST_SIZE {
-                    return Err(Error::InvalidRequest("invalid digest length".to_string()));
-                }
-
-                match self.db.get(digest) {
-                    Ok(None) => Ok(None),
-                    Ok(Some(data)) => match proto::PathInfo::decode(&*data) {
-                        Ok(path_info) => Ok(Some(path_info)),
-                        Err(e) => {
-                            warn!("failed to decode stored PathInfo: {}", e);
-                            Err(Error::StorageError(format!(
-                                "failed to decode stored PathInfo: {}",
-                                e
-                            )))
-                        }
-                    },
-                    Err(e) => {
-                        warn!("failed to retrieve PathInfo: {}", e);
-                        Err(Error::StorageError(format!(
-                            "failed to retrieve PathInfo: {}",
-                            e
-                        )))
-                    }
+    fn get(&self, digest: [u8; 20]) -> Result<Option<proto::PathInfo>, Error> {
+        match self.db.get(digest) {
+            Ok(None) => Ok(None),
+            Ok(Some(data)) => match proto::PathInfo::decode(&*data) {
+                Ok(path_info) => Ok(Some(path_info)),
+                Err(e) => {
+                    warn!("failed to decode stored PathInfo: {}", e);
+                    Err(Error::StorageError(format!(
+                        "failed to decode stored PathInfo: {}",
+                        e
+                    )))
                 }
+            },
+            Err(e) => {
+                warn!("failed to retrieve PathInfo: {}", e);
+                Err(Error::StorageError(format!(
+                    "failed to retrieve PathInfo: {}",
+                    e
+                )))
             }
         }
     }