Rename rust_store -> object_store_ffi (#14)

Author: nickrobinson251

deps/build.jl

@@ -39,7 +39,7 @@ run(`which rustup`)
 run(`rustup default stable`)
 run(`which cargo`)
 assert_compatible_version(`cargo -V`, "1.55.0")
-rust_source = joinpath(@__DIR__, "rust_store")
+rust_source = joinpath(@__DIR__, "object_store_ffi")
 # Elide rust warnings - they aren't helpful in this context
 if Sys.isapple()
     ENV["RUSTFLAGS"]="-Awarnings -Clink-arg=-undefined -Clink-arg=dynamic_lookup"

deps/rust_store/.cargo/config.toml renamed to deps/object_store_ffi/.cargo/config.toml

@@ -1,5 +1,5 @@
 [package]
-name = "rust_store"
+name = "object_store_ffi"
 version = "0.1.0"
 edition = "2021"
 

deps/rust_store/.gitignore renamed to deps/object_store_ffi/.gitignore

@@ -1,19 +1,19 @@
 module ObjectStore
 
 
-export init_rust_store, blob_get!, blob_put, AzureCredentials, RustStoreConfig
+export init_object_store, blob_get!, blob_put, AzureCredentials, ObjectStoreConfig
 
 const rust_lib_dir = @static if Sys.islinux() || Sys.isapple()
     joinpath(
         @__DIR__,
         "..",
         "deps",
-        "rust_store",
+        "object_store_ffi",
         "target",
         "release",
     )
 elseif Sys.iswindows()
-    @warn("The rust-store library is currently unsupported on Windows.")
+    @warn("The object_store_ffi library is currently unsupported on Windows.")
 end
 
 const extension = @static if Sys.islinux()
@@ -24,25 +24,25 @@ elseif Sys.iswindows()
     "dll"
 end
 
-const rust_lib = joinpath(rust_lib_dir, "librust_store.$extension")
+const rust_lib = joinpath(rust_lib_dir, "libobject_store_ffi.$extension")
 
-struct RustStoreConfig
+struct ObjectStoreConfig
     max_retries::Culonglong
     retry_timeout_sec::Culonglong
 end
 
-const RUST_STORE_STARTED = Ref(false)
+const OBJECT_STORE_STARTED = Ref(false)
 const _INIT_LOCK::ReentrantLock = ReentrantLock()
-function init_rust_store(config::RustStoreConfig = RustStoreConfig(15, 150))
+function init_object_store(config::ObjectStoreConfig = ObjectStoreConfig(15, 150))
     Base.@lock _INIT_LOCK begin
-        if RUST_STORE_STARTED[]
+        if OBJECT_STORE_STARTED[]
             return
         end
-        res = @ccall rust_lib.start(config::RustStoreConfig)::Cint
+        res = @ccall rust_lib.start(config::ObjectStoreConfig)::Cint
         if res != 0
-            error("Failed to init_rust_store")
+            error("Failed to init_object_store")
         end
-        RUST_STORE_STARTED[] = true
+        OBJECT_STORE_STARTED[] = true
     end
 end
 

deps/rust_store/Cargo.lock renamed to deps/object_store_ffi/Cargo.lock

@@ -1,4 +1,4 @@
-@testitem "Basic BlobStorage exceptions" setup=[InitializeRustStore] begin
+@testitem "Basic BlobStorage exceptions" setup=[InitializeObjectStore] begin
     using CloudBase.CloudTest: Azurite
     import CloudBase
     using ObjectStore: blob_get!, blob_put, AzureCredentials
@@ -146,8 +146,8 @@
     end
 
     @testset "multiple start" begin
-        config = RustStoreConfig(5, 5)
-        res = @ccall ObjectStore.rust_lib.start(config::RustStoreConfig)::Cint
+        config = ObjectStoreConfig(5, 5)
+        res = @ccall ObjectStore.rust_lib.start(config::ObjectStoreConfig)::Cint
         @test res == 1 # Rust CResult::Error
     end
 end # @testitem

deps/rust_store/Cargo.toml renamed to deps/object_store_ffi/Cargo.toml

@@ -1,4 +1,4 @@
-@testitem "Basic BlobStorage usage" setup=[InitializeRustStore] begin
+@testitem "Basic BlobStorage usage" setup=[InitializeObjectStore] begin
 using CloudBase.CloudTest: Azurite
 using ObjectStore: blob_get!, blob_put, AzureCredentials
 
@@ -101,7 +101,7 @@ end # Azurite.with
 end # @testitem
 
 # NOTE: PUT on azure always requires credentials, while GET on public containers doesn't
-@testitem "Basic BlobStorage usage (anonymous read enabled)" setup=[InitializeRustStore] begin
+@testitem "Basic BlobStorage usage (anonymous read enabled)" setup=[InitializeObjectStore] begin
 # TODO: implement a way for GET to be called without credentials
 @test_skip begin
 using CloudBase.CloudTest: Azurite

deps/rust_store/src/lib.rs renamed to deps/object_store_ffi/src/lib.rs

@@ -1,8 +1,8 @@
-@testsetup module InitializeRustStore
+@testsetup module InitializeObjectStore
     using ObjectStore
     # Since we currently only support centralized configs, we need to have one that is compatible
     # with all the tests (some of the tests would take too long if we use default values).
     max_retries = 5
     retry_timeout_sec = 5
-    ObjectStore.init_rust_store(ObjectStore.RustStoreConfig(max_retries, retry_timeout_sec))
+    init_object_store(ObjectStoreConfig(max_retries, retry_timeout_sec))
 end