Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deduplicate tz locations against root #5759

Merged
merged 4 commits into from
Nov 3, 2024
Merged

Deduplicate tz locations against root #5759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62d7398
dedupe location names against root
robertbastian Oct 31, 2024
97ce17a
und fall back to endonyms
robertbastian Oct 31, 2024
5209eea
en last resort
robertbastian Oct 31, 2024
f148e77
test
robertbastian Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions components/datetime/src/format/neo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ impl From<RawDateTimeNames<DateMarker>> for RawDateTimeNames<DateTimeMarker> {
weekday_names: other.weekday_names,
dayperiod_names: DateTimeNamesData2::none(),
zone_essentials: (),
locations_root: (),
locations: (),
mz_generic_long: (),
mz_generic_short: (),
Expand All @@ -517,6 +518,7 @@ impl From<RawDateTimeNames<TimeMarker>> for RawDateTimeNames<DateTimeMarker> {
weekday_names: DateTimeNamesData2::none(),
dayperiod_names: other.dayperiod_names,
zone_essentials: (),
locations_root: (),
locations: (),
mz_generic_long: (),
mz_generic_short: (),
Expand Down Expand Up @@ -545,6 +547,8 @@ pub(crate) struct RawDateTimeNames<R: DateTimeNamesMarker> {
>,
zone_essentials:
<R::ZoneEssentials as DateTimeNamesHolderTrait<tz::EssentialsV1Marker>>::Container<()>,
locations_root:
<R::ZoneLocations as DateTimeNamesHolderTrait<tz::LocationsV1Marker>>::Container<()>,
Comment on lines +550 to +551
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thought: This makes DateTimeFormatter<YMDHMSZ> a little bit bigger in stack size.

locations: <R::ZoneLocations as DateTimeNamesHolderTrait<tz::LocationsV1Marker>>::Container<()>,
mz_generic_long:
<R::ZoneGenericLong as DateTimeNamesHolderTrait<tz::MzGenericLongV1Marker>>::Container<()>,
Expand Down Expand Up @@ -589,6 +593,7 @@ pub(crate) struct RawDateTimeNamesBorrowed<'l> {
weekday_names: OptionalNames<(fields::Weekday, FieldLength), &'l LinearNamesV1<'l>>,
dayperiod_names: OptionalNames<FieldLength, &'l LinearNamesV1<'l>>,
zone_essentials: OptionalNames<(), &'l tz::EssentialsV1<'l>>,
locations_root: OptionalNames<(), &'l tz::LocationsV1<'l>>,
locations: OptionalNames<(), &'l tz::LocationsV1<'l>>,
mz_generic_long: OptionalNames<(), &'l tz::MzGenericV1<'l>>,
mz_generic_short: OptionalNames<(), &'l tz::MzGenericV1<'l>>,
Expand Down Expand Up @@ -1659,6 +1664,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
weekday_names: <R::WeekdayNames as DateTimeNamesHolderTrait<WeekdayNamesV1Marker>>::Container::<_>::new_empty(),
dayperiod_names: <R::DayPeriodNames as DateTimeNamesHolderTrait<DayPeriodNamesV1Marker>>::Container::<_>::new_empty(),
zone_essentials: <R::ZoneEssentials as DateTimeNamesHolderTrait<tz::EssentialsV1Marker>>::Container::<_>::new_empty(),
locations_root: <R::ZoneLocations as DateTimeNamesHolderTrait<tz::LocationsV1Marker>>::Container::<_>::new_empty(),
locations: <R::ZoneLocations as DateTimeNamesHolderTrait<tz::LocationsV1Marker>>::Container::<_>::new_empty(),
mz_generic_long: <R::ZoneGenericLong as DateTimeNamesHolderTrait<tz::MzGenericLongV1Marker>>::Container::<_>::new_empty(),
mz_generic_short: <R::ZoneGenericShort as DateTimeNamesHolderTrait<tz::MzGenericShortV1Marker>>::Container::<_>::new_empty(),
Expand All @@ -1677,6 +1683,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
weekday_names: self.weekday_names.get().inner,
dayperiod_names: self.dayperiod_names.get().inner,
zone_essentials: self.zone_essentials.get().inner,
locations_root: self.locations_root.get().inner,
locations: self.locations.get().inner,
mz_generic_long: self.mz_generic_long.get().inner,
mz_generic_short: self.mz_generic_short.get().inner,
Expand Down Expand Up @@ -1896,6 +1903,10 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
id: DataIdentifierBorrowed::for_locale(locale),
..Default::default()
};
self.locations_root
.load_put(provider, Default::default(), variables)
.map_err(|e| MaybePayloadError2::into_single_load_error(e, field))?
.map_err(SingleLoadError::Data)?;
self.locations
.load_put(provider, req, variables)
.map_err(|e| MaybePayloadError2::into_single_load_error(e, field))?
Expand Down Expand Up @@ -2626,6 +2637,7 @@ impl<'data> RawDateTimeNamesBorrowed<'data> {
pub(crate) fn get_payloads(&self) -> crate::time_zone::TimeZoneDataPayloadsBorrowed<'data> {
TimeZoneDataPayloadsBorrowed {
essentials: self.zone_essentials.get_option(),
locations_root: self.locations_root.get_option(),
locations: self.locations.get_option(),
mz_generic_long: self.mz_generic_long.get_option(),
mz_generic_short: self.mz_generic_short.get_option(),
Expand Down
32 changes: 28 additions & 4 deletions components/datetime/src/time_zone.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ impl ResolvedNeoTimeZoneSkeleton {
pub(crate) struct TimeZoneDataPayloadsBorrowed<'a> {
/// The data that contains meta information about how to display content.
pub(crate) essentials: Option<&'a provider::time_zones::TimeZoneEssentialsV1<'a>>,
/// The location names, e.g. Germany Time
/// The root location names, e.g. Toronto
pub(crate) locations_root: Option<&'a provider::time_zones::LocationsV1<'a>>,
/// The language specific location names, e.g. Italy
pub(crate) locations: Option<&'a provider::time_zones::LocationsV1<'a>>,
/// The generic long metazone names, e.g. Pacific Time
pub(crate) mz_generic_long: Option<&'a provider::time_zones::MetazoneGenericNamesV1<'a>>,
Expand Down Expand Up @@ -561,7 +563,15 @@ impl FormatTimeZone for GenericLocationFormat {
return Ok(Err(FormatTimeZoneError::MissingZoneSymbols));
};

let Some(location) = locations.locations.get(&time_zone_id) else {
let Some(locations_root) = data_payloads.locations_root else {
return Ok(Err(FormatTimeZoneError::MissingZoneSymbols));
};

let Some(location) = locations
.locations
.get(&time_zone_id)
.or_else(|| locations_root.locations.get(&time_zone_id))
else {
return Ok(Err(FormatTimeZoneError::Fallback));
};

Expand Down Expand Up @@ -597,8 +607,15 @@ impl FormatTimeZone for SpecificLocationFormat {
let Some(locations) = data_payloads.locations else {
return Ok(Err(FormatTimeZoneError::MissingZoneSymbols));
};
let Some(locations_root) = data_payloads.locations_root else {
return Ok(Err(FormatTimeZoneError::MissingZoneSymbols));
};

let Some(location) = locations.locations.get(&time_zone_id) else {
let Some(location) = locations
.locations
.get(&time_zone_id)
.or_else(|| locations_root.locations.get(&time_zone_id))
else {
return Ok(Err(FormatTimeZoneError::Fallback));
};

Expand Down Expand Up @@ -639,6 +656,9 @@ impl FormatTimeZone for GenericPartialLocationFormat {
let Some(locations) = data_payloads.locations else {
return Ok(Err(FormatTimeZoneError::MissingZoneSymbols));
};
let Some(locations_root) = data_payloads.locations_root else {
return Ok(Err(FormatTimeZoneError::MissingZoneSymbols));
};
let Some(non_locations) = (match self.0 {
FieldLength::Wide => data_payloads.mz_generic_long.as_ref(),
_ => data_payloads.mz_generic_short.as_ref(),
Expand All @@ -648,7 +668,11 @@ impl FormatTimeZone for GenericPartialLocationFormat {
let Some(metazone_period) = data_payloads.mz_periods else {
return Ok(Err(FormatTimeZoneError::MissingZoneSymbols));
};
let Some(location) = locations.locations.get(&time_zone_id) else {
let Some(location) = locations
.locations
.get(&time_zone_id)
.or_else(|| locations_root.locations.get(&time_zone_id))
else {
return Ok(Err(FormatTimeZoneError::Fallback));
};
let Some(non_location) =
Expand Down
300 changes: 150 additions & 150 deletions provider/data/datetime/data/locations_v1_marker.rs.data
View file
Open in desktop

Large diffs are not rendered by default.

Loading