From d87d6c6a10f9c43cd4c66bd6894b50cf7c8b4fbb Mon Sep 17 00:00:00 2001 From: "Jose I. Paris" Date: Mon, 8 Sep 2025 18:02:51 +0200 Subject: [PATCH 1/4] fix index for expiration job Signed-off-by: Jose I. Paris --- .../pkg/data/ent/migrate/migrations/20250908160222.sql | 4 ++++ app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum | 3 ++- app/controlplane/pkg/data/ent/migrate/schema.go | 5 ----- app/controlplane/pkg/data/ent/schema/workflowrun.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql new file mode 100644 index 000000000..cc51a0f34 --- /dev/null +++ b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql @@ -0,0 +1,4 @@ +-- Drop index "workflowrun_state_created_at" from table: "workflow_runs" +DROP INDEX "workflowrun_state_created_at"; +-- Create index "workflowrun_state_created_at" to table: "workflow_runs" +CREATE INDEX "workflowrun_state_created_at" ON "workflow_runs" ("state", "created_at"); diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum index bf17318b1..63fa44f16 100644 --- a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum +++ b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum @@ -1,4 +1,4 @@ -h1:aDLoUdZ7A/XcJmyQg4Qia82eQ6BN67RfTrTVh+uZoHo= +h1:aS9Wt24wE8L/70Zd57Ib333ZYfk2lIqY5uK+oPHK9uo= 20230706165452_init-schema.sql h1:VvqbNFEQnCvUVyj2iDYVQQxDM0+sSXqocpt/5H64k8M= 20230710111950-cas-backend.sql h1:A8iBuSzZIEbdsv9ipBtscZQuaBp3V5/VMw7eZH6GX+g= 20230712094107-cas-backends-workflow-runs.sql h1:a5rzxpVGyd56nLRSsKrmCFc9sebg65RWzLghKHh5xvI= @@ -112,3 +112,4 @@ h1:aDLoUdZ7A/XcJmyQg4Qia82eQ6BN67RfTrTVh+uZoHo= 20250820171503.sql h1:SsLD5Tf6woeFE7/FLI9XVQpnEgx4CJ9d7fWwNOZvOrA= 20250827093032.sql h1:K+XDWewSLoGBM+zjkBMag3mMQFFQyoQ9SePzfRxC694= 20250902095134.sql h1:e1DP8uYf/CX7RCiCF+E2/TKXiFUR6EUQBPy0wh5Xxl0= +20250908160222.sql h1:TW3tF9qlZMuhni19fWIwE6M74SBec5uHoflcHE/X77w= diff --git a/app/controlplane/pkg/data/ent/migrate/schema.go b/app/controlplane/pkg/data/ent/migrate/schema.go index 8a0d04f64..08512d7ad 100644 --- a/app/controlplane/pkg/data/ent/migrate/schema.go +++ b/app/controlplane/pkg/data/ent/migrate/schema.go @@ -813,11 +813,6 @@ var ( Name: "workflowrun_state_created_at", Unique: false, Columns: []*schema.Column{WorkflowRunsColumns[3], WorkflowRunsColumns[1]}, - Annotation: &entsql.IndexAnnotation{ - DescColumns: map[string]bool{ - WorkflowRunsColumns[1].Name: true, - }, - }, }, { Name: "workflowrun_state_finished_at", diff --git a/app/controlplane/pkg/data/ent/schema/workflowrun.go b/app/controlplane/pkg/data/ent/schema/workflowrun.go index e36bbf781..c0cde4364 100644 --- a/app/controlplane/pkg/data/ent/schema/workflowrun.go +++ b/app/controlplane/pkg/data/ent/schema/workflowrun.go @@ -84,7 +84,7 @@ func (WorkflowRun) Indexes() []ent.Index { index.Fields("workflow_id", "created_at").Annotations(entsql.DescColumns("created_at")), index.Fields("workflow_id", "state", "created_at").Annotations(entsql.DescColumns("created_at")), // Expiration job - index.Fields("state", "created_at").Annotations(entsql.DescColumns("created_at")), + index.Fields("state", "created_at"), // search and order by finish date index.Fields("state", "finished_at"), // Referrer From 4a2c5f096d7653a7f42706136a5b10c32c497a9b Mon Sep 17 00:00:00 2001 From: "Jose I. Paris" Date: Mon, 8 Sep 2025 19:08:21 +0200 Subject: [PATCH 2/4] add concurrent update to index Signed-off-by: Jose I. Paris --- .../pkg/data/ent/migrate/migrations/20250908160222.sql | 2 +- app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql index cc51a0f34..d5c9ce3d6 100644 --- a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql +++ b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql @@ -1,4 +1,4 @@ -- Drop index "workflowrun_state_created_at" from table: "workflow_runs" DROP INDEX "workflowrun_state_created_at"; -- Create index "workflowrun_state_created_at" to table: "workflow_runs" -CREATE INDEX "workflowrun_state_created_at" ON "workflow_runs" ("state", "created_at"); +CREATE INDEX CONCURRENTLY "workflowrun_state_created_at" ON "workflow_runs" ("state", "created_at"); diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum index 63fa44f16..130308249 100644 --- a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum +++ b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum @@ -1,4 +1,4 @@ -h1:aS9Wt24wE8L/70Zd57Ib333ZYfk2lIqY5uK+oPHK9uo= +h1:rZejSnk3Cs8nab/80aSB/u1f2rSGrObc3EK+e0ghv0c= 20230706165452_init-schema.sql h1:VvqbNFEQnCvUVyj2iDYVQQxDM0+sSXqocpt/5H64k8M= 20230710111950-cas-backend.sql h1:A8iBuSzZIEbdsv9ipBtscZQuaBp3V5/VMw7eZH6GX+g= 20230712094107-cas-backends-workflow-runs.sql h1:a5rzxpVGyd56nLRSsKrmCFc9sebg65RWzLghKHh5xvI= @@ -112,4 +112,4 @@ h1:aS9Wt24wE8L/70Zd57Ib333ZYfk2lIqY5uK+oPHK9uo= 20250820171503.sql h1:SsLD5Tf6woeFE7/FLI9XVQpnEgx4CJ9d7fWwNOZvOrA= 20250827093032.sql h1:K+XDWewSLoGBM+zjkBMag3mMQFFQyoQ9SePzfRxC694= 20250902095134.sql h1:e1DP8uYf/CX7RCiCF+E2/TKXiFUR6EUQBPy0wh5Xxl0= -20250908160222.sql h1:TW3tF9qlZMuhni19fWIwE6M74SBec5uHoflcHE/X77w= +20250908160222.sql h1:DNVtOcbDEUkytjCZ9MYs/h4ClbwENnrRarUWpqrZGTg= From 96ccff01da7fa48b9cec40ccd2de95f6afe25150 Mon Sep 17 00:00:00 2001 From: "Jose I. Paris" Date: Tue, 9 Sep 2025 10:12:43 +0200 Subject: [PATCH 3/4] atlas txmode none Signed-off-by: Jose I. Paris --- .../pkg/data/ent/migrate/migrations/20250908160222.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql index d5c9ce3d6..a215f0ff2 100644 --- a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql +++ b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql @@ -1,3 +1,5 @@ +-- atlas:txmode none + -- Drop index "workflowrun_state_created_at" from table: "workflow_runs" DROP INDEX "workflowrun_state_created_at"; -- Create index "workflowrun_state_created_at" to table: "workflow_runs" From 395a4fe6f69e5deea906c3ef0019c44173722b27 Mon Sep 17 00:00:00 2001 From: "Jose I. Paris" Date: Tue, 9 Sep 2025 11:22:53 +0200 Subject: [PATCH 4/4] make generate Signed-off-by: Jose I. Paris --- .../pkg/data/ent/migrate/migrations/20250908160222.sql | 2 +- app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql index a215f0ff2..a888d3461 100644 --- a/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql +++ b/app/controlplane/pkg/data/ent/migrate/migrations/20250908160222.sql @@ -1,5 +1,5 @@ -- atlas:txmode none - + -- Drop index "workflowrun_state_created_at" from table: "workflow_runs" DROP INDEX "workflowrun_state_created_at"; -- Create index "workflowrun_state_created_at" to table: "workflow_runs" diff --git a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum index 130308249..8d8c5a62c 100644 --- a/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum +++ b/app/controlplane/pkg/data/ent/migrate/migrations/atlas.sum @@ -1,4 +1,4 @@ -h1:rZejSnk3Cs8nab/80aSB/u1f2rSGrObc3EK+e0ghv0c= +h1:zMUQdCsdxlu5WHgd4G0cKNp4VzU0ViSDSSMojr38oXQ= 20230706165452_init-schema.sql h1:VvqbNFEQnCvUVyj2iDYVQQxDM0+sSXqocpt/5H64k8M= 20230710111950-cas-backend.sql h1:A8iBuSzZIEbdsv9ipBtscZQuaBp3V5/VMw7eZH6GX+g= 20230712094107-cas-backends-workflow-runs.sql h1:a5rzxpVGyd56nLRSsKrmCFc9sebg65RWzLghKHh5xvI= @@ -112,4 +112,4 @@ h1:rZejSnk3Cs8nab/80aSB/u1f2rSGrObc3EK+e0ghv0c= 20250820171503.sql h1:SsLD5Tf6woeFE7/FLI9XVQpnEgx4CJ9d7fWwNOZvOrA= 20250827093032.sql h1:K+XDWewSLoGBM+zjkBMag3mMQFFQyoQ9SePzfRxC694= 20250902095134.sql h1:e1DP8uYf/CX7RCiCF+E2/TKXiFUR6EUQBPy0wh5Xxl0= -20250908160222.sql h1:DNVtOcbDEUkytjCZ9MYs/h4ClbwENnrRarUWpqrZGTg= +20250908160222.sql h1:bNjptbt2xPpSXqa4eVuWkMnovHt9LMkiakoGrFGZJ0g=