Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

refactor: merge Create/Update methods into variadic versions (#18489)

Danny Xude0598c9bf6b
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index 7ae437d2ae..75207887ed 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -348,10 +348,11 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request
}
}
- project, err = s.store.UpdateProject(ctx, patch)
+ projects, err := s.store.UpdateProjects(ctx, patch)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
+ project = projects[0]
return connect.NewResponse(convertToProject(project)), nil
}
@@ -416,7 +417,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
}
}
- if _, err := s.store.UpdateProject(ctx, &store.UpdateProjectMessage{
+ if _, err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
Delete: &deletePatch,
}); err != nil {
@@ -436,13 +437,14 @@ func (s *ProjectService) UndeleteProject(ctx context.Context, req *connect.Reque
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("project %q is active", req.Msg.Name))
}
- project, err = s.store.UpdateProject(ctx, &store.UpdateProjectMessage{
+ projects, err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
Delete: &undeletePatch,
})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
+ project = projects[0]
return connect.NewResponse(convertToProject(project)), nil
}
@@ -537,7 +539,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
})
}
- if _, err := s.store.BatchUpdateProjects(ctx, updatePatches); err != nil {
+ if _, err := s.store.UpdateProjects(ctx, updatePatches...); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
diff --git a/backend/api/v1/release_service.go b/backend/api/v1/release_service.go
index 60aafe8e45..06a68f14cd 100644
--- a/backend/api/v1/release_service.go
+++ b/backend/api/v1/release_service.go
@@ -94,7 +94,7 @@ func (s *ReleaseService) CreateRelease(ctx context.Context, req *connect.Request
// Batch create sheets if needed.
if len(sheetsToCreate) > 0 {
- createdSheets, err := s.sheetManager.BatchCreateSheets(ctx, sheetsToCreate, project.ResourceID, user.Email)
+ createdSheets, err := s.sheetManager.CreateSheets(ctx, project.ResourceID, user.Email, sheetsToCreate...)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create sheets"))
}
diff --git a/backend/api/v1/rollout_service_task.go b/backend/api/v1/rollout_service_task.go
index f5be080035..edc2aece63 100644
--- a/backend/api/v1/rollout_service_task.go
+++ b/backend/api/v1/rollout_service_task.go
@@ -142,9 +142,7 @@ func getTaskCreatesFromCreateDatabaseConfig(ctx context.Context, s *store.Store,
if err != nil {
return nil, err
}
- sheet, err := sheetManager.CreateSheet(ctx, &store.SheetMessage{
- Creator: common.SystemBotEmail,
- ProjectID: project.ResourceID,
+ sheets, err := sheetManager.CreateSheets(ctx, project.ResourceID, common.SystemBotEmail, &store.SheetMessage{
Title: fmt.Sprintf("Sheet for creating database %v", databaseName),
Statement: statement,
Payload: &storepb.SheetPayload{
@@ -154,6 +152,7 @@ func getTaskCreatesFromCreateDatabaseConfig(ctx context.Context, s *store.Store,
if err != nil {
return nil, errors.Wrap(err, "failed to create database creation sheet")
}
+ sheet := sheets[0]
v := &store.TaskMessage{
InstanceID: instance.ResourceID,
diff --git a/backend/api/v1/setting_service.go b/backend/api/v1/setting_service.go
index 181513fc8e..96e920a0d7 100644
--- a/backend/api/v1/setting_service.go
+++ b/backend/api/v1/setting_service.go
@@ -562,7 +562,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
DataClassificationConfigID: &classificationID,
})
}
- if _, err = s.store.BatchUpdateProjects(ctx, batchUpdate); err != nil {
+ if _, err = s.store.UpdateProjects(ctx, batchUpdate...); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Errorf("failed to patch project classification with error: %v", err))
}
}
diff --git a/backend/api/v1/sheet_service.go b/backend/api/v1/sheet_service.go
index d75ed6322d..befe8f55a7 100644
--- a/backend/api/v1/sheet_service.go
+++ b/backend/api/v1/sheet_service.go
@@ -68,10 +68,11 @@ func (s *SheetService) CreateSheet(ctx context.Context, request *connect.Request
}
storeSheetCreate := convertToStoreSheetMessage(project.ResourceID, user.Email, request.Msg.Sheet)
- sheet, err := s.sheetManager.CreateSheet(ctx, storeSheetCreate)
+ sheets, err := s.sheetManager.CreateSheets(ctx, project.ResourceID, user.Email, storeSheetCreate)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create sheet"))
}
+ sheet := sheets[0]
v1pbSheet, err := s.convertToAPISheetMessage(ctx, sheet)
if err != nil {
return nil, err
@@ -116,7 +117,7 @@ func (s *SheetService) BatchCreateSheets(ctx context.Context, request *connect.R
sheetCreates = append(sheetCreates, storeSheetCreate)
}
- sheets, err := s.sheetManager.BatchCreateSheets(ctx, sheetCreates, project.ResourceID, user.Email)
+ sheets, err := s.sheetManager.CreateSheets(ctx, project.ResourceID, user.Email, sheetCreates...)
if err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to create sheet"))
}
diff --git a/backend/component/sheet/sheet.go b/backend/component/sheet/sheet.go
index d6f034d82a..747f2bd279 100644
--- a/backend/component/sheet/sheet.go
+++ b/backend/component/sheet/sheet.go
@@ -58,16 +58,7 @@ func NewManager(store *store.Store) *Manager {
}
}
-func (sm *Manager) CreateSheet(ctx context.Context, sheet *store.SheetMessage) (*store.SheetMessage, error) {
- if sheet.Payload == nil {
- sheet.Payload = &storepb.SheetPayload{}
- }
- sheet.Payload.Commands = getSheetCommands(sheet.Payload.Engine, sheet.Statement)
-
- return sm.store.CreateSheet(ctx, sheet)
-}
-
-func (sm *Manager) BatchCreateSheets(ctx context.Context, sheets []*store.SheetMessage, projectID string, creator string) ([]*store.SheetMessage, error) {
+func (sm *Manager) CreateSheets(ctx context.Context, projectID string, creator string, sheets ...*store.SheetMessage) ([]*store.SheetMessage, error) {
for _, sheet := range sheets {
if sheet.Payload == nil {
sheet.Payload = &storepb.SheetPayload{}
@@ -75,11 +66,11 @@ func (sm *Manager) BatchCreateSheets(ctx context.Context, sheets []*store.SheetM
sheet.Payload.Commands = getSheetCommands(sheet.Payload.Engine, sheet.Statement)
}
- sheets, err := sm.store.BatchCreateSheet(ctx, projectID, sheets, creator)
+ result, err := sm.store.CreateSheets(ctx, projectID, creator, sheets...)
if err != nil {
- return nil, errors.Wrapf(err, "failed to batch create sheets")
+ return nil, errors.Wrapf(err, "failed to create sheets")
}
- return sheets, nil
+ return result, nil
}
func getSheetCommands(engine storepb.Engine, statement string) []*storepb.Range {
diff --git a/backend/store/project.go b/backend/store/project.go
index 1727d00afd..85cbf561eb 100644
--- a/backend/store/project.go
+++ b/backend/store/project.go
@@ -239,29 +239,8 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
return project, nil
}
-// UpdateProject updates a project.
-func (s *Store) UpdateProject(ctx context.Context, patch *UpdateProjectMessage) (*ProjectMessage, error) {
- s.removeProjectCache(patch.ResourceID)
-
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
-
- if err := updateProjectImpl(ctx, tx, patch); err != nil {
- return nil, err
- }
-
- if err := tx.Commit(); err != nil {
- return nil, err
- }
-
- return s.GetProject(ctx, &FindProjectMessage{ResourceID: &patch.ResourceID})
-}
-
-// BatchUpdateProjects updates multiple projects in a single transaction.
-func (s *Store) BatchUpdateProjects(ctx context.Context, patches []*UpdateProjectMessage) ([]*ProjectMessage, error) {
+// UpdateProjects updates projects in a single transaction.
+func (s *Store) UpdateProjects(ctx context.Context, patches ...*UpdateProjectMessage) ([]*ProjectMessage, error) {
if len(patches) == 0 {
return nil, nil
}
diff --git a/backend/store/sheet.go b/backend/store/sheet.go
index 7d04d321a2..a23deee6cf 100644
--- a/backend/store/sheet.go
+++ b/backend/store/sheet.go
@@ -175,75 +175,18 @@ func (s *Store) listSheets(ctx context.Context, find *FindSheetMessage) ([]*Shee
return sheets, nil
}
-// CreateSheet creates a new sheet.
+// CreateSheets creates new sheets.
// You should not use this function directly to create sheets.
-// Use CreateSheet in component/sheet instead.
-func (s *Store) CreateSheet(ctx context.Context, create *SheetMessage) (*SheetMessage, error) {
- if create.Payload == nil {
- create.Payload = &storepb.SheetPayload{}
- }
- payload, err := protojson.Marshal(create.Payload)
- if err != nil {
- return nil, err
- }
-
- h := sha256.Sum256([]byte(create.Statement))
- create.Sha256 = h[:]
-
- if err := s.batchCreateSheetBlob(ctx, [][]byte{create.Sha256}, []string{create.Statement}); err != nil {
- return nil, errors.Wrapf(err, "failed to create sheet blobs")
- }
-
- q := qb.Q().Space(`
- INSERT INTO sheet (
- creator,
- project,
- name,
- sha256,
- payload
- )
- VALUES (?, ?, ?, ?, ?)
- RETURNING id, created_at
- `, create.Creator, create.ProjectID, create.Title, create.Sha256, payload)
-
- query, args, err := q.ToSQL()
- if err != nil {
- return nil, errors.Wrapf(err, "failed to build sql")
- }
-
- tx, err := s.GetDB().BeginTx(ctx, nil)
- if err != nil {
- return nil, err
- }
- defer tx.Rollback()
- if err := tx.QueryRowContext(ctx, query, args...).Scan(
- &create.UID,
- &create.CreatedAt,
- ); err != nil {
- if err == sql.ErrNoRows {
- return nil, common.FormatDBErrorEmptyRowWithQuery(query)
- }
- return nil, err
- }
- if err := tx.Commit(); err != nil {
- return nil, errors.Wrapf(err, "failed to commit transaction")
- }
-
- create.Size = int64(len(create.Statement))
-
- return create, nil
-}
-
-// BatchCreateSheet creates a new sheet.
-// You should not use this function directly to create sheets.
-// Use BatchCreateSheet in component/sheet instead.
-func (s *Store) BatchCreateSheet(ctx context.Context, projectID string, creates []*SheetMessage, creator string) ([]*SheetMessage, error) {
+// Use CreateSheets in component/sheet instead.
+func (s *Store) CreateSheets(ctx context.Context, projectID string, creator string, creates ...*SheetMessage) ([]*SheetMessage, error) {
var names []string
var statements []string
var sha256s [][]byte
var payloads [][]byte
for _, c := range creates {
+ c.ProjectID = projectID
+ c.Creator = creator
names = append(names, c.Title)
statements = append(statements, c.Statement)
h := sha256.Sum256([]byte(c.Statement))
@@ -297,8 +240,6 @@ func (s *Store) BatchCreateSheet(ctx context.Context, projectID string, creates
defer rows.Close()
for i := 0; rows.Next(); i++ {
- creates[i].Creator = creator
-
if err := rows.Scan(
&creates[i].UID,
&creates[i].CreatedAt,