From 193a8ad249b022588a91f4f325df9261a1d32a4d Mon Sep 17 00:00:00 2001 From: Iaroslav Ciupin Date: Wed, 23 Aug 2023 10:16:55 +0300 Subject: [PATCH] fix columns Signed-off-by: Iaroslav Ciupin --- pkg/repositories/gormimpl/node_execution_repo.go | 6 +----- pkg/repositories/gormimpl/task_execution_repo.go | 7 ++----- pkg/repositories/gormimpl/workflow_repo.go | 3 +-- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkg/repositories/gormimpl/node_execution_repo.go b/pkg/repositories/gormimpl/node_execution_repo.go index 599d1367..56391833 100644 --- a/pkg/repositories/gormimpl/node_execution_repo.go +++ b/pkg/repositories/gormimpl/node_execution_repo.go @@ -5,13 +5,10 @@ import ( "errors" "fmt" - "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "gorm.io/gorm" + "k8s.io/apimachinery/pkg/util/sets" adminErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" @@ -29,7 +26,6 @@ var NodeExecutionColumns = BaseColumnSet. "duration", "parent_id", "parent_task_execution_id", - "parent_node_execution_id", "error_kind", "error_code", "cache_status", diff --git a/pkg/repositories/gormimpl/task_execution_repo.go b/pkg/repositories/gormimpl/task_execution_repo.go index b55e53c5..8115de4c 100644 --- a/pkg/repositories/gormimpl/task_execution_repo.go +++ b/pkg/repositories/gormimpl/task_execution_repo.go @@ -4,13 +4,10 @@ import ( "context" "errors" - "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" - "github.com/flyteorg/flytestdlib/promutils" - "gorm.io/gorm" + "k8s.io/apimachinery/pkg/util/sets" flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces" @@ -19,7 +16,7 @@ import ( var TaskExecutionColumns = BaseColumnSet. Union(TaskKeyColumnSet). - Union(ExecutionKeyColumnSet). + Union(NodeExecutionKeyColumnSet). Union(sets.NewString( "retry_attempt", "phase", diff --git a/pkg/repositories/gormimpl/workflow_repo.go b/pkg/repositories/gormimpl/workflow_repo.go index afd5accc..6f67d60f 100644 --- a/pkg/repositories/gormimpl/workflow_repo.go +++ b/pkg/repositories/gormimpl/workflow_repo.go @@ -4,11 +4,10 @@ import ( "context" "errors" - "k8s.io/apimachinery/pkg/util/sets" - "github.com/flyteorg/flyteidl/gen/pb-go/flyteidl/core" "github.com/flyteorg/flytestdlib/promutils" "gorm.io/gorm" + "k8s.io/apimachinery/pkg/util/sets" flyteAdminDbErrors "github.com/flyteorg/flyteadmin/pkg/repositories/errors" "github.com/flyteorg/flyteadmin/pkg/repositories/interfaces"