Send serialized compile request

geldata · Feb 16, 2024 · 3ccafe4 · 3ccafe4
1 parent 686160f
commit 3ccafe4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 13 deletions.
diff --git a/edb/server/compiler/compiler.py b/edb/server/compiler/compiler.py
@@ -84,6 +84,7 @@
 from . import sertypes
 from . import status
 from . import ddl
+from . import rpc
 
 if TYPE_CHECKING:
     from edb.pgsql import metaschema
@@ -816,6 +817,41 @@ def compute_stmt_name(text: str) -> str:
 
         return sql_units
 
+    def compile_request(
+        self,
+        user_schema: s_schema.Schema,
+        global_schema: s_schema.Schema,
+        reflection_cache: immutables.Map[str, Tuple[str, ...]],
+        database_config: Optional[immutables.Map[str, config.SettingValue]],
+        system_config: Optional[immutables.Map[str, config.SettingValue]],
+        serialized_request: bytes,
+        original_query: str,
+    ) -> Tuple[
+        dbstate.QueryUnitGroup, Optional[dbstate.CompilerConnectionState]
+    ]:
+        request = rpc.CompileRequest(self.state.request_serializer)
+        request.deserialize(serialized_request, original_query)
+
+        units, cstate = self.compile(
+            user_schema,
+            global_schema,
+            reflection_cache,
+            database_config,
+            system_config,
+            request.source,
+            request.modaliases,
+            request.session_config,
+            request.output_format,
+            request.expect_one,
+            request.implicit_limit,
+            request.inline_typeids,
+            request.inline_typenames,
+            request.protocol_version,
+            request.inline_objectids,
+            request.json_parameters,
+        )
+        return units, cstate
+
     def compile(
         self,
         user_schema: s_schema.Schema,

diff --git a/edb/server/compiler_pool/multitenant_worker.py b/edb/server/compiler_pool/multitenant_worker.py
@@ -195,7 +195,7 @@ def compile(
 ):
     client_schema = clients[client_id]
     db = client_schema.dbs[dbname]
-    units, cstate = COMPILER.compile(
+    units, cstate = COMPILER.compile_request(
         db.user_schema,
         client_schema.global_schema,
         db.reflection_cache,

diff --git a/edb/server/compiler_pool/worker.py b/edb/server/compiler_pool/worker.py
@@ -175,7 +175,7 @@ def compile(
         system_config,
     )
 
-    units, cstate = COMPILER.compile(
+    units, cstate = COMPILER.compile_request(
         db.user_schema,
         GLOBAL_SCHEMA,
         db.reflection_cache,

diff --git a/edb/server/dbview/dbview.pyx b/edb/server/dbview/dbview.pyx
@@ -1037,17 +1037,8 @@ cdef class DatabaseConnectionView:
                     self.reflection_cache,
                     self.get_database_config(),
                     self.get_compilation_system_config(),
-                    query_req.source,
-                    self.get_modaliases(),
-                    self.get_session_config(),
-                    query_req.output_format,
-                    query_req.expect_one,
-                    query_req.implicit_limit,
-                    query_req.inline_typeids,
-                    query_req.inline_typenames,
-                    self._protocol_version,
-                    query_req.inline_objectids,
-                    query_req.json_parameters,
+                    query_req.serialize(),
+                    query_req.source.text(),
                     client_id=self.tenant.client_id,
                 )
         finally: