Skip to content

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

perf: use cached instance metadata instead of querying lower_case_table_names (#18650)

Danny Xu32f343a8a679
diff --git a/backend/api/v1/rollout_service.go b/backend/api/v1/rollout_service.go
index 6124f9f606..699d82c3b0 100644
--- a/backend/api/v1/rollout_service.go
+++ b/backend/api/v1/rollout_service.go
@@ -232,7 +232,7 @@ func (s *RolloutService) CreateRollout(ctx context.Context, req *connect.Request
return nil, connect.NewError(connect.CodeNotFound, errors.Errorf("plan %d not found in project %s", planID, projectID))
}
- pipelineCreate, err := GetPipelineCreate(ctx, s.store, s.dbFactory, plan.Config.GetSpecs(), project.ResourceID)
+ pipelineCreate, err := GetPipelineCreate(ctx, s.store, plan.Config.GetSpecs(), project.ResourceID)
if err != nil {
return nil, connect.NewError(connect.CodeInvalidArgument, errors.Errorf("failed to get pipeline create, error: %v", err))
}
@@ -1010,7 +1010,7 @@ func isChangeDatabasePlan(specs []*storepb.PlanConfig_Spec) bool {
}
// GetPipelineCreate gets a pipeline create message from a plan.
-func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, specs []*storepb.PlanConfig_Spec, projectID string) (*store.PipelineMessage, error) {
+func GetPipelineCreate(ctx context.Context, s *store.Store, specs []*storepb.PlanConfig_Spec, projectID string) (*store.PipelineMessage, error) {
// Step 1 - transform database group specs.
// Re-evaluate database groups live to pick up newly created databases.
transformedSpecs, err := applyDatabaseGroupSpecTransformations(ctx, s, specs, projectID)
@@ -1021,7 +1021,7 @@ func GetPipelineCreate(ctx context.Context, s *store.Store, dbFactory *dbfactory
// Step 2 - convert all task creates.
var taskCreates []*store.TaskMessage
for _, spec := range transformedSpecs {
- tcs, err := getTaskCreatesFromSpec(ctx, s, dbFactory, spec)
+ tcs, err := getTaskCreatesFromSpec(ctx, s, spec)
if err != nil {
return nil, errors.Wrap(err, "failed to get task creates from spec")
}
diff --git a/backend/api/v1/rollout_service_task.go b/backend/api/v1/rollout_service_task.go
index 63c911bf3b..99fca15e49 100644
--- a/backend/api/v1/rollout_service_task.go
+++ b/backend/api/v1/rollout_service_task.go
@@ -5,18 +5,13 @@ import (
"fmt"
"strings"
- "log/slog"
-
"github.com/pkg/errors"
"google.golang.org/protobuf/proto"
"github.com/bytebase/bytebase/backend/common"
- "github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/ghost"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"
- "github.com/bytebase/bytebase/backend/plugin/db"
"github.com/bytebase/bytebase/backend/store"
"github.com/bytebase/bytebase/backend/store/model"
"github.com/bytebase/bytebase/backend/utils"
@@ -67,10 +62,10 @@ func applyDatabaseGroupSpecTransformations(ctx context.Context, s *store.Store,
return result, nil
}
-func getTaskCreatesFromSpec(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, spec *storepb.PlanConfig_Spec) ([]*store.TaskMessage, error) {
+func getTaskCreatesFromSpec(ctx context.Context, s *store.Store, spec *storepb.PlanConfig_Spec) ([]*store.TaskMessage, error) {
switch config := spec.Config.(type) {
case *storepb.PlanConfig_Spec_CreateDatabaseConfig:
- return getTaskCreatesFromCreateDatabaseConfig(ctx, s, dbFactory, spec, config.CreateDatabaseConfig)
+ return getTaskCreatesFromCreateDatabaseConfig(ctx, s, spec, config.CreateDatabaseConfig)
case *storepb.PlanConfig_Spec_ChangeDatabaseConfig:
return getTaskCreatesFromChangeDatabaseConfig(ctx, s, spec, config.ChangeDatabaseConfig)
case *storepb.PlanConfig_Spec_ExportDataConfig:
@@ -80,7 +75,7 @@ func getTaskCreatesFromSpec(ctx context.Context, s *store.Store, dbFactory *dbfa
return nil, errors.Errorf("invalid spec config type %T", spec.Config)
}
-func getTaskCreatesFromCreateDatabaseConfig(ctx context.Context, s *store.Store, dbFactory *dbfactory.DBFactory, spec *storepb.PlanConfig_Spec, c *storepb.PlanConfig_CreateDatabaseConfig) ([]*store.TaskMessage, error) {
+func getTaskCreatesFromCreateDatabaseConfig(ctx context.Context, s *store.Store, spec *storepb.PlanConfig_Spec, c *storepb.PlanConfig_CreateDatabaseConfig) ([]*store.TaskMessage, error) {
if c.Database == "" {
return nil, errors.Errorf("database name is required")
}
@@ -137,21 +132,7 @@ func getTaskCreatesFromCreateDatabaseConfig(ctx context.Context, s *store.Store,
case storepb.Engine_MYSQL, storepb.Engine_MARIADB, storepb.Engine_OCEANBASE:
// For MySQL, we need to use different case of DatabaseName depends on the variable `lower_case_table_names`.
// https://dev.mysql.com/doc/refman/8.0/en/identifier-case-sensitivity.html
- // And also, meet an error in here is not a big deal, we will just use the original DatabaseName.
- driver, err := dbFactory.GetAdminDatabaseDriver(ctx, instance, nil /* database */, db.ConnectionContext{})
- if err != nil {
- slog.Warn("failed to get admin database driver for instance %q, please check the connection for admin data source", log.BBError(err), slog.String("instance", instance.ResourceID))
- break
- }
- defer driver.Close(ctx)
- var lowerCaseTableNames int
- var unused any
- db := driver.GetDB()
- if err := db.QueryRowContext(ctx, "SHOW VARIABLES LIKE 'lower_case_table_names'").Scan(&unused, &lowerCaseTableNames); err != nil {
- slog.Warn("failed to get lower_case_table_names for instance %q", log.BBError(err), slog.String("instance", instance.ResourceID))
- break
- }
- if lowerCaseTableNames == 1 {
+ if !store.IsObjectCaseSensitive(instance) {
databaseName = strings.ToLower(databaseName)
}
default:
diff --git a/backend/runner/approval/runner.go b/backend/runner/approval/runner.go
index dc1d824047..042c2cd2ff 100644
--- a/backend/runner/approval/runner.go
+++ b/backend/runner/approval/runner.go
@@ -487,7 +487,7 @@ func (r *Runner) buildCELVariablesForDatabaseChange(ctx context.Context, issue *
}
// Build CEL variables for each task
- pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.ProjectID)
+ pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, plan.Config.GetSpecs(), issue.ProjectID)
if err != nil {
return nil, false, errors.Wrap(err, "failed to get pipeline create")
}
@@ -601,7 +601,7 @@ func (r *Runner) buildCELVariablesForDataExport(ctx context.Context, issue *stor
return nil, false, errors.Errorf("plan %v not found", *issue.PlanUID)
}
- pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, r.dbFactory, plan.Config.GetSpecs(), issue.ProjectID)
+ pipelineCreate, err := apiv1.GetPipelineCreate(ctx, r.store, plan.Config.GetSpecs(), issue.ProjectID)
if err != nil {
return nil, false, errors.Wrap(err, "failed to get pipeline create")
}
diff --git a/backend/runner/taskrun/rollout_creator.go b/backend/runner/taskrun/rollout_creator.go
index e0e627080f..4e2cefa4c3 100644
--- a/backend/runner/taskrun/rollout_creator.go
+++ b/backend/runner/taskrun/rollout_creator.go
@@ -10,7 +10,6 @@ import (
apiv1 "github.com/bytebase/bytebase/backend/api/v1"
"github.com/bytebase/bytebase/backend/common/log"
- "github.com/bytebase/bytebase/backend/component/dbfactory"
"github.com/bytebase/bytebase/backend/component/state"
storepb "github.com/bytebase/bytebase/backend/generated-go/store"
"github.com/bytebase/bytebase/backend/store"
@@ -20,17 +19,15 @@ import (
// RolloutCreator handles automatic rollout creation.
// nolint:revive
type RolloutCreator struct {
- store *store.Store
- stateCfg *state.State
- dbFactory *dbfactory.DBFactory
+ store *store.Store
+ stateCfg *state.State
}
// NewRolloutCreator creates a new rollout creator.
-func NewRolloutCreator(store *store.Store, stateCfg *state.State, dbFactory *dbfactory.DBFactory) *RolloutCreator {
+func NewRolloutCreator(store *store.Store, stateCfg *state.State) *RolloutCreator {
return &RolloutCreator{
- store: store,
- stateCfg: stateCfg,
- dbFactory: dbFactory,
+ store: store,
+ stateCfg: stateCfg,
}
}
@@ -148,7 +145,7 @@ func (rc *RolloutCreator) tryCreateRollout(_ context.Context, planID int64) {
slog.Info("auto-creating rollout", slog.Int("plan_id", int(planID)))
// Get pipeline create (tasks to create)
- pipelineCreate, err := apiv1.GetPipelineCreate(rolloutCtx, rc.store, rc.dbFactory, plan.Config.GetSpecs(), project.ResourceID)
+ pipelineCreate, err := apiv1.GetPipelineCreate(rolloutCtx, rc.store, plan.Config.GetSpecs(), project.ResourceID)
if err != nil {
slog.Error("failed to get pipeline create for rollout creation",
slog.Int("plan_id", int(planID)),
diff --git a/backend/runner/taskrun/scheduler.go b/backend/runner/taskrun/scheduler.go
index 3e2a345580..af6fd6a395 100644
--- a/backend/runner/taskrun/scheduler.go
+++ b/backend/runner/taskrun/scheduler.go
@@ -76,7 +76,7 @@ func (s *Scheduler) Run(ctx context.Context, wg *sync.WaitGroup) {
go s.ListenTaskSkippedOrDone(ctx)
// Start rollout creator component
- rolloutCreator := NewRolloutCreator(s.store, s.stateCfg, s.dbFactory)
+ rolloutCreator := NewRolloutCreator(s.store, s.stateCfg)
wg.Add(1)
go rolloutCreator.Run(ctx, wg, s.stateCfg.RolloutCreationChan)