fix more slow queries

hatchet-dev · Aug 1, 2024 · 0a1f55f · 0a1f55f
1 parent ec519ad
commit 0a1f55f
Show file tree

Hide file tree

Showing 14 changed files with 116 additions and 275 deletions.
diff --git a/api-contracts/openapi/components/schemas/workflow.yaml b/api-contracts/openapi/components/schemas/workflow.yaml
@@ -17,8 +17,6 @@ Workflow:
       items:
         $ref: "#/WorkflowTag"
       description: The tags of the workflow.
-    lastRun:
-      $ref: "./_index.yaml#/WorkflowRun"
     jobs:
       type: array
       items:

diff --git a/api/v1/server/handlers/workflows/get.go b/api/v1/server/handlers/workflows/get.go
@@ -11,7 +11,7 @@ import (
 func (t *WorkflowService) WorkflowGet(ctx echo.Context, request gen.WorkflowGetRequestObject) (gen.WorkflowGetResponseObject, error) {
 	workflow := ctx.Get("workflow").(*db.WorkflowModel)
 
-	resp, err := transformers.ToWorkflow(workflow, nil)
+	resp, err := transformers.ToWorkflow(workflow)
 
 	if err != nil {
 		return nil, err

diff --git a/api/v1/server/handlers/workflows/list.go b/api/v1/server/handlers/workflows/list.go
@@ -31,11 +31,7 @@ func (t *WorkflowService) WorkflowList(ctx echo.Context, request gen.WorkflowLis
 	rows := make([]gen.Workflow, len(listResp.Rows))
 
 	for i := range listResp.Rows {
-		workflow, err := transformers.ToWorkflow(listResp.Rows[i].WorkflowModel, listResp.Rows[i].LatestRun)
-
-		if err != nil {
-			return nil, err
-		}
+		workflow := transformers.ToWorkflowFromSQLC(listResp.Rows[i])
 
 		rows[i] = *workflow
 	}

diff --git a/api/v1/server/oas/gen/openapi.gen.go b/api/v1/server/oas/gen/openapi.gen.go
diff --git a/api/v1/server/oas/transformers/workflow.go b/api/v1/server/oas/transformers/workflow.go
@@ -11,21 +11,12 @@ import (
 	"github.com/hatchet-dev/hatchet/pkg/repository/prisma/dbsqlc"
 )
 
-func ToWorkflow(workflow *db.WorkflowModel, lastRun *db.WorkflowRunModel) (*gen.Workflow, error) {
+func ToWorkflow(workflow *db.WorkflowModel) (*gen.Workflow, error) {
 	res := &gen.Workflow{
 		Metadata: *toAPIMetadata(workflow.ID, workflow.CreatedAt, workflow.UpdatedAt),
 		Name:     workflow.Name,
 	}
 
-	if lastRun != nil {
-		var err error
-		res.LastRun, err = ToWorkflowRun(lastRun)
-
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	if description, ok := workflow.Description(); ok {
 		res.Description = &description
 	}
@@ -160,7 +151,7 @@ func ToWorkflowVersion(workflow *db.WorkflowModel, version *db.WorkflowVersionMo
 
 	if workflow != nil {
 		var err error
-		res.Workflow, err = ToWorkflow(workflow, nil)
+		res.Workflow, err = ToWorkflow(workflow)
 
 		if err != nil {
 			return nil, err
@@ -338,6 +329,10 @@ func ToWorkflowFromSQLC(row *dbsqlc.Workflow) *gen.Workflow {
 		Description: &row.Description.String,
 	}
 
+	// if lastRunAt != nil && !lastRunAt.IsZero() {
+	// 	res.LastRunAt = lastRunAt
+	// }
+
 	return res
 }
 

diff --git a/frontend/app/src/lib/api/generated/data-contracts.ts b/frontend/app/src/lib/api/generated/data-contracts.ts
@@ -502,7 +502,6 @@ export interface Workflow {
   versions?: WorkflowVersionMeta[];
   /** The tags of the workflow. */
   tags?: WorkflowTag[];
-  lastRun?: WorkflowRun;
   /** The jobs of the workflow. */
   jobs?: Job[];
 }

diff --git a/frontend/app/src/pages/main/workflows/components/workflow-table.tsx b/frontend/app/src/pages/main/workflows/components/workflow-table.tsx
@@ -90,13 +90,9 @@ export function WorkflowTable() {
           <Link to={`/workflows/${data.metadata?.id}`}>{data.name}</Link>
         </h3>
         <p className="mt-1 max-w-2xl text-sm text-gray-700 dark:text-gray-300">
-          Last run{' '}
-          {data.lastRun?.metadata?.createdAt ? (
-            <RelativeDate date={data.lastRun?.metadata?.createdAt} />
-          ) : (
-            'never'
-          )}
-          <br />
+          {/* Last run{' '}
+          {data.lastRunAt ? <RelativeDate date={data.lastRunAt} /> : 'never'}
+          <br /> */}
           Created at <RelativeDate date={data.metadata?.createdAt} />
         </p>
       </div>

diff --git a/pkg/client/rest/gen.go b/pkg/client/rest/gen.go
diff --git a/pkg/repository/prisma/dbsqlc/workflow_runs.sql b/pkg/repository/prisma/dbsqlc/workflow_runs.sql
@@ -94,7 +94,7 @@ LEFT JOIN
     "Workflow" as workflow ON workflowVersion."workflowId" = workflow."id"
 WHERE
     runs."tenantId" = @tenantId::uuid AND
-    runs."created" > NOW - INTERVAL '1 day' AND
+    runs."createdAt" > NOW - INTERVAL '1 day' AND
     runs."deletedAt" IS NULL AND
     workflowVersion."deletedAt" IS NULL AND
     workflow."deletedAt" IS NULL AND

diff --git a/pkg/repository/prisma/dbsqlc/workflow_runs.sql.go b/pkg/repository/prisma/dbsqlc/workflow_runs.sql.go