Make lq server name include image hash

gruuya · gruuya · commit 95ab60b0d229 · 2022-04-01T11:31:55.000+02:00
In this way we can decouple LQ servers for checkout of different images in the same repo.
diff --git a/splitgraph/commandline/image_info.py b/splitgraph/commandline/image_info.py
@@ -426,11 +426,12 @@ def _emit_repository_data(repositories, engine):
         metadata_size = pretty_size(repo.get_size())
         actual_size = pretty_size(repo.get_local_size())
         if head:
+            lq_server_name = head.lq_server_name()
             head = head.image_hash[:10]
             if (
                 engine.run_sql(
                     "SELECT 1 FROM pg_foreign_server WHERE srvname = %s",
-                    (repo.lq_server_name()[:63],),
+                    (lq_server_name,),
                     return_shape=ResultShape.ONE_ONE,
                 )
                 is not None
diff --git a/splitgraph/core/fragment_manager.py b/splitgraph/core/fragment_manager.py
@@ -801,7 +801,7 @@ def record_overlay_table_as_patch(
         # Finally, point the LQ FDW to the latest image to pick up the new changes after truncating the upper table
         self.object_engine.run_sql(
             SQL("ALTER SERVER {} OPTIONS (SET image_hash %s)").format(
-                Identifier(old_table.repository.lq_server_name()),
+                Identifier(old_table.repository.images.by_hash(image_hash).lq_server_name()),
             ),
             (image_hash,),
         )
diff --git a/splitgraph/core/image.py b/splitgraph/core/image.py
@@ -69,6 +69,11 @@ def __eq__(self, other: object) -> bool:
             return NotImplemented
         return self.image_hash == other.image_hash and self.repository == other.repository
 
+    def lq_server_name(self, target_schema: Optional[str] = None) -> str:
+        """The name of the foreign server used in the layered querying checkout mode"""
+        target_schema = target_schema or self.repository.to_schema()
+        return f"{target_schema}:{self.image_hash[:8]}_lq_srv"[:63]
+
     def get_parent_children(self) -> Tuple[Optional[str], List[str]]:
         """Gets the parent and a list of children of a given image."""
         parent = self.parent_id
@@ -191,7 +196,7 @@ def lq_checkout(
         from splitgraph.hooks.data_source.fdw import init_fdw
 
         target_schema = target_schema or self.repository.to_schema()
-        server_id = self.repository.lq_server_name()
+        server_id = self.lq_server_name()
         engine = self.repository.engine
         object_engine = self.repository.object_engine
 
@@ -207,7 +212,6 @@ def lq_checkout(
                 "repository": self.repository.repository,
                 "image_hash": self.image_hash,
             },
-            overwrite=False,
         )
 
         # It's easier to create the foreign tables from our side than to implement IMPORT FOREIGN SCHEMA by the FDW
diff --git a/splitgraph/core/repository.py b/splitgraph/core/repository.py
@@ -151,10 +151,6 @@ def to_schema(self) -> str:
         """Returns the engine schema that this repository gets checked out into."""
         return self.namespace + "/" + self.repository if self.namespace else self.repository
 
-    def lq_server_name(self) -> str:
-        """The name of the foreign server used in the layered querying checkout mode"""
-        return f"{self.to_schema()}_lq_checkout_server"
-
     def __repr__(self) -> str:
         repr = "Repository %s on %s" % (self.to_schema(), self.engine.name)
         if self.engine != self.object_engine:
diff --git a/splitgraph/engine/utils.py b/splitgraph/engine/utils.py
@@ -7,8 +7,6 @@
 
 
 def unmount_schema(engine: "PsycopgEngine", schema: str) -> None:
-    engine.run_sql(
-        SQL("DROP SERVER IF EXISTS {} CASCADE").format(Identifier("%s_lq_checkout_server" % schema))
-    )
+    engine.run_sql(SQL("DROP SERVER IF EXISTS {} CASCADE").format(Identifier("%s_lq_srv" % schema)))
     engine.run_sql(SQL("DROP SERVER IF EXISTS {} CASCADE").format(Identifier(schema + "_server")))
     engine.run_sql(SQL("DROP SCHEMA IF EXISTS {} CASCADE").format(Identifier(schema)))

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ def record_overlay_table_as_patch(`
`801`	`801`	`# Finally, point the LQ FDW to the latest image to pick up the new changes after truncating the upper table`
`802`	`802`	`self.object_engine.run_sql(`
`803`	`803`	`SQL("ALTER SERVER {} OPTIONS (SET image_hash %s)").format(`
`804`		`- Identifier(old_table.repository.lq_server_name()),`
	`804`	`+ Identifier(old_table.repository.images.by_hash(image_hash).lq_server_name()),`
`805`	`805`	`),`
`806`	`806`	`(image_hash,),`
`807`	`807`	`)`