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

Export key registry from datagen #1714

Merged
merged 1 commit into from
Mar 24, 2022
Merged

Export key registry from datagen #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 4 additions & 19 deletions tools/datagen/src/bin/verify-zero-copy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
use clap::{App, Arg, ArgGroup};
use icu_datagen::get_all_keys;
use icu_provider::datagen::IterableDynProvider;
use icu_provider::datagen::{DataConverter, HeapStatsMarker, OmnibusDatagenProvider};
use icu_provider::datagen::{DataConverter, HeapStatsMarker};
use icu_provider::filter::Filterable;
use icu_provider::fork::by_key::MultiForkByKeyProvider;

use icu_provider::prelude::*;
use icu_provider::serde::SerializeMarker;

use icu_provider_blob::BlobDataProvider;
use icu_provider_cldr::CldrPathsAllInOne;
use litemap::LiteMap;
Expand Down Expand Up @@ -180,22 +180,7 @@ fn main() -> eyre::Result<()> {

let segmenter_data_root = icu_provider_segmenter::segmenter_data_root();

let converter: Box<dyn OmnibusDatagenProvider<SerializeMarker> + Sync> =
Box::new(MultiForkByKeyProvider {
providers: vec![
Box::new(icu_provider_cldr::create_exportable_provider(
cldr_paths.as_ref(),
uprops_root.clone(),
)?),
Box::new(icu_provider_uprops::create_exportable_provider(
&uprops_root,
)?),
Box::new(icu_provider_segmenter::create_exportable_provider(
&segmenter_data_root,
&uprops_root,
)?),
],
});
let converter = icu_datagen::get_registry(&*cldr_paths, &uprops_root, &segmenter_data_root)?;

let selected_locales = icu_testdata::metadata::load()?.package_metadata.locales;

Expand Down
30 changes: 29 additions & 1 deletion tools/datagen/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,15 @@
//! --out /tmp/icu4x_data/work_log_json
//! ```

use icu_provider::datagen::OmnibusDatagenProvider;
use icu_provider::fork::by_key::MultiForkByKeyProvider;
use icu_provider::serde::SerializeMarker;
use icu_provider::ResourceKey;
use icu_provider_cldr::CldrPaths;
use std::path::Path;

/// List of all supported keys
pub fn get_all_keys() -> Vec<ResourceKey> {
// TODO(#1512): Use central key repository
let mut v = vec![];
v.extend(icu_provider_cldr::ALL_KEYS);
v.extend(icu_properties::provider::key::ALL_MAP_KEYS);
Expand All @@ -62,6 +67,29 @@ pub fn get_all_keys() -> Vec<ResourceKey> {
v
}

/// Get a registry that has the appropriate ConvertData and IterableDynProvider implementations
pub fn get_registry(
cldr_paths: &impl CldrPaths,
uprops_root: &Path,
segmenter_data_root: &Path,
) -> Result<impl OmnibusDatagenProvider<SerializeMarker>, eyre::Report> {
Ok(MultiForkByKeyProvider {
providers: vec![
Box::new(icu_provider_cldr::create_exportable_provider(
cldr_paths,
uprops_root.into(),
)?),
Box::new(icu_provider_uprops::create_exportable_provider(
uprops_root,
)?),
Box::new(icu_provider_segmenter::create_exportable_provider(
segmenter_data_root,
uprops_root,
)?),
],
})
}

#[test]
fn no_key_collisions() {
let mut map = std::collections::BTreeMap::new();
Expand Down