commit c1618e7515faf02b0acf0443b483dd1aabb73197
author Trent Apted <tapted@chromium.org> Mon Sep 25 10:30:14 2023 +1000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Sep 25 20:07:54 2023 +0000
tree b4e253a30c1de050e404e381953ec4f7aeedbebf
parent 1bebf5ff3059b90f3fadab90793b56797f693161

api: Cleanup + combine sed scripts in compile_build_api_proto.

I was poking around why this seemed slow (~38s). Turns out it was a
forest of `__pycache__` directories leftover from some earlier
experimentation. Removing those got this back down to ~3s.

But while troubleshooting I cleaned some things up. This CL
reduces the number of `sed` invocations from 6 to 3 and switches to
f-strings (to address an upcoming lint). Performance impact is minor
(it's dominated by entering the sdk), but it seems neater, and
consolidates on one regex format by escaping \(\) in the one using -E.

BUG=None
TEST=./compile_build_api_protos makes the same files.

Change-Id: I5212393db9f80a12036ee7ba80738e1400ff7bbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4891271
Tested-by: Trent Apted <tapted@chromium.org>
Reviewed-by: Anuj Jamwal <anujjamwal@google.com>
Commit-Queue: Trent Apted <tapted@chromium.org>

api/compile_build_api_proto.py

diff --git a/api/compile_build_api_proto.py b/api/compile_build_api_proto.py
index 6ff55da..7e684a6 100644
--- a/api/compile_build_api_proto.py
+++ b/api/compile_build_api_proto.py
@@ -161,7 +161,7 @@
         dir_subset: The subset of the proto to compile.
         protoc_bin_path: The protoc command to use.
     """
-    logging.info("Generating files to %s.", output)
+    logging.info("Generating %s files to %s.", protoc_version, output)
     osutils.SafeMakedirs(output)
 
     targets = []
@@ -247,14 +247,7 @@
     else:
         sub = "from chromite.api.gen.\\1 import \\2_pb2 as \\3"
 
-    from_sed = [
-        "sed",
-        "-i",
-        "/%(address)s/!s/%(find)s/%(sub)s/g"
-        % {"address": address, "find": find, "sub": sub},
-    ]
-
-    seds = [from_sed]
+    seds = [f"/{address}/!s/{find}/{sub}/g"]
 
     if protoc_version is ProtocVersion.CHROMITE:
         # We also need to change the google.protobuf imports to point directly
@@ -266,37 +259,23 @@
         g_p_address = "^from google.protobuf"
         g_p_find = r"from \([^ ]*\) import \(.*\)$"
         g_p_sub = "from chromite.third_party.\\1 import \\2"
-        google_protobuf_sed = [
-            "sed",
-            "-i",
-            "/%(address)s/s/%(find)s/%(sub)s/g"
-            % {"address": g_p_address, "find": g_p_find, "sub": g_p_sub},
-        ]
-        seds.append(google_protobuf_sed)
+        seds.append(f"/{g_p_address}/s/{g_p_find}/{g_p_sub}/")
 
     if protoc_version is ProtocVersion.CHROMITE_PYI:
         # Workaround https://github.com/protocolbuffers/protobuf/issues/11402
         # until cl/560557754 in in the protoc version used.
-        untyped_empty_slot_list = [
-            "sed",
-            "-E",
-            "-i",
-            "s/(^ *__slots__ = )\\[]/\\1()/",
-        ]
+        untyped_empty_slot_list = "s/\\(^ *__slots__ = \\)\\[]/\\1()/"
 
         # Suppress errors on GRPC options field numbers using ClassVar outside
         # of a class body. See b/297782342.
-        ignore_class_var_in_file_scope = [
-            "sed",
-            "-i",
-            "s/^[A-Z_]*: _ClassVar\\[int]/&  # type: ignore/",
-        ]
+        ignore_class_var_in_file_scope = (
+            "s/^[A-Z_]*: _ClassVar\\[int]/&  # type: ignore/"
+        )
         seds.extend((untyped_empty_slot_list, ignore_class_var_in_file_scope))
 
     pb2 = list(directory.rglob(f"*_pb2.{protoc_version.get_suffix()}"))
     if pb2:
-        for sed in seds:
-            cros_build_lib.dbg_run(sed + pb2)
+        cros_build_lib.dbg_run(["sed", "-i", ";".join(seds)] + pb2)
 
 
 def CompileProto(