mirror of
https://github.com/meilisearch/meilisearch.git
synced 2024-11-26 12:05:05 +08:00
Clippy fixes after updating Rust to v1.66
This commit is contained in:
parent
867279f2a4
commit
869d331680
@ -102,7 +102,7 @@ impl V4Reader {
|
|||||||
&self.dump.path().join("indexes").join(index.index_meta.uuid.to_string()),
|
&self.dump.path().join("indexes").join(index.index_meta.uuid.to_string()),
|
||||||
&index.index_meta,
|
&index.index_meta,
|
||||||
BufReader::new(
|
BufReader::new(
|
||||||
File::open(&self.dump.path().join("updates").join("data.jsonl")).unwrap(),
|
File::open(self.dump.path().join("updates").join("data.jsonl")).unwrap(),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}))
|
}))
|
||||||
|
@ -25,7 +25,7 @@ impl DumpWriter {
|
|||||||
if let Some(instance_uuid) = instance_uuid {
|
if let Some(instance_uuid) = instance_uuid {
|
||||||
fs::write(
|
fs::write(
|
||||||
dir.path().join("instance_uid.uuid"),
|
dir.path().join("instance_uid.uuid"),
|
||||||
&instance_uuid.as_hyphenated().to_string(),
|
instance_uuid.as_hyphenated().to_string(),
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ impl DumpWriter {
|
|||||||
};
|
};
|
||||||
fs::write(dir.path().join("metadata.json"), serde_json::to_string(&metadata)?)?;
|
fs::write(dir.path().join("metadata.json"), serde_json::to_string(&metadata)?)?;
|
||||||
|
|
||||||
std::fs::create_dir(&dir.path().join("indexes"))?;
|
std::fs::create_dir(dir.path().join("indexes"))?;
|
||||||
|
|
||||||
Ok(DumpWriter { dir })
|
Ok(DumpWriter { dir })
|
||||||
}
|
}
|
||||||
|
@ -666,7 +666,7 @@ impl IndexScheduler {
|
|||||||
let snapshot_path = self.snapshots_path.join(format!("{}.snapshot", db_name));
|
let snapshot_path = self.snapshots_path.join(format!("{}.snapshot", db_name));
|
||||||
let temp_snapshot_file = tempfile::NamedTempFile::new_in(&self.snapshots_path)?;
|
let temp_snapshot_file = tempfile::NamedTempFile::new_in(&self.snapshots_path)?;
|
||||||
compression::to_tar_gz(temp_snapshot_dir.path(), temp_snapshot_file.path())?;
|
compression::to_tar_gz(temp_snapshot_dir.path(), temp_snapshot_file.path())?;
|
||||||
let file = temp_snapshot_file.persist(&snapshot_path)?;
|
let file = temp_snapshot_file.persist(snapshot_path)?;
|
||||||
|
|
||||||
// 5.3 Change the permission to make the snapshot readonly
|
// 5.3 Change the permission to make the snapshot readonly
|
||||||
let mut permissions = file.metadata()?.permissions();
|
let mut permissions = file.metadata()?.permissions();
|
||||||
|
@ -1216,7 +1216,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (_uuid, mut file) = index_scheduler.create_update_file_with_uuid(file_uuid).unwrap();
|
let (_uuid, mut file) = index_scheduler.create_update_file_with_uuid(file_uuid).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
(file, documents_count)
|
(file, documents_count)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1596,7 +1596,7 @@ mod tests {
|
|||||||
}"#;
|
}"#;
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -1633,7 +1633,7 @@ mod tests {
|
|||||||
snapshot!(snapshot_index_scheduler(&index_scheduler), name: "registered_the_first_task");
|
snapshot!(snapshot_index_scheduler(&index_scheduler), name: "registered_the_first_task");
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -1800,7 +1800,7 @@ mod tests {
|
|||||||
}"#;
|
}"#;
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -1958,7 +1958,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2005,7 +2005,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2054,7 +2054,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2104,7 +2104,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2155,7 +2155,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2602,7 +2602,7 @@ mod tests {
|
|||||||
}"#;
|
}"#;
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2640,7 +2640,7 @@ mod tests {
|
|||||||
}"#;
|
}"#;
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(0).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2696,7 +2696,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2744,7 +2744,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2798,7 +2798,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2857,7 +2857,7 @@ mod tests {
|
|||||||
);
|
);
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2921,7 +2921,7 @@ mod tests {
|
|||||||
let allow_index_creation = i % 2 != 0;
|
let allow_index_creation = i % 2 != 0;
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
@ -2974,7 +2974,7 @@ mod tests {
|
|||||||
let allow_index_creation = i % 2 != 0;
|
let allow_index_creation = i % 2 != 0;
|
||||||
|
|
||||||
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
let (uuid, mut file) = index_scheduler.create_update_file_with_uuid(i).unwrap();
|
||||||
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap() as u64;
|
let documents_count = read_json(content.as_bytes(), file.as_file_mut()).unwrap();
|
||||||
file.persist().unwrap();
|
file.persist().unwrap();
|
||||||
index_scheduler
|
index_scheduler
|
||||||
.register(KindWithContent::DocumentAdditionOrUpdate {
|
.register(KindWithContent::DocumentAdditionOrUpdate {
|
||||||
|
@ -29,7 +29,7 @@ pub fn default_snapshot_settings_for_test<'a>(
|
|||||||
let test_name = test_name.strip_suffix("::{{closure}}").unwrap_or(test_name);
|
let test_name = test_name.strip_suffix("::{{closure}}").unwrap_or(test_name);
|
||||||
let test_name = test_name.rsplit("::").next().unwrap().to_owned();
|
let test_name = test_name.rsplit("::").next().unwrap().to_owned();
|
||||||
|
|
||||||
let path = Path::new("snapshots").join(filename).join(&test_name);
|
let path = Path::new("snapshots").join(filename).join(test_name);
|
||||||
settings.set_snapshot_path(path.clone());
|
settings.set_snapshot_path(path.clone());
|
||||||
let snap_name = if let Some(name) = name {
|
let snap_name = if let Some(name) = name {
|
||||||
Cow::Borrowed(name)
|
Cow::Borrowed(name)
|
||||||
|
@ -18,7 +18,7 @@ impl AuthController {
|
|||||||
let keys_file_path = dst.as_ref().join(KEYS_PATH);
|
let keys_file_path = dst.as_ref().join(KEYS_PATH);
|
||||||
|
|
||||||
let keys = store.list_api_keys()?;
|
let keys = store.list_api_keys()?;
|
||||||
let mut keys_file = File::create(&keys_file_path)?;
|
let mut keys_file = File::create(keys_file_path)?;
|
||||||
for key in keys {
|
for key in keys {
|
||||||
serde_json::to_writer(&mut keys_file, &key)?;
|
serde_json::to_writer(&mut keys_file, &key)?;
|
||||||
keys_file.write_all(b"\n")?;
|
keys_file.write_all(b"\n")?;
|
||||||
|
@ -19,7 +19,7 @@ pub fn create_version_file(db_path: &Path) -> io::Result<()> {
|
|||||||
pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> {
|
pub fn check_version_file(db_path: &Path) -> anyhow::Result<()> {
|
||||||
let version_path = db_path.join(VERSION_FILE_NAME);
|
let version_path = db_path.join(VERSION_FILE_NAME);
|
||||||
|
|
||||||
match fs::read_to_string(&version_path) {
|
match fs::read_to_string(version_path) {
|
||||||
Ok(version) => {
|
Ok(version) => {
|
||||||
let version_components = version.split('.').collect::<Vec<_>>();
|
let version_components = version.split('.').collect::<Vec<_>>();
|
||||||
let (major, minor, patch) = match &version_components[..] {
|
let (major, minor, patch) = match &version_components[..] {
|
||||||
|
@ -51,7 +51,7 @@ fn config_user_id_path(db_path: &Path) -> Option<PathBuf> {
|
|||||||
fn find_user_id(db_path: &Path) -> Option<InstanceUid> {
|
fn find_user_id(db_path: &Path) -> Option<InstanceUid> {
|
||||||
fs::read_to_string(db_path.join("instance-uid"))
|
fs::read_to_string(db_path.join("instance-uid"))
|
||||||
.ok()
|
.ok()
|
||||||
.or_else(|| fs::read_to_string(&config_user_id_path(db_path)?).ok())
|
.or_else(|| fs::read_to_string(config_user_id_path(db_path)?).ok())
|
||||||
.and_then(|uid| InstanceUid::from_str(&uid).ok())
|
.and_then(|uid| InstanceUid::from_str(&uid).ok())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user