chore: enhance mock server metadata and update test cases

Author: burmecia

wrappers/dockerfiles/s3/iceberg_seed.py

@@ -190,7 +190,19 @@ def create_bids_table(catalog, namespace):
         ),
     )
 
-    sort_order = SortOrder(SortField(source_id=2, transform=IdentityTransform()))
+    sort_order = SortOrder(fields=[
+        SortField(source_id=1, transform=IdentityTransform()),
+        SortField(source_id=2, transform=IdentityTransform()),
+        SortField(source_id=3, transform=IdentityTransform()),
+        SortField(source_id=4, transform=IdentityTransform()),
+        SortField(source_id=6, transform=IdentityTransform()),
+        SortField(source_id=7, transform=IdentityTransform()),
+        SortField(source_id=8, transform=IdentityTransform()),
+        SortField(source_id=10, transform=IdentityTransform()),
+        SortField(source_id=11, transform=IdentityTransform()),
+        SortField(source_id=13, transform=IdentityTransform()),
+        SortField(source_id=15, transform=IdentityTransform()),
+    ])
 
     if catalog.table_exists(tblname):
         catalog.purge_table(tblname)
@@ -259,7 +271,11 @@ def create_asks_table(catalog, namespace):
         ),
     )
 
-    sort_order = SortOrder(SortField(source_id=2, transform=IdentityTransform()))
+    sort_order = SortOrder(fields=[
+        SortField(source_id=1, transform=IdentityTransform()),
+        SortField(source_id=2, transform=IdentityTransform()),
+        SortField(source_id=3, transform=IdentityTransform()),
+    ])
 
     if catalog.table_exists(tblname):
         catalog.purge_table(tblname)

wrappers/dockerfiles/s3vectors/server.py

@@ -71,7 +71,7 @@ def do_POST(self):
       {
          "data": { "float32": [ 222.33, 44.55, 6.678 ] },
          "key": "test-key3",
-         "metadata": { "model": "test", "dimension": 3 }
+         "metadata": { "model": "test", "dimension": 3, "null_field": null, "bool_field": false, "float_field": 1.23, "array_field": [1, "two", {"three": 3}] }
       }
    ]
 }
@@ -84,12 +84,12 @@ def do_POST(self):
       {
          "data": { "float32": [ 123.45, 67.89, 0.0 ] },
          "key": "test-key1",
-         "metadata": { "model": "test", "dimension": 3 }
+         "metadata": { "model": "test", "dimension": 3, "null_field": null, "bool_field": false, "float_field": 1.23, "array_field": [1, "two", {"three": 3}] }
       },
       {
          "data": { "float32": [ 987.65, 43.21, -4.2 ] },
          "key": "test-key2",
-         "metadata": { "model": "test", "dimension": 3 }
+         "metadata": { "model": "test", "dimension": 3, "null_field": null, "bool_field": false, "float_field": 1.23, "array_field": [1, "two", {"three": 3}] }
       }
    ]
 }
@@ -102,13 +102,13 @@ def do_POST(self):
          "data": { "float32": [ 123.45, 67.89, 0.0 ] },
          "distance": 0.84733,
          "key": "test-key1",
-         "metadata": { "model": "test", "dimension": 3 }
+         "metadata": { "model": "test", "dimension": 3, "null_field": null, "bool_field": false, "float_field": 1.23, "array_field": [1, "two", {"three": 3}] }
       },
       {
          "data": { "float32": [ 987.65, 43.21, -4.2 ] },
          "distance": 0.32804,
          "key": "test-key2",
-         "metadata": { "model": "test", "dimension": 3 }
+         "metadata": { "model": "test", "dimension": 3, "null_field": null, "bool_field": false, "float_field": 1.23, "array_field": [1, "two", {"three": 3}] }
       }
    ]
 }
@@ -121,7 +121,7 @@ def do_POST(self):
          "data": { "float32": [ 123.45, 67.89, 0.0 ] },
          "distance": 0.84733,
          "key": "test-key1",
-         "metadata": { "model": "test", "dimension": 3 }
+         "metadata": { "model": "test", "dimension": 3, "null_field": null, "bool_field": false, "float_field": 1.23, "array_field": [1, "two", {"three": 3}] }
       }
    ]
 }

wrappers/src/fdw/s3vectors_fdw/tests.rs

@@ -66,7 +66,7 @@ mod tests {
                     VALUES (
                         'test1',
                         '[1.0, 2.0, 1.0]',
-                        '{"model": "test1", "dimensions": 3}'::jsonb
+                        '{"model": "test1", "dimensions": 3, "null_field": null, "bool_field": false, "float_field": 1.23, "array_field": [1, "two", {"three": 3}]}'::jsonb
                     )"#,
                 None,
                 &[],