fix columns

Signed-off-by: Iaroslav Ciupin <[email protected]>
flyteorg · Aug 23, 2023 · 193a8ad · 193a8ad
1 parent d47dd59
commit 193a8ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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"