Merge pull request #29447 from nrainer-materialize/output-consistency/list-agg-with-order

output consistency: fix list_agg and change it to use order

Author: nrainer-materialize

misc/python/materialize/output_consistency/input_data/operations/aggregate_operations_provider.py

@@ -151,8 +151,9 @@
         {3: "string_agg($, $ ORDER BY row_index, $)"},
         [
             StringOperationParam(),
+            # separator value
             StringOperationParam(),
-            SameOperationParam(index_of_previous_param=1),
+            SameOperationParam(index_of_previous_param=0),
         ],
         StringReturnTypeSpec(),
         is_aggregation=True,

misc/python/materialize/output_consistency/input_data/operations/jsonb_operations_provider.py

@@ -209,11 +209,14 @@
 JSONB_OPERATION_TYPES.append(
     DbFunctionWithCustomPattern(
         "jsonb_object_agg",
-        {3: "jsonb_object_agg($, $ ORDER BY row_index, $)"},
+        {4: "jsonb_object_agg($, $ ORDER BY row_index, $, $)"},
         [
+            # key
             AnyOperationParam(),
+            # value
             AnyOperationParam(include_record_type=False),
             SameOperationParam(index_of_previous_param=0),
+            SameOperationParam(index_of_previous_param=1),
         ],
         JsonbReturnTypeSpec(),
         is_aggregation=True,
@@ -228,7 +231,9 @@
         "jsonb_object_agg",
         {3: "jsonb_object_agg($, $ ORDER BY row_index, $)"},
         [
+            # key
             AnyOperationParam(),
+            # value
             RecordOperationParam(),
             SameOperationParam(index_of_previous_param=0),
         ],

misc/python/materialize/output_consistency/input_data/operations/list_operations_provider.py

@@ -8,7 +8,6 @@
 # by the Apache License, Version 2.0.
 
 from materialize.output_consistency.input_data.params.any_operation_param import (
-    AnyLikeOtherOperationParam,
     AnyOperationParam,
 )
 from materialize.output_consistency.input_data.params.collection_operation_param import (
@@ -23,6 +22,9 @@
     ListOfOtherElementOperationParam,
     ListOperationParam,
 )
+from materialize.output_consistency.input_data.params.same_operation_param import (
+    SameOperationParam,
+)
 from materialize.output_consistency.input_data.return_specs.boolean_return_spec import (
     BooleanReturnTypeSpec,
 )
@@ -37,6 +39,7 @@
 )
 from materialize.output_consistency.operation.operation import (
     DbFunction,
+    DbFunctionWithCustomPattern,
     DbOperation,
     DbOperationOrFunction,
 )
@@ -93,13 +96,14 @@
 )
 
 LIST_OPERATION_TYPES.append(
-    DbFunction(
+    DbFunctionWithCustomPattern(
         "list_agg",
+        {
+            2: "list_agg($ ORDER BY row_index, $)",
+        },
         [
-            AnyOperationParam(include_record_type=False),
-            AnyLikeOtherOperationParam(index_of_previous_param=0, optional=True),
-            AnyLikeOtherOperationParam(index_of_previous_param=0, optional=True),
-            AnyLikeOtherOperationParam(index_of_previous_param=0, optional=True),
+            AnyOperationParam(include_record_type=True),
+            SameOperationParam(index_of_previous_param=0),
         ],
         ListReturnTypeSpec(),
     )

misc/python/materialize/output_consistency/input_data/operations/map_operations_provider.py

@@ -114,8 +114,11 @@
         "map_agg",
         {3: "map_agg($, $ ORDER BY row_index, $)"},
         [
+            # key
             StringOperationParam(only_type_text=True),
+            # value
             AnyOperationParam(),
+            # order within aggregated values
             SameOperationParam(index_of_previous_param=1),
         ],
         MapReturnTypeSpec(),