From 480a8106cf4761658e624fb05d6e639702bdda1a Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 1 Aug 2024 18:03:03 +0300 Subject: feat(tvix/store): Sled{PathInfo,Directory}Service -> Redb… MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use redb instead of sled for the default filesystem implementation of PathInfoService and DirectoryService. In the future we'll also drop sled support completely. Change-Id: I513ff0c2ff953d59714aa50b9aa1301b02f53d40 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12085 Autosubmit: Ilan Joselevich Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/boot/tests/default.nix | 4 ++-- tvix/docs/src/TODO.md | 1 - tvix/store/src/utils.rs | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tvix/boot/tests/default.nix b/tvix/boot/tests/default.nix index 051202cc20a9..7b9fbbbf8c57 100644 --- a/tvix/boot/tests/default.nix +++ b/tvix/boot/tests/default.nix @@ -157,8 +157,8 @@ depot.nix.readTree.drvTargets }); docs-persistent = (mkBootTest { blobServiceAddr = "objectstore+file:///build/blobs"; - directoryServiceAddr = "sled:///build/directories.sled"; - pathInfoServiceAddr = "sled:///build/pathinfo.sled"; + directoryServiceAddr = "redb:///build/directories.redb"; + pathInfoServiceAddr = "redb:///build/pathinfo.redb"; path = ../../docs; importPathName = "docs"; }); diff --git a/tvix/docs/src/TODO.md b/tvix/docs/src/TODO.md index fb85c9d6c602..84bcddd791a1 100644 --- a/tvix/docs/src/TODO.md +++ b/tvix/docs/src/TODO.md @@ -193,7 +193,6 @@ logs etc, but this is something requiring a lot of designing. root `Directory` digest. This won't allow indexing intermediate Directory nodes, but once we have `DirectoryService` composition, it shouldn't be an issue. - - [redb](https://www.redb.org/) backend ### PathInfoService - sqlite backend (different schema than the Nix one, we need the root nodes data!) diff --git a/tvix/store/src/utils.rs b/tvix/store/src/utils.rs index 4b07b35d694c..c550ad365ed7 100644 --- a/tvix/store/src/utils.rs +++ b/tvix/store/src/utils.rs @@ -41,11 +41,11 @@ pub struct ServiceUrls { #[arg( long, env, - default_value = "sled:///var/lib/tvix-store/directories.sled" + default_value = "redb:///var/lib/tvix-store/directories.redb" )] directory_service_addr: String, - #[arg(long, env, default_value = "sled:///var/lib/tvix-store/pathinfo.sled")] + #[arg(long, env, default_value = "redb:///var/lib/tvix-store/pathinfo.redb")] path_info_service_addr: String, /// Path to a TOML file describing the way the services should be composed -- cgit 1.4.1