Skip to content

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

fix(store): remove N+1 queries from batch update functions (#19057)

p0ny49f40829dff6
diff --git a/backend/api/v1/instance_service.go b/backend/api/v1/instance_service.go
index 49153f5739..13a6844eb1 100644
--- a/backend/api/v1/instance_service.go
+++ b/backend/api/v1/instance_service.go
@@ -447,7 +447,7 @@ func (s *InstanceService) DeleteInstance(ctx context.Context, req *connect.Reque
if req.Msg.Force {
if len(databases) > 0 {
defaultProjectID := common.DefaultProjectID
- if _, err := s.store.BatchUpdateDatabases(ctx, databases, &store.BatchUpdateDatabases{ProjectID: &defaultProjectID}); err != nil {
+ if err := s.store.BatchUpdateDatabases(ctx, databases, &store.BatchUpdateDatabases{ProjectID: &defaultProjectID}); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
}
diff --git a/backend/api/v1/project_service.go b/backend/api/v1/project_service.go
index 47c4313175..841bf1a60c 100644
--- a/backend/api/v1/project_service.go
+++ b/backend/api/v1/project_service.go
@@ -359,11 +359,13 @@ func (s *ProjectService) UpdateProject(ctx context.Context, req *connect.Request
}
}
- projects, err := s.store.UpdateProjects(ctx, patch)
+ if err := s.store.UpdateProjects(ctx, patch); err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &patch.ResourceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- project = projects[0]
return connect.NewResponse(convertToProject(project)), nil
}
@@ -382,7 +384,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
// If project is not already soft-deleted, soft-delete it first
if !project.Deleted {
- if _, err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
+ if err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
Delete: &deletePatch,
}); err != nil {
@@ -408,7 +410,7 @@ func (s *ProjectService) DeleteProject(ctx context.Context, req *connect.Request
}
// For archive (soft delete), just mark the project as deleted without touching databases or issues
- if _, err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
+ if err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
Delete: &deletePatch,
}); err != nil {
@@ -429,14 +431,16 @@ func (s *ProjectService) UndeleteProject(ctx context.Context, req *connect.Reque
return connect.NewResponse(convertToProject(project)), nil
}
- projects, err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
+ if err := s.store.UpdateProjects(ctx, &store.UpdateProjectMessage{
ResourceID: project.ResourceID,
Delete: &undeletePatch,
- })
+ }); err != nil {
+ return nil, connect.NewError(connect.CodeInternal, err)
+ }
+ project, err = s.store.GetProject(ctx, &store.FindProjectMessage{ResourceID: &project.ResourceID})
if err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
- project = projects[0]
return connect.NewResponse(convertToProject(project)), nil
}
@@ -471,7 +475,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
}
}
if len(projectsToSoftDelete) > 0 {
- if _, err := s.store.UpdateProjects(ctx, projectsToSoftDelete...); err != nil {
+ if err := s.store.UpdateProjects(ctx, projectsToSoftDelete...); err != nil {
return nil, connect.NewError(connect.CodeInternal, err)
}
}
@@ -514,7 +518,7 @@ func (s *ProjectService) BatchDeleteProjects(ctx context.Context, request *conne
}
if len(updatePatches) > 0 {
- if _, err := s.store.UpdateProjects(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/setting_service.go b/backend/api/v1/setting_service.go
index 63c26086b7..8dd3f57e4a 100644
--- a/backend/api/v1/setting_service.go
+++ b/backend/api/v1/setting_service.go
@@ -546,7 +546,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
}); err != nil {
return nil, connect.NewError(connect.CodeInternal, errors.Wrapf(err, "failed to unset environment %v for instances", env.Id))
}
- if _, err := s.store.BatchUpdateDatabases(ctx, nil, &store.BatchUpdateDatabases{
+ if err := s.store.BatchUpdateDatabases(ctx, nil, &store.BatchUpdateDatabases{
EnvironmentID: &emptyStr,
FindByEnvironmentID: &env.Id,
}); err != nil {
@@ -609,7 +609,7 @@ func (s *SettingService) UpdateSetting(ctx context.Context, request *connect.Req
Setting: setting,
})
}
- if _, err = s.store.UpdateProjects(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/store/database.go b/backend/store/database.go
index 383ac4d62e..8d062415b1 100644
--- a/backend/store/database.go
+++ b/backend/store/database.go
@@ -375,7 +375,7 @@ func (s *Store) UpdateDatabase(ctx context.Context, patch *UpdateDatabaseMessage
}
// BatchUpdateDatabases update databases in batch.
-func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseMessage, update *BatchUpdateDatabases) ([]*DatabaseMessage, error) {
+func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseMessage, update *BatchUpdateDatabases) error {
set := qb.Q()
if update.ProjectID != nil {
@@ -389,7 +389,7 @@ func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseM
}
}
if set.Len() == 0 {
- return nil, errors.New("no update field specified")
+ return errors.New("no update field specified")
}
where := qb.Q()
@@ -408,55 +408,35 @@ func (s *Store) BatchUpdateDatabases(ctx context.Context, databases []*DatabaseM
}
if where.Len() == 0 {
- return nil, errors.Errorf("empty where")
+ return errors.Errorf("empty where")
}
q := qb.Q().Space("UPDATE db SET ? WHERE ?", set, where)
query, args, err := q.ToSQL()
if err != nil {
- return nil, errors.Wrapf(err, "failed to build sql")
+ return errors.Wrapf(err, "failed to build sql")
}
tx, err := s.GetDB().BeginTx(ctx, nil)
if err != nil {
- return nil, err
+ return err
}
defer tx.Rollback()
if _, err := tx.ExecContext(ctx, query, args...); err != nil {
- return nil, err
+ return err
}
if err := tx.Commit(); err != nil {
- return nil, err
+ return err
}
- var updatedDatabases []*DatabaseMessage
+ // Invalidate cache for updated databases
for _, database := range databases {
- updatedDatabase := *database
- // Update cache for project field.
- if update.ProjectID != nil {
- updatedDatabase.ProjectID = *update.ProjectID
- }
- // Update cache for environment field and effective environment field.
- if update.EnvironmentID != nil {
- updatedDatabase.EnvironmentID = update.EnvironmentID
- if *update.EnvironmentID == "" {
- instance, err := s.GetInstance(ctx, &FindInstanceMessage{ResourceID: &database.InstanceID})
- if err != nil {
- // Should not reach here.
- return nil, err
- }
- updatedDatabase.EffectiveEnvironmentID = instance.EnvironmentID
- } else {
- updatedDatabase.EffectiveEnvironmentID = update.EnvironmentID
- }
- }
- s.databaseCache.Add(getDatabaseCacheKey(database.InstanceID, database.DatabaseName), &updatedDatabase)
- updatedDatabases = append(updatedDatabases, &updatedDatabase)
+ s.databaseCache.Remove(getDatabaseCacheKey(database.InstanceID, database.DatabaseName))
}
- return updatedDatabases, nil
+ return nil
}
func GetListDatabaseFilter(filter string) (*qb.Query, error) {
diff --git a/backend/store/project.go b/backend/store/project.go
index fcba64e403..5fe05fdf9b 100644
--- a/backend/store/project.go
+++ b/backend/store/project.go
@@ -243,9 +243,9 @@ func (s *Store) CreateProject(ctx context.Context, create *ProjectMessage, creat
}
// UpdateProjects updates projects in a single transaction.
-func (s *Store) UpdateProjects(ctx context.Context, patches ...*UpdateProjectMessage) ([]*ProjectMessage, error) {
+func (s *Store) UpdateProjects(ctx context.Context, patches ...*UpdateProjectMessage) error {
if len(patches) == 0 {
- return nil, nil
+ return nil
}
// Remove all projects from cache first
@@ -266,7 +266,7 @@ func (s *Store) UpdateProjects(ctx context.Context, patches ...*UpdateProjectMes
if patch.Setting != nil {
payload, err := protojson.Marshal(patch.Setting)
if err != nil {
- return nil, err
+ return err
}
s := string(payload)
settings[i] = &s
@@ -285,24 +285,14 @@ func (s *Store) UpdateProjects(ctx context.Context, patches ...*UpdateProjectMes
query, args, err := q.ToSQL()
if err != nil {
- return nil, err
+ return err
}
if _, err := s.GetDB().ExecContext(ctx, query, args...); err != nil {
- return nil, err
- }
-
- // Fetch and return all updated projects
- var updatedProjects []*ProjectMessage
- for _, patch := range patches {
- project, err := s.GetProject(ctx, &FindProjectMessage{ResourceID: &patch.ResourceID})
- if err != nil {
- return nil, err
- }
- updatedProjects = append(updatedProjects, project)
+ return err
}
- return updatedProjects, nil
+ return nil
}
func (s *Store) storeProjectCache(project *ProjectMessage) {