RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:07:36 +00:00
Code Issues Activity Actions

LibLocale: Cache parsed CLDR files that must be read more than once

Browse source 
The LocaleData generator has to read a few of the CLDR files more than
once, to e.g. prepare some data up front (for reasons why, see commits
c86f7a6 and 0b69e9f). This takes non-neglible time, especially for large
JSON files such as currencies.json. So in these cases, cache the parsed
JSON in a map.

This reduces the runtime of GenerateLocaleData from 2.32s to 2.03s.
This commit is contained in:
Timothy Flynn 2023-07-28 10:03:19 -04:00 • committed by Jelle Raaijmakers
parent bf7af25a82
commit 63035f029a
1 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Meta/Lagom/Tools/CodeGenerators/LibLocale/GenerateLocaleData.cpp
View file

@ -240,6 +240,20 @@ struct CLDR {
_temporary_result.release_value(); \ _temporary_result.release_value(); \
}) })
// NOTE: We return a pointer only because ErrorOr cannot store references. You may safely assume the pointer is non-null.
ErrorOr<JsonValue const*> read_json_file_with_cache(DeprecatedString const& path)
{
static HashMap<DeprecatedString, JsonValue> parsed_json_cache;
if (auto parsed_json = parsed_json_cache.get(path); parsed_json.has_value())
return &parsed_json.value();
auto parsed_json = TRY(read_json_file(path));
TRY(parsed_json_cache.try_set(path, move(parsed_json)));
return &parsed_json_cache.get(path).value();
}
static ErrorOr<LanguageMapping> parse_language_mapping(CLDR& cldr, StringView key, StringView alias) static ErrorOr<LanguageMapping> parse_language_mapping(CLDR& cldr, StringView key, StringView alias)
{ {
auto parsed_key = TRY(CanonicalLanguageID::parse(cldr.unique_strings, key)); auto parsed_key = TRY(CanonicalLanguageID::parse(cldr.unique_strings, key));
@ -305,7 +319,7 @@ static ErrorOr<void> parse_identity(DeprecatedString locale_path, CLDR& cldr, Lo
LexicalPath locale_display_names_path(move(locale_path)); // Note: Every JSON file defines identity data, so we can use any of them. LexicalPath locale_display_names_path(move(locale_path)); // Note: Every JSON file defines identity data, so we can use any of them.
locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv); locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv);
auto locale_display_names = TRY(read_json_file(locale_display_names_path.string())); auto const& locale_display_names = *TRY(read_json_file_with_cache(locale_display_names_path.string()));
auto const& main_object = locale_display_names.as_object().get_object("main"sv).value(); auto const& main_object = locale_display_names.as_object().get_object("main"sv).value();
auto const& locale_object = main_object.get_object(locale_display_names_path.parent().basename()).value(); auto const& locale_object = main_object.get_object(locale_display_names_path.parent().basename()).value();
auto const& identity_object = locale_object.get_object("identity"sv).value(); auto const& identity_object = locale_object.get_object("identity"sv).value();
@ -342,7 +356,7 @@ static ErrorOr<void> parse_locale_display_patterns(DeprecatedString locale_path,
LexicalPath locale_display_names_path(move(locale_path)); LexicalPath locale_display_names_path(move(locale_path));
locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv); locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv);
auto locale_display_names = TRY(read_json_file(locale_display_names_path.string())); auto const& locale_display_names = *TRY(read_json_file_with_cache(locale_display_names_path.string()));
auto const& main_object = locale_display_names.as_object().get_object("main"sv).value(); auto const& main_object = locale_display_names.as_object().get_object("main"sv).value();
auto const& locale_object = main_object.get_object(locale_display_names_path.parent().basename()).value(); auto const& locale_object = main_object.get_object(locale_display_names_path.parent().basename()).value();
auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value(); auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value();
@ -366,7 +380,7 @@ static ErrorOr<void> preprocess_languages(DeprecatedString locale_path, CLDR& cl
if (!FileSystem::exists(languages_path.string())) if (!FileSystem::exists(languages_path.string()))
return {}; return {};
auto locale_languages = TRY(read_json_file(languages_path.string())); auto const& locale_languages = *TRY(read_json_file_with_cache(languages_path.string()));
auto const& main_object = locale_languages.as_object().get_object("main"sv).value(); auto const& main_object = locale_languages.as_object().get_object("main"sv).value();
auto const& locale_object = main_object.get_object(languages_path.parent().basename()).value(); auto const& locale_object = main_object.get_object(languages_path.parent().basename()).value();
auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value(); auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value();
@ -385,7 +399,7 @@ static ErrorOr<void> preprocess_currencies(DeprecatedString numbers_path, CLDR&
LexicalPath currencies_path(move(numbers_path)); LexicalPath currencies_path(move(numbers_path));
currencies_path = currencies_path.append("currencies.json"sv); currencies_path = currencies_path.append("currencies.json"sv);
auto locale_currencies = TRY(read_json_file(currencies_path.string())); auto const& locale_currencies = *TRY(read_json_file_with_cache(currencies_path.string()));
auto const& main_object = locale_currencies.as_object().get_object("main"sv).value(); auto const& main_object = locale_currencies.as_object().get_object("main"sv).value();
auto const& locale_object = main_object.get_object(currencies_path.parent().basename()).value(); auto const& locale_object = main_object.get_object(currencies_path.parent().basename()).value();
auto const& locale_numbers_object = locale_object.get_object("numbers"sv).value(); auto const& locale_numbers_object = locale_object.get_object("numbers"sv).value();
@ -479,7 +493,7 @@ static ErrorOr<void> parse_locale_languages(DeprecatedString locale_path, CLDR&
return {}; return {};
} }
auto locale_languages = TRY(read_json_file(languages_path.string())); auto const& locale_languages = *TRY(read_json_file_with_cache(languages_path.string()));
auto const& main_object = locale_languages.as_object().get_object("main"sv).value(); auto const& main_object = locale_languages.as_object().get_object("main"sv).value();
auto const& locale_object = main_object.get_object(languages_path.parent().basename()).value(); auto const& locale_object = main_object.get_object(languages_path.parent().basename()).value();
auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value(); auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value();
@ -646,7 +660,7 @@ static ErrorOr<void> parse_locale_currencies(DeprecatedString numbers_path, CLDR
LexicalPath currencies_path(move(numbers_path)); LexicalPath currencies_path(move(numbers_path));
currencies_path = currencies_path.append("currencies.json"sv); currencies_path = currencies_path.append("currencies.json"sv);
auto locale_currencies = TRY(read_json_file(currencies_path.string())); auto const& locale_currencies = *TRY(read_json_file_with_cache(currencies_path.string()));
auto const& main_object = locale_currencies.as_object().get_object("main"sv).value(); auto const& main_object = locale_currencies.as_object().get_object("main"sv).value();
auto const& locale_object = main_object.get_object(currencies_path.parent().basename()).value(); auto const& locale_object = main_object.get_object(currencies_path.parent().basename()).value();
auto const& locale_numbers_object = locale_object.get_object("numbers"sv).value(); auto const& locale_numbers_object = locale_object.get_object("numbers"sv).value();
@ -689,7 +703,7 @@ static ErrorOr<void> parse_locale_calendars(DeprecatedString locale_path, CLDR&
LexicalPath locale_display_names_path(move(locale_path)); LexicalPath locale_display_names_path(move(locale_path));
locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv); locale_display_names_path = locale_display_names_path.append("localeDisplayNames.json"sv);
auto locale_display_names = TRY(read_json_file(locale_display_names_path.string())); auto const& locale_display_names = *TRY(read_json_file_with_cache(locale_display_names_path.string()));
auto const& main_object = locale_display_names.as_object().get_object("main"sv).value(); auto const& main_object = locale_display_names.as_object().get_object("main"sv).value();
auto const& locale_object = main_object.get_object(locale_display_names_path.parent().basename()).value(); auto const& locale_object = main_object.get_object(locale_display_names_path.parent().basename()).value();
auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value(); auto const& locale_display_names_object = locale_object.get_object("localeDisplayNames"sv).value();