Merge pull request #10 from wasm-forge/large_files

Better reading large files

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stable-fs"
-version = "0.5.0"
+version = "0.5.1"
 edition = "2021"
 description = "A Simple File system implementing WASI endpoints and using the stable structures of the Internet Computer"
 keywords = ["ic", "internet-computer", "file-system"]
@@ -9,7 +9,7 @@ repository = "https://github.com/wasm-forge/stable-fs"
 
 [dependencies]
 bitflags = "2.3.1"
-ic-cdk = "0.13.1"
+ic-cdk = "0.15"
 ic-stable-structures = "0.6.5"
 serde = "1.0.164"
 serde_bytes = "0.11"

build_tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd src/tests/fs_benchmark_test
+cd tests/fs_benchmark_test
 
 cargo build --release --target wasm32-unknown-unknown
 
@@ -12,4 +12,3 @@ cargo build --release --target wasm32-unknown-unknown
 
 wasi2ic target/wasm32-unknown-unknown/release/demo_test_upgraded_backend.wasm target/wasm32-unknown-unknown/release/demo_test_upgraded_backend_small.wasm
 
-

src/fs.rs

@@ -180,7 +180,9 @@ impl FileSystem {
         let mut written_size = 0;
         for buf in src {
             let buf = unsafe { std::slice::from_raw_parts(buf.buf, buf.len) };
+
             let size = file.write_with_offset(written_size + offset, buf, self.storage.as_mut())?;
+
             written_size += size;
         }
         self.put_file(fd, file);

src/integration_tests.rs

@@ -3,8 +3,8 @@ use fns::read_text;
 use pocket_ic::PocketIc;
 use std::{cell::RefCell, fs};
 
-const BACKEND_WASM: &str = "src/tests/fs_benchmark_test/target/wasm32-unknown-unknown/release/fs_benchmark_test_backend_small.wasm";
-const BACKEND_WASM_UPGRADED: &str = "src/tests/demo_test_upgraded/target/wasm32-unknown-unknown/release/demo_test_upgraded_backend_small.wasm";
+const BACKEND_WASM: &str = "tests/fs_benchmark_test/target/wasm32-unknown-unknown/release/fs_benchmark_test_backend_small.wasm";
+const BACKEND_WASM_UPGRADED: &str = "tests/demo_test_upgraded/target/wasm32-unknown-unknown/release/demo_test_upgraded_backend_small.wasm";
 
 thread_local!(
     static ACTIVE_CANISTER: RefCell<Option<Principal>> = RefCell::new(None);
@@ -63,7 +63,7 @@ fn upgrade_canister(pic: &PocketIc) {
 
 mod fns {
 
-    use candid::{decode_one, encode_one, Principal};
+    use candid::{decode_args, decode_one, encode_one, Principal};
     use pocket_ic::{PocketIc, WasmResult};
 
     use super::active_canister;
@@ -111,6 +111,25 @@ mod fns {
         }
     }
 
+    pub(crate) fn read_bytes(pic: &PocketIc, filename: &str, offset: i64, size: u64) -> (u64, u64) {
+        let response = pic
+            .update_call(
+                active_canister(),
+                Principal::anonymous(),
+                "read_bytes",
+                candid::encode_args((filename, offset, size)).unwrap(),
+            )
+            .unwrap();
+
+        if let WasmResult::Reply(response) = response {
+            let result: (u64, u64) = decode_args(&response).unwrap();
+
+            return result;
+        } else {
+            panic!("unintended call failure!");
+        }
+    }
+
     pub(crate) fn create_files(pic: &PocketIc, path: &str, count: u64) {
         pic.update_call(
             active_canister(),
@@ -349,3 +368,24 @@ fn long_paths_and_file_names() {
     assert_eq!(expected_content, content);
 
 }
+
+
+#[test]
+fn large_file_read() {
+    let pic = setup_initial_canister();
+
+    let filename = "test.txt";
+
+    // create large file
+    fns::append_text(&pic, filename, "abcdef7890", 10_000_000);
+
+    let (instructions, size) = fns::read_bytes(&pic, filename, 13, 100_000_000);
+
+    println!("instructions {instructions}, size {size}");
+
+    assert!(instructions < 4_000_000_000, "The call should take less than 8 billion instructions");
+
+    assert_eq!(size, 99_999_987);
+
+
+}