From 2546446d51bd42bf13ce4d17926742545813dc51 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 5 Nov 2023 10:53:42 +0200 Subject: feat(tvix/castore): bump [Directory,File]Node size to u64 Having more than 4GiB files is quite possible (think about the NixOS graphical installer, and an uncompressed iso of it). No wire format changes. Change-Id: Ia78a07e4c554e91b93c5b9f8533266e4bd7f22b6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9950 Reviewed-by: tazjin Tested-by: BuildkiteCI --- tvix/castore/src/proto/tests/directory.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tvix/castore/src/proto/tests/directory.rs') diff --git a/tvix/castore/src/proto/tests/directory.rs b/tvix/castore/src/proto/tests/directory.rs index f2295740f2..a5e4f3c9c1 100644 --- a/tvix/castore/src/proto/tests/directory.rs +++ b/tvix/castore/src/proto/tests/directory.rs @@ -60,13 +60,13 @@ fn size() { #[test] #[cfg_attr(not(debug_assertions), ignore)] -#[should_panic = "Directory::size exceeds u32::MAX"] +#[should_panic = "Directory::size exceeds u64::MAX"] fn size_unchecked_panic() { let d = Directory { directories: vec![DirectoryNode { name: "foo".into(), digest: DUMMY_DIGEST.to_vec().into(), - size: u32::MAX, + size: u64::MAX, }], ..Default::default() }; @@ -81,12 +81,12 @@ fn size_unchecked_saturate() { directories: vec![DirectoryNode { name: "foo".into(), digest: DUMMY_DIGEST.to_vec().into(), - size: u32::MAX, + size: u64::MAX, }], ..Default::default() }; - assert_eq!(d.size(), u32::MAX); + assert_eq!(d.size(), u64::MAX); } #[test] @@ -98,18 +98,18 @@ fn size_checked() { directories: vec![DirectoryNode { name: "foo".into(), digest: DUMMY_DIGEST.to_vec().into(), - size: u32::MAX - 1, + size: u64::MAX - 1, }], ..Default::default() }; - assert_eq!(d.size_checked(), Some(u32::MAX)); + assert_eq!(d.size_checked(), Some(u64::MAX)); } { let d = Directory { directories: vec![DirectoryNode { name: "foo".into(), digest: DUMMY_DIGEST.to_vec().into(), - size: u32::MAX, + size: u64::MAX, }], ..Default::default() }; @@ -121,12 +121,12 @@ fn size_checked() { DirectoryNode { name: "foo".into(), digest: DUMMY_DIGEST.to_vec().into(), - size: u32::MAX / 2, + size: u64::MAX / 2, }, DirectoryNode { name: "foo".into(), digest: DUMMY_DIGEST.to_vec().into(), - size: u32::MAX / 2, + size: u64::MAX / 2, }, ], ..Default::default() @@ -363,7 +363,7 @@ fn validate_overflow() { directories: vec![DirectoryNode { name: "foo".into(), digest: DUMMY_DIGEST.to_vec().into(), - size: u32::MAX, + size: u64::MAX, }], ..Default::default() }; -- cgit 1.4.1