Merge pull request #681 from splitgraph/fix-lq-surrogate-pk-ordering-cu-2jech8y

Fix surrogate PK ordering

Author: gruuya

examples/push-to-object-storage/docker-compose.yml

@@ -34,7 +34,7 @@ services:
       - 5432
 
   objectstorage:
-    image: minio/minio
+    image: minio/minio:RELEASE.2022-05-19T18-20-59Z.fips
     ports:
       - '0.0.0.0:9000:9000'
     environment:

splitgraph/core/fragment_manager.py

@@ -1367,8 +1367,8 @@ def generate_surrogate_pk(
                     return_shape=ResultShape.MANY_ONE,
                 )
             )
-        object_pks = list(zip(result[::2], result[1::2]))
-        return object_pks
+        object_pks = [tuple(sorted(t)) for t in zip(result[::2], result[1::2])]
+        return cast(List[Tuple[Any, Any]], object_pks)
 
     def _add_overlapping_objects(
         self, table: "Table", all_objects: List[str], filtered_objects: List[str]

splitgraph/core/image.py

@@ -129,14 +129,17 @@ def get_table(self, table_name: str) -> Table:
         )
 
     @manage_audit
-    def checkout(self, force: bool = False, layered: bool = False) -> None:
+    def checkout(
+        self, force: bool = False, layered: bool = False, ddn_layout: bool = False
+    ) -> None:
         """
         Checks the image out, changing the current HEAD pointer. Raises an error
         if there are pending changes to its checkout.
 
         :param force: Discards all pending changes to the schema.
         :param layered: If True, uses layered querying to check out the image (doesn't materialize tables
             inside of it).
+        :param ddn_layout: Determines whether to rotate the name prefix of lower and overlay table/view
         """
         target_schema = self.repository.to_schema()
         if len(target_schema) > POSTGRES_MAX_IDENTIFIER:
@@ -166,7 +169,7 @@ def checkout(self, force: bool = False, layered: bool = False) -> None:
             self.object_engine.delete_table(target_schema, table)
 
         if layered:
-            self.lq_checkout()
+            self.lq_checkout(ddn_layout=ddn_layout)
         else:
             for table in self.get_tables():
                 self.get_table(table).materialize(table)

test/architecture/data/objectstorage/entrypoint.sh

@@ -49,16 +49,15 @@ services:
       - 5431
   # Name without an underscore because Minio client really wants to be compliant with the RFC
   objectstorage:
-    image: minio/minio
+    image: minio/minio:RELEASE.2022-05-19T18-20-59Z.fips
     ports:
       - '0.0.0.0:9000:9000'
     environment:
-      MINIO_ACCESS_KEY: minioclient
-      MINIO_SECRET_KEY: supersecure
+      MINIO_ROOT_USER: minioclient
+      MINIO_ROOT_PASSWORD: supersecure
     volumes:
-      # Mount a "bucket" with some CSV files into our object storage
-      # https://github.com/minio/minio/issues/8949
-      # As always, Minio is very opinionated and doesn't allow "cross-device mounts" even in dev
-      # so we copy this in on startup.
-      - ./data/objectstorage:/objectstorage
-    entrypoint: /objectstorage/entrypoint.sh
+      - ./data/objectstorage:/data
+    command:
+      - minio
+      - server
+      - /data