snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-23 18:45:06 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

bump strois to a temporary version while we wait for rusty_s3 to do a new release

Browse Source
This commit is contained in:
Tamo 2023-10-13 11:04:12 +02:00
parent dfb84f80da
commit b22f1260bf
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -3707,8 +3707,7 @@ checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
[[package]] [[package]]
name = "rusty-s3" name = "rusty-s3"
version = "0.5.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/irevoire/rusty-s3?rev=b4d73a8#b4d73a83545fd6a6d211cc2b56eb8ed7bb248a62"
checksum = "31aa883f1b986a5249641e574ca0e11ac4fb9970b009c6fbb96fedaf4fa78db8"
dependencies = [ dependencies = [
"base64 0.21.2", "base64 0.21.2",
"hmac", "hmac",
@ -4010,8 +4009,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]] [[package]]
name = "strois" name = "strois"
version = "0.0.4" version = "0.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+http://github.com/meilisearch/strois?rev=7f6832a#7f6832ae701a5414b58441220e2a028c46bdb9ab"
checksum = "5dde87abcdf0638bf1e0e762e5f4466f68aa9862bc061093f3914641f9db26f6"
dependencies = [ dependencies = [
"http", "http",
"log", "log",

3
Cargo.toml
View File

@ -36,3 +36,6 @@ opt-level = 3
opt-level = 3 opt-level = 3
[profile.dev.package.roaring] [profile.dev.package.roaring]
opt-level = 3 opt-level = 3
[patch.crates-io]
strois = { git = "http://github.com/meilisearch/strois", rev = "7f6832a" }

5
meilisearch/src/lib.rs
View File

@ -39,7 +39,7 @@ use meilisearch_types::versioning::{check_version_file, create_version_file};
use meilisearch_types::{compression, milli, VERSION_FILE_NAME}; use meilisearch_types::{compression, milli, VERSION_FILE_NAME};
pub use option::Opt; pub use option::Opt;
use option::ScheduleSnapshot; use option::ScheduleSnapshot;
use strois::Client; use strois::Bucket;
use zookeeper::ZooKeeper; use zookeeper::ZooKeeper;
use crate::error::MeilisearchHttpError; use crate::error::MeilisearchHttpError;
@ -245,12 +245,13 @@ fn open_or_create_database_unchecked(
zookeeper: zookeeper.clone(), zookeeper: zookeeper.clone(),
s3: opt.s3_url.as_ref().map(|url| { s3: opt.s3_url.as_ref().map(|url| {
Arc::new( Arc::new(
Client::builder(url) Bucket::builder(url)
.unwrap() .unwrap()
.key(opt.s3_access_key.as_ref().expect("Need s3 key to work").clone()) .key(opt.s3_access_key.as_ref().expect("Need s3 key to work").clone())
.secret(opt.s3_secret_key.as_ref().expect("Need s3 secret to work").clone()) .secret(opt.s3_secret_key.as_ref().expect("Need s3 secret to work").clone())
.maybe_token(opt.s3_security_token.clone()) .maybe_token(opt.s3_security_token.clone())
.region(&opt.s3_region) .region(&opt.s3_region)
.with_url_path_style(true)
.bucket(opt.s3_bucket.as_ref().expect("Need an s3 bucket to work")) .bucket(opt.s3_bucket.as_ref().expect("Need an s3 bucket to work"))
.unwrap() .unwrap()
.get_or_create() .get_or_create()