database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

planner: move logical lock into logicalop pkg. (#55160)

Browse Source 
ref pingcap/tidb#51664, ref pingcap/tidb#52714
This commit is contained in:
Arenatlx
2024-08-07 12:17:09 +08:00
committed by GitHub
parent 7291829726
commit 3dfa15cd97
14 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/executor/executor.go
View File

@ -55,6 +55,7 @@ import (
planctx "github.com/pingcap/tidb/pkg/planner/context"
plannercore "github.com/pingcap/tidb/pkg/planner/core"
"github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/planner/core/operator/logicalop"
plannerutil "github.com/pingcap/tidb/pkg/planner/util"
"github.com/pingcap/tidb/pkg/planner/util/fixcontrol"
"github.com/pingcap/tidb/pkg/privilege"
@ -1151,7 +1152,7 @@ func (e *SelectLockExec) Next(ctx context.Context, req *chunk.Chunk) error {
return err
}
// If there's no handle or it's not a `SELECT FOR UPDATE` statement.
if len(e.tblID2Handle) == 0 || (!plannercore.IsSelectForUpdateLockType(e.Lock.LockType)) {
if len(e.tblID2Handle) == 0 || (!logicalop.IsSelectForUpdateLockType(e.Lock.LockType)) {
return nil
}

1
pkg/planner/core/BUILD.bazel
View File

@ -30,7 +30,6 @@ go_library(
"logical_index_scan.go",
"logical_initialize.go",
"logical_join.go",
"logical_lock.go",
"logical_partition_union_all.go",
"logical_plan_builder.go",
"logical_plans.go",

1
pkg/planner/core/core_init.go
View File

@ -42,6 +42,7 @@ func init() {
utilfuncp.FindBestTask4LogicalShowDDLJobs = findBestTask4LogicalShowDDLJobs
utilfuncp.ExhaustPhysicalPlans4LogicalSort = exhaustPhysicalPlans4LogicalSort
utilfuncp.ExhaustPhysicalPlans4LogicalTopN = exhaustPhysicalPlans4LogicalTopN
utilfuncp.ExhaustPhysicalPlans4LogicalLock = exhaustPhysicalPlans4LogicalLock
utilfuncp.ExhaustPhysicalPlans4LogicalLimit = exhaustPhysicalPlans4LogicalLimit
utilfuncp.ExhaustLogicalWindowPhysicalPlans = exhaustLogicalWindowPhysicalPlans
utilfuncp.ExhaustPhysicalPlans4LogicalSequence = exhaustPhysicalPlans4LogicalSequence

3
pkg/planner/core/exhaust_physical_plans.go
View File

@ -2821,7 +2821,8 @@ func getLimitPhysicalPlans(p *logicalop.LogicalLimit, prop *property.PhysicalPro
return ret, true, nil
}
func getLockPhysicalPlans(p *LogicalLock, prop *property.PhysicalProperty) ([]base.PhysicalPlan, bool, error) {
func exhaustPhysicalPlans4LogicalLock(lp base.LogicalPlan, prop *property.PhysicalProperty) ([]base.PhysicalPlan, bool, error) {
p := lp.(*logicalop.LogicalLock)
if prop.IsFlashProp() {
p.SCtx().GetSessionVars().RaiseWarningWhenMPPEnforced(
"MPP mode may be blocked because operator `Lock` is not supported now.")

2
pkg/planner/core/logical_plans.go
View File

@ -37,7 +37,7 @@ var (
_ base.LogicalPlan = &LogicalIndexScan{}
_ base.LogicalPlan = &LogicalUnionAll{}
_ base.LogicalPlan = &logicalop.LogicalSort{}
_ base.LogicalPlan = &LogicalLock{}
_ base.LogicalPlan = &logicalop.LogicalLock{}
_ base.LogicalPlan = &logicalop.LogicalLimit{}
_ base.LogicalPlan = &logicalop.LogicalWindow{}
_ base.LogicalPlan = &LogicalExpand{}

1
pkg/planner/core/operator/logicalop/BUILD.bazel
View File

@ -6,6 +6,7 @@ go_library(
"base_logical_plan.go",
"logical_cte_table.go",
"logical_limit.go",
"logical_lock.go",
"logical_max_one_row.go",
"logical_mem_table.go",
"logical_projection.go",

25
pkg/planner/core/logical_lock.go → pkg/planner/core/operator/logicalop/logical_lock.go
View File

@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
package core
package logicalop
import (
"github.com/pingcap/tidb/pkg/expression"
"github.com/pingcap/tidb/pkg/parser/ast"
"github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/planner/core/operator/logicalop"
"github.com/pingcap/tidb/pkg/planner/property"
"github.com/pingcap/tidb/pkg/planner/util"
"github.com/pingcap/tidb/pkg/planner/util/optimizetrace"
"github.com/pingcap/tidb/pkg/planner/util/utilfuncp"
"github.com/pingcap/tidb/pkg/util/plancodec"
)
// LogicalLock represents a select lock plan.
type LogicalLock struct {
logicalop.BaseLogicalPlan
BaseLogicalPlan
Lock *ast.SelectLockInfo
TblID2Handle map[int64][]util.HandleCols
@ -40,7 +40,7 @@ type LogicalLock struct {
// Init initializes LogicalLock.
func (p LogicalLock) Init(ctx base.PlanContext) *LogicalLock {
p.BaseLogicalPlan = logicalop.NewBaseLogicalPlan(ctx, plancodec.TypeLock, &p, 0)
p.BaseLogicalPlan = NewBaseLogicalPlan(ctx, plancodec.TypeLock, &p, 0)
return &p
}
@ -89,9 +89,9 @@ func (p *LogicalLock) PruneColumns(parentUsedCols []*expression.Column, opt *opt
// PushDownTopN implements the base.LogicalPlan.<5th> interface.
func (p *LogicalLock) PushDownTopN(topNLogicalPlan base.LogicalPlan, opt *optimizetrace.LogicalOptimizeOp) base.LogicalPlan {
var topN *logicalop.LogicalTopN
var topN *LogicalTopN
if topNLogicalPlan != nil {
topN = topNLogicalPlan.(*logicalop.LogicalTopN)
topN = topNLogicalPlan.(*LogicalTopN)
}
if topN != nil {
p.Children()[0] = p.Children()[0].PushDownTopN(topN, opt)
@ -117,7 +117,7 @@ func (p *LogicalLock) PushDownTopN(topNLogicalPlan base.LogicalPlan, opt *optimi
// ExhaustPhysicalPlans implements base.LogicalPlan.<14th> interface.
func (p *LogicalLock) ExhaustPhysicalPlans(prop *property.PhysicalProperty) ([]base.PhysicalPlan, bool, error) {
return getLockPhysicalPlans(p, prop)
return utilfuncp.ExhaustPhysicalPlans4LogicalLock(p, prop)
}
// ExtractCorrelatedCols inherits BaseLogicalPlan.LogicalPlan.<15th> implementation.
@ -141,3 +141,14 @@ func (p *LogicalLock) ExhaustPhysicalPlans(prop *property.PhysicalProperty) ([]b
// ConvertOuterToInnerJoin inherits BaseLogicalPlan.LogicalPlan.<24th> implementation.
// *************************** end implementation of logicalPlan interface ***************************
// IsSelectForUpdateLockType checks if the select lock type is for update type.
func IsSelectForUpdateLockType(lockType ast.SelectLockType) bool {
if lockType == ast.SelectLockForUpdate ||
lockType == ast.SelectLockForShare ||
lockType == ast.SelectLockForUpdateNoWait ||
lockType == ast.SelectLockForUpdateWaitN {
return true
}
return false
}

2
pkg/planner/core/plan.go
View File

@ -383,7 +383,7 @@ func HasMaxOneRow(p base.LogicalPlan, childMaxOneRow []bool) bool {
return false
}
switch x := p.(type) {
case *LogicalLock, *logicalop.LogicalLimit, *logicalop.LogicalSort, *LogicalSelection,
case *logicalop.LogicalLock, *logicalop.LogicalLimit, *logicalop.LogicalSort, *LogicalSelection,
*LogicalApply, *logicalop.LogicalProjection, *logicalop.LogicalWindow, *LogicalAggregation:
return childMaxOneRow[0]
case *logicalop.LogicalMaxOneRow:

4
pkg/planner/core/planbuilder.go
View File

@ -1311,7 +1311,7 @@ func removeGlobalIndexPaths(paths []*util.AccessPath) []*util.AccessPath {
return paths[:i]
}
func (b *PlanBuilder) buildSelectLock(src base.LogicalPlan, lock *ast.SelectLockInfo) (*LogicalLock, error) {
func (b *PlanBuilder) buildSelectLock(src base.LogicalPlan, lock *ast.SelectLockInfo) (*logicalop.LogicalLock, error) {
var tblID2PhysTblIDCol map[int64]*expression.Column
if len(b.partitionedTable) > 0 {
tblID2PhysTblIDCol = make(map[int64]*expression.Column)
@ -1325,7 +1325,7 @@ func (b *PlanBuilder) buildSelectLock(src base.LogicalPlan, lock *ast.SelectLock
// since it would otherwise be lost in the PartitionUnion executor.
setExtraPhysTblIDColsOnDataSource(src, tblID2PhysTblIDCol)
}
selectLock := LogicalLock{
selectLock := logicalop.LogicalLock{
Lock: lock,
TblID2Handle: b.handleHelper.tailMap(),
TblID2PhysTblIDCol: tblID2PhysTblIDCol,

14
pkg/planner/core/point_get_plan.go
View File

@ -34,6 +34,7 @@ import (
ptypes "github.com/pingcap/tidb/pkg/parser/types"
"github.com/pingcap/tidb/pkg/planner/core/base"
"github.com/pingcap/tidb/pkg/planner/core/operator/baseimpl"
"github.com/pingcap/tidb/pkg/planner/core/operator/logicalop"
"github.com/pingcap/tidb/pkg/planner/property"
"github.com/pingcap/tidb/pkg/planner/util"
"github.com/pingcap/tidb/pkg/planner/util/costusage"
@ -943,20 +944,9 @@ func TryFastPlan(ctx base.PlanContext, node ast.Node) (p base.Plan) {
return nil
}
// IsSelectForUpdateLockType checks if the select lock type is for update type.
func IsSelectForUpdateLockType(lockType ast.SelectLockType) bool {
if lockType == ast.SelectLockForUpdate ||
lockType == ast.SelectLockForShare ||
lockType == ast.SelectLockForUpdateNoWait ||
lockType == ast.SelectLockForUpdateWaitN {
return true
}
return false
}
func getLockWaitTime(ctx base.PlanContext, lockInfo *ast.SelectLockInfo) (lock bool, waitTime int64) {
if lockInfo != nil {
if IsSelectForUpdateLockType(lockInfo.LockType) {
if logicalop.IsSelectForUpdateLockType(lockInfo.LockType) {
// Locking of rows for update using SELECT FOR UPDATE only applies when autocommit
// is disabled (either by beginning transaction with START TRANSACTION or by setting
// autocommit to 0. If autocommit is enabled, the rows matching the specification are not locked.

2
pkg/planner/core/stringer.go
View File

@ -171,7 +171,7 @@ func toString(in base.Plan, strs []string, idxs []int) ([]string, []int) {
str = "MaxOneRow"
case *logicalop.LogicalLimit, *PhysicalLimit:
str = "Limit"
case *PhysicalLock, *LogicalLock:
case *PhysicalLock, *logicalop.LogicalLock:
str = "Lock"
case *ShowDDL:
str = "ShowDDL"

2
pkg/planner/pattern/pattern.go
View File

@ -101,7 +101,7 @@ func GetOperand(p base.LogicalPlan) Operand {
return OperandSort
case *logicalop.LogicalTopN:
return OperandTopN
case *plannercore.LogicalLock:
case *logicalop.LogicalLock:
return OperandLock
case *logicalop.LogicalLimit:
return OperandLimit

2
pkg/planner/pattern/pattern_test.go
View File

@ -35,7 +35,7 @@ func TestGetOperand(t *testing.T) {
require.Equal(t, OperandUnionAll, GetOperand(&plannercore.LogicalUnionAll{}))
require.Equal(t, OperandSort, GetOperand(&logicalop.LogicalSort{}))
require.Equal(t, OperandTopN, GetOperand(&logicalop.LogicalTopN{}))
require.Equal(t, OperandLock, GetOperand(&plannercore.LogicalLock{}))
require.Equal(t, OperandLock, GetOperand(&logicalop.LogicalLock{}))
require.Equal(t, OperandLimit, GetOperand(&logicalop.LogicalLimit{}))
}

4
pkg/planner/util/utilfuncp/func_pointer_misc.go
View File

@ -137,3 +137,7 @@ var ExhaustPhysicalPlans4LogicalProjection func(lp base.LogicalPlan,
// ExhaustLogicalWindowPhysicalPlans will be called by LogicalWindow in logicalOp pkg.
var ExhaustLogicalWindowPhysicalPlans func(lp base.LogicalPlan, prop *property.PhysicalProperty) (
[]base.PhysicalPlan, bool, error)
// ExhaustPhysicalPlans4LogicalLock will be called by LogicalLock in logicalOp pkg.
var ExhaustPhysicalPlans4LogicalLock func(lp base.LogicalPlan, prop *property.PhysicalProperty) (
[]base.PhysicalPlan, bool, error)