snowykami/meilisearch
1
0
Fork 0
mirror of https://github.com/meilisearch/meilisearch.git synced 2024-11-22 18:17:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix the update from v1_9 to v1_10 by providing a custom datetime formatter myself

Browse Source
This commit is contained in:
Tamo 2024-11-04 15:50:38 +01:00
parent 5f57306858
commit 4eef0cd332
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meilitool/src/upgrade/v1_10.rs
View File

@ -58,8 +58,8 @@ impl From<v1_9::IndexStats> for IndexStats {
database_size, database_size,
used_database_size, used_database_size,
field_distribution, field_distribution,
created_at, created_at: created_at.0,
updated_at, updated_at: updated_at.0,
} }
} }
} }
@ -76,6 +76,13 @@ fn update_index_stats(
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let ctx = || format!("while updating index stats for index `{index_uid}`"); let ctx = || format!("while updating index stats for index `{index_uid}`");
let stats: Option<&str> = index_stats
.remap_data_type::<Str>()
.get(sched_wtxn, &index_uuid)
.with_context(ctx)
.with_context(|| "While reading value")?;
dbg!(stats);
let stats: Option<v1_9::IndexStats> = index_stats let stats: Option<v1_9::IndexStats> = index_stats
.remap_data_type::<SerdeJson<v1_9::IndexStats>>() .remap_data_type::<SerdeJson<v1_9::IndexStats>>()
.get(sched_wtxn, &index_uuid) .get(sched_wtxn, &index_uuid)
@ -139,13 +146,13 @@ fn date_round_trip(
key: &str, key: &str,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let datetime = let datetime =
db.remap_types::<Str, SerdeJson<v1_9::OffsetDateTime>>().get(wtxn, key).with_context( db.remap_types::<Str, SerdeJson<v1_9::LegacyTime>>().get(wtxn, key).with_context(|| {
|| format!("could not read `{key}` while updating date format for index `{index_uid}`"), format!("could not read `{key}` while updating date format for index `{index_uid}`")
)?; })?;
if let Some(datetime) = datetime { if let Some(datetime) = datetime {
db.remap_types::<Str, SerdeJson<self::OffsetDateTime>>() db.remap_types::<Str, SerdeJson<self::OffsetDateTime>>()
.put(wtxn, key, &self::OffsetDateTime(datetime)) .put(wtxn, key, &self::OffsetDateTime(datetime.0))
.with_context(|| { .with_context(|| {
format!( format!(
"could not write `{key}` while updating date format for index `{index_uid}`" "could not write `{key}` while updating date format for index `{index_uid}`"

12
meilitool/src/upgrade/v1_9.rs
View File

@ -1,4 +1,5 @@
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use time::OffsetDateTime;
pub type FieldDistribution = std::collections::BTreeMap<String, u64>; pub type FieldDistribution = std::collections::BTreeMap<String, u64>;
@ -21,9 +22,9 @@ pub struct IndexStats {
/// Association of every field name with the number of times it occurs in the documents. /// Association of every field name with the number of times it occurs in the documents.
pub field_distribution: FieldDistribution, pub field_distribution: FieldDistribution,
/// Creation date of the index. /// Creation date of the index.
pub created_at: time::OffsetDateTime, pub created_at: LegacyTime,
/// Date of the last update of the index. /// Date of the last update of the index.
pub updated_at: time::OffsetDateTime, pub updated_at: LegacyTime,
} }
#[derive(Debug, Deserialize, Serialize)] #[derive(Debug, Deserialize, Serialize)]
@ -97,4 +98,9 @@ mod rest {
} }
} }
pub type OffsetDateTime = time::OffsetDateTime; // 2024-11-04 13:32:08.48368 +00:00:00
time::serde::format_description!(legacy_datetime, OffsetDateTime, "[year]-[month]-[day] [hour]:[minute]:[second].[subsecond] [offset_hour sign:mandatory]:[offset_minute]:[offset_second]");
#[derive(Debug, serde::Serialize, serde::Deserialize)]
#[serde(transparent)]
pub struct LegacyTime(#[serde(with = "legacy_datetime")] pub OffsetDateTime);