diff --git a/pkg/ddl/cluster.go b/pkg/ddl/cluster.go index 342d68cbe4a77..b210113fad9d2 100644 --- a/pkg/ddl/cluster.go +++ b/pkg/ddl/cluster.go @@ -61,18 +61,6 @@ const ( flashbackTimeout = 3 * time.Minute // 3min ) -const ( - pdScheduleArgsOffset = 1 + iota - gcEnabledOffset - autoAnalyzeOffset - readOnlyOffset - totalLockedRegionsOffset - startTSOffset - commitTSOffset - ttlJobEnableOffSet - keyRangesOffset -) - func closePDSchedule(ctx context.Context) error { closeMap := make(map[string]any) for _, key := range pdScheduleKey { diff --git a/pkg/ddl/ingest/message.go b/pkg/ddl/ingest/message.go index 88c708439a7e0..6db3aef665ccf 100644 --- a/pkg/ddl/ingest/message.go +++ b/pkg/ddl/ingest/message.go @@ -59,13 +59,6 @@ const ( LitInfoUnsafeImport string = "do a partial import data into the storage" ) -func genBackendAllocMemFailedErr(ctx context.Context, memRoot MemRoot, jobID int64) error { - logutil.Logger(ctx).Warn(LitErrAllocMemFail, zap.Int64("job ID", jobID), - zap.Int64("current memory usage", memRoot.CurrentUsage()), - zap.Int64("max memory quota", memRoot.MaxMemoryQuota())) - return dbterror.ErrIngestFailed.FastGenByArgs("memory used up") -} - func genEngineAllocMemFailedErr(ctx context.Context, memRoot MemRoot, jobID int64, idxIDs []int64) error { logutil.Logger(ctx).Warn(LitErrAllocMemFail, zap.Int64("job ID", jobID), diff --git a/pkg/planner/core/indexmerge_path.go b/pkg/planner/core/indexmerge_path.go index 3c3d144606ea3..cdf494191eae0 100644 --- a/pkg/planner/core/indexmerge_path.go +++ b/pkg/planner/core/indexmerge_path.go @@ -634,7 +634,6 @@ func generateANDIndexMerge4ComposedIndex(ds *logicalop.DataSource, normalPathCnt // Collect access paths that satisfy the hints, and make sure there is at least one MV index path. var mvIndexPathCnt int - candidateAccessPaths := make([]*util.AccessPath, 0, len(ds.PossibleAccessPaths)) for idx := range normalPathCnt { if (ds.PossibleAccessPaths[idx].IsTablePath() && !isInIndexMergeHints(ds, "primary")) || @@ -645,7 +644,6 @@ func generateANDIndexMerge4ComposedIndex(ds *logicalop.DataSource, normalPathCnt if isMVIndexPath(ds.PossibleAccessPaths[idx]) { mvIndexPathCnt++ } - candidateAccessPaths = append(candidateAccessPaths, ds.PossibleAccessPaths[idx]) } if mvIndexPathCnt == 0 { return nil diff --git a/pkg/planner/core/planbuilder.go b/pkg/planner/core/planbuilder.go index 49c1981680480..2c7433d2b2b9e 100644 --- a/pkg/planner/core/planbuilder.go +++ b/pkg/planner/core/planbuilder.go @@ -6112,7 +6112,6 @@ func getTablePath(paths []*util.AccessPath) *util.AccessPath { func (b *PlanBuilder) buildAdminAlterDDLJob(ctx context.Context, as *ast.AdminStmt) (_ base.Plan, err error) { options := make([]*AlterDDLJobOpt, 0, len(as.AlterJobOptions)) - optionNames := make([]string, 0, len(as.AlterJobOptions)) mockTablePlan := logicalop.LogicalTableDual{}.Init(b.ctx, b.getSelectOffset()) for _, opt := range as.AlterJobOptions { _, ok := allowedAlterDDLJobParams[opt.Name] @@ -6130,7 +6129,6 @@ func (b *PlanBuilder) buildAdminAlterDDLJob(ctx context.Context, as *ast.AdminSt return nil, err } options = append(options, &alterDDLJobOpt) - optionNames = append(optionNames, opt.Name) } p := &AlterDDLJob{ JobID: as.JobNumber,