From 45b1100c935837e6500d39263261ab5c17824742 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Sat, 27 Apr 2024 23:02:46 +0200 Subject: [PATCH] Save produced json in a more compact UTF-8 format This change will reduce the size of generated countries.txt from 405K to 355K and speed up loading/decoding of the countries list. Signed-off-by: Alexander Borsuk --- map/routing_manager.cpp | 2 +- search/search_quality/helpers.cpp | 2 +- search/search_quality/sample.cpp | 2 +- storage/diff_scheme/diff_scheme_loader.cpp | 2 +- tools/python/maps_generator/generator/stages_declaration.py | 2 +- tools/python/post_generation/__main__.py | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp index 537a35e463..7f2df863ce 100644 --- a/map/routing_manager.cpp +++ b/map/routing_manager.cpp @@ -151,7 +151,7 @@ string SerializeRoutePoints(vector const & points) json_array_append_new(pointsNode.get(), pointNode.release()); } unique_ptr buffer( - json_dumps(pointsNode.get(), JSON_COMPACT | JSON_ENSURE_ASCII)); + json_dumps(pointsNode.get(), JSON_COMPACT)); return string(buffer.get()); } diff --git a/search/search_quality/helpers.cpp b/search/search_quality/helpers.cpp index 8e84ac45ec..d427c3bd1d 100644 --- a/search/search_quality/helpers.cpp +++ b/search/search_quality/helpers.cpp @@ -60,7 +60,7 @@ void CheckLocale() ToJSONObject(*root, "coord", coord); unique_ptr buffer( - json_dumps(root.get(), JSON_COMPACT | JSON_ENSURE_ASCII)); + json_dumps(root.get(), JSON_COMPACT)); line.append(buffer.get()); } diff --git a/search/search_quality/sample.cpp b/search/search_quality/sample.cpp index f7ff1729b2..4d6c9bba10 100644 --- a/search/search_quality/sample.cpp +++ b/search/search_quality/sample.cpp @@ -150,7 +150,7 @@ void Sample::SerializeToJSONLines(vector const & samples, string & lines for (auto const & sample : samples) { unique_ptr buffer( - json_dumps(sample.SerializeToJSON().get(), JSON_COMPACT | JSON_ENSURE_ASCII)); + json_dumps(sample.SerializeToJSON().get(), JSON_COMPACT)); lines.append(buffer.get()); lines.push_back('\n'); } diff --git a/storage/diff_scheme/diff_scheme_loader.cpp b/storage/diff_scheme/diff_scheme_loader.cpp index 923b5912fd..4526637ee3 100644 --- a/storage/diff_scheme/diff_scheme_loader.cpp +++ b/storage/diff_scheme/diff_scheme_loader.cpp @@ -43,7 +43,7 @@ string SerializeCheckerData(LocalMapsInfo const & info) auto const root = base::NewJSONObject(); json_object_set_new(root.get(), kMwmsKey, mwmsArrayNode.release()); ToJSONObject(*root, kMaxVersionKey, info.m_currentDataVersion); - unique_ptr buffer(json_dumps(root.get(), JSON_COMPACT | JSON_ENSURE_ASCII)); + unique_ptr buffer(json_dumps(root.get(), JSON_COMPACT)); return buffer.get(); } diff --git a/tools/python/maps_generator/generator/stages_declaration.py b/tools/python/maps_generator/generator/stages_declaration.py index 2a0789a0ed..15192c7f3b 100644 --- a/tools/python/maps_generator/generator/stages_declaration.py +++ b/tools/python/maps_generator/generator/stages_declaration.py @@ -366,7 +366,7 @@ class StageCountriesTxt(Stage): ) with open(env.paths.counties_txt_path, "w") as f: - json.dump(countries, f, ensure_ascii=True, indent=1) + json.dump(countries, f, ensure_ascii=False, indent=1) @outer_stage diff --git a/tools/python/post_generation/__main__.py b/tools/python/post_generation/__main__.py index dd0a0a686a..433092f0eb 100644 --- a/tools/python/post_generation/__main__.py +++ b/tools/python/post_generation/__main__.py @@ -100,9 +100,9 @@ The post_generation commands are: ) if args.output: with open(args.output, "w") as f: - json.dump(countries, f, ensure_ascii=True, indent=1) + json.dump(countries, f, ensure_ascii=False, indent=1) else: - print(json.dumps(countries, ensure_ascii=True, indent=1)) + print(json.dumps(countries, ensure_ascii=False, indent=1)) @staticmethod def inject_promo_ids(): @@ -152,7 +152,7 @@ The post_generation commands are: ) with open(args.output, "w") as f: - json.dump(countries, f, ensure_ascii=True, indent=1) + json.dump(countries, f, ensure_ascii=False, indent=1) PostGeneration()