Merge branch 'main' into test-pause-qrep-xmin

PeerDB-io · Mar 5, 2024 · ee93513 · ee93513
2 parents 9d5bff7 + ba6feaa
commit ee93513
Show file tree

Hide file tree

Showing 13 changed files with 462 additions and 419 deletions.
diff --git a/flow/activities/flowable.go b/flow/activities/flowable.go
@@ -852,7 +852,7 @@ func (a *FlowableActivity) SendWALHeartbeat(ctx context.Context) error {
 }
 
 func (a *FlowableActivity) RecordSlotSizes(ctx context.Context) error {
-	rows, err := a.CatalogPool.Query(ctx, "SELECT flows.name, flows.config_proto FROM flows WHERE query_string IS NULL")
+	rows, err := a.CatalogPool.Query(ctx, "SELECT DISTINCT ON (name) name, config_proto FROM flows WHERE query_string IS NULL")
 	if err != nil {
 		return err
 	}