Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
refactor: rename CreateRolloutTasks to CreateTasks (#18659)
Danny Xue4c73f6c1cc1
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.goindex 96be9d0847..fbb7aeb097 100644--- a/backend/api/v1/rollout_service.go+++ b/backend/api/v1/rollout_service.go@@ -243,7 +243,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request}}if request.ValidateOnly {- // Filter out tasks that already exist (same logic as CreateRolloutTasks)+ // Filter out tasks that already exist (same logic as CreateTasks)existingTasks, err := s.store.ListTasks(ctx, &store.TaskFind{PlanID: &planID})if err != nil {return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to list existing tasks, error: %v", err))@@ -381,7 +381,7 @@ func CreateRolloutAndPendingTasks(}// Create rollout tasks- tasks, err = s.CreateRolloutTasks(ctx, plan.UID, tasks)+ tasks, err = s.CreateTasks(ctx, plan.UID, tasks)if err != nil {return errors.Wrap(err, "failed to create rollout tasks")}diff --git a/backend/store/pipeline.go b/backend/store/pipeline.goindex cce396708d..27eae5dc1f 100644--- a/backend/store/pipeline.go+++ b/backend/store/pipeline.go@@ -1,7 +1,6 @@package storeimport (- "context""strings""time"@@ -15,76 +14,6 @@ import (v1pb "github.com/bytebase/bytebase/backend/generated-go/v1")-// CreateRolloutTasks creates tasks for a plan.-func (s *Store) CreateRolloutTasks(ctx context.Context, planUID int64, tasks []*TaskMessage) ([]*TaskMessage, error) {- tx, err := s.GetDB().BeginTx(ctx, nil)- if err != nil {- return nil, errors.Wrapf(err, "failed to begin tx")- }- defer tx.Rollback()-- // Check existing tasks to avoid duplicates- existingTasks, err := s.listTasksTx(ctx, tx, &TaskFind{- PlanID: &planUID,- })- if err != nil {- return nil, errors.Wrapf(err, "failed to list existing tasks")- }-- type taskKey struct {- instance string- database string- sheet string- }-- createdTasks := map[taskKey]struct{}{}- for _, task := range existingTasks {- k := taskKey{- instance: task.InstanceID,- sheet: task.Payload.GetSheetSha256(),- }- if task.DatabaseName != nil {- k.database = *task.DatabaseName- }- createdTasks[k] = struct{}{}- }-- var taskCreateList []*TaskMessage-- for _, taskCreate := range tasks {- k := taskKey{- instance: taskCreate.InstanceID,- sheet: taskCreate.Payload.GetSheetSha256(),- }- if taskCreate.DatabaseName != nil {- k.database = *taskCreate.DatabaseName- }-- if _, ok := createdTasks[k]; ok {- continue- }- taskCreate.PlanID = planUID- taskCreateList = append(taskCreateList, taskCreate)- }-- if len(taskCreateList) > 0 {- tasks, err := s.createTasks(ctx, tx, taskCreateList...)- if err != nil {- return nil, errors.Wrap(err, "failed to create tasks")- }- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit tx")- }- return tasks, nil- }-- if err := tx.Commit(); err != nil {- return nil, errors.Wrapf(err, "failed to commit tx")- }-- return []*TaskMessage{}, nil-}-// GetListRolloutFilter parses a CEL filter expression into a query builder query for listing rollouts.func GetListRolloutFilter(filter string) (*qb.Query, error) {if filter == "" {diff --git a/backend/store/task.go b/backend/store/task.goindex 87abc916e5..0ff215f0f0 100644--- a/backend/store/task.go+++ b/backend/store/task.go@@ -163,7 +163,8 @@ func (s *Store) FindBlockingTaskByVersion(ctx context.Context, planUID int64, inreturn nil, nil}-func (*Store) createTasks(ctx context.Context, txn *sql.Tx, creates ...*TaskMessage) ([]*TaskMessage, error) {+// createTasksTx creates tasks in a transaction.+func (*Store) createTasksTx(ctx context.Context, txn *sql.Tx, creates ...*TaskMessage) ([]*TaskMessage, error) {var (planIDs []int64instances []string@@ -562,3 +563,73 @@ func (s *Store) ListTasksToAutoRollout(ctx context.Context, environments []strinreturn ids, nil}++// CreateTasks creates tasks for a plan.+func (s *Store) CreateTasks(ctx context.Context, planUID int64, tasks []*TaskMessage) ([]*TaskMessage, error) {+ tx, err := s.GetDB().BeginTx(ctx, nil)+ if err != nil {+ return nil, errors.Wrapf(err, "failed to begin tx")+ }+ defer tx.Rollback()++ // Check existing tasks to avoid duplicates+ existingTasks, err := s.listTasksTx(ctx, tx, &TaskFind{+ PlanID: &planUID,+ })+ if err != nil {+ return nil, errors.Wrapf(err, "failed to list existing tasks")+ }++ type taskKey struct {+ instance string+ database string+ sheet string+ }++ createdTasks := map[taskKey]struct{}{}+ for _, task := range existingTasks {+ k := taskKey{+ instance: task.InstanceID,+ sheet: task.Payload.GetSheetSha256(),+ }+ if task.DatabaseName != nil {+ k.database = *task.DatabaseName+ }+ createdTasks[k] = struct{}{}+ }++ var taskCreateList []*TaskMessage++ for _, taskCreate := range tasks {+ k := taskKey{+ instance: taskCreate.InstanceID,+ sheet: taskCreate.Payload.GetSheetSha256(),+ }+ if taskCreate.DatabaseName != nil {+ k.database = *taskCreate.DatabaseName+ }++ if _, ok := createdTasks[k]; ok {+ continue+ }+ taskCreate.PlanID = planUID+ taskCreateList = append(taskCreateList, taskCreate)+ }++ if len(taskCreateList) > 0 {+ tasks, err := s.createTasksTx(ctx, tx, taskCreateList...)+ if err != nil {+ return nil, errors.Wrap(err, "failed to create tasks")+ }+ if err := tx.Commit(); err != nil {+ return nil, errors.Wrapf(err, "failed to commit tx")+ }+ return tasks, nil+ }++ if err := tx.Commit(); err != nil {+ return nil, errors.Wrapf(err, "failed to commit tx")+ }++ return []*TaskMessage{}, nil+}