replace the ambiguous name 'external consistency'

Signed-off-by: ekexium <[email protected]>

executor/simple.go

@@ -590,7 +590,7 @@ func (e *SimpleExec) executeBegin(ctx context.Context, s *ast.BeginStmt) error {
 	if e.ctx.GetSessionVars().TxnCtx.IsPessimistic {
 		txn.SetOption(kv.Pessimistic, true)
 	}
-	txn.SetOption(kv.GuaranteeExternalConsistency, !s.CausalConsistencyOnly)
+	txn.SetOption(kv.GuaranteeLinearizability, !s.CausalConsistencyOnly)
 	return nil
 }
 

go.sum

@@ -220,8 +220,6 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/ekexium/parser v0.0.0-20210202083354-07aa34a5ca3c h1:aQkO2+Ua2sxfg8dJ4B7RaEVv/E/6zSD92EoyJom2qwk=
-github.com/ekexium/parser v0.0.0-20210202083354-07aa34a5ca3c/go.mod h1:GbEr2PgY72/4XqPZzmzstlOU/+il/wrjeTNFs6ihsSE=
 github.com/ekexium/parser v0.0.0-20210203081914-18a31cd39b53 h1:F+WtCF9ygyJvqIO+ogDh21IHeeZLpc1d2YvEVNy7+wY=
 github.com/ekexium/parser v0.0.0-20210203081914-18a31cd39b53/go.mod h1:GbEr2PgY72/4XqPZzmzstlOU/+il/wrjeTNFs6ihsSE=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=

kv/kv.go

@@ -62,8 +62,8 @@ const (
 	EnableAsyncCommit
 	// Enable1PC indicates whether one-phase commit is enabled
 	Enable1PC
-	// GuaranteeExternalConsistency indicates whether to guarantee external consistency at the cost of an extra tso request before prewrite
-	GuaranteeExternalConsistency
+	// GuaranteeLinearizability indicates whether to guarantee linearizability at the cost of an extra tso request before prewrite
+	GuaranteeLinearizability
 	// TxnScope indicates which @@txn_scope this transaction will work with.
 	TxnScope
 	// StalenessReadOnly indicates whether the transaction is staleness read only transaction

session/session.go

@@ -508,9 +508,9 @@ func (s *session) doCommit(ctx context.Context) error {
 	}
 	s.txn.SetOption(kv.EnableAsyncCommit, s.GetSessionVars().EnableAsyncCommit)
 	s.txn.SetOption(kv.Enable1PC, s.GetSessionVars().Enable1PC)
-	// priorify of the sysvar is lower than `start transaction with causal consistency`
-	if s.txn.GetUnionStore().GetOption(kv.GuaranteeExternalConsistency) == nil {
-		s.txn.SetOption(kv.GuaranteeExternalConsistency, s.GetSessionVars().GuaranteeExternalConsistency)
+	// priority of the sysvar is lower than `start transaction with causal consistency`
+	if s.txn.GetUnionStore().GetOption(kv.GuaranteeLinearizability) == nil {
+		s.txn.SetOption(kv.GuaranteeLinearizability, s.GetSessionVars().GuaranteeLinearizability)
 	}
 
 	return s.txn.Commit(sessionctx.SetCommitCtx(ctx, s))
@@ -2557,7 +2557,7 @@ var builtinGlobalVariable = []string{
 	variable.TiDBEnableRateLimitAction,
 	variable.TiDBEnableAsyncCommit,
 	variable.TiDBEnable1PC,
-	variable.TiDBGuaranteeExternalConsistency,
+	variable.TiDBGuaranteeLinearizability,
 	variable.TiDBAnalyzeVersion,
 	variable.TiDBEnableIndexMergeJoin,
 	variable.TiDBTrackAggregateMemoryUsage,

sessionctx/variable/session.go

@@ -795,7 +795,7 @@ type SessionVars struct {
 	// Enable1PC indicates whether to enable the one-phase commit feature.
 	Enable1PC bool
 
-	GuaranteeExternalConsistency bool
+	GuaranteeLinearizability bool
 
 	// AnalyzeVersion indicates how TiDB collect and use analyzed statistics.
 	AnalyzeVersion int
@@ -883,86 +883,86 @@ type ConnectionInfo struct {
 // NewSessionVars creates a session vars object.
 func NewSessionVars() *SessionVars {
 	vars := &SessionVars{
-		Users:                        make(map[string]types.Datum),
-		UserVarTypes:                 make(map[string]*types.FieldType),
-		systems:                      make(map[string]string),
-		stmtVars:                     make(map[string]string),
-		PreparedStmts:                make(map[uint32]interface{}),
-		PreparedStmtNameToID:         make(map[string]uint32),
-		PreparedParams:               make([]types.Datum, 0, 10),
-		TxnCtx:                       &TransactionContext{},
-		RetryInfo:                    &RetryInfo{},
-		ActiveRoles:                  make([]*auth.RoleIdentity, 0, 10),
-		StrictSQLMode:                true,
-		AutoIncrementIncrement:       DefAutoIncrementIncrement,
-		AutoIncrementOffset:          DefAutoIncrementOffset,
-		Status:                       mysql.ServerStatusAutocommit,
-		StmtCtx:                      new(stmtctx.StatementContext),
-		AllowAggPushDown:             false,
-		AllowBCJ:                     false,
-		BroadcastJoinThresholdSize:   DefBroadcastJoinThresholdSize,
-		BroadcastJoinThresholdCount:  DefBroadcastJoinThresholdSize,
-		OptimizerSelectivityLevel:    DefTiDBOptimizerSelectivityLevel,
-		RetryLimit:                   DefTiDBRetryLimit,
-		DisableTxnAutoRetry:          DefTiDBDisableTxnAutoRetry,
-		DDLReorgPriority:             kv.PriorityLow,
-		allowInSubqToJoinAndAgg:      DefOptInSubqToJoinAndAgg,
-		preferRangeScan:              DefOptPreferRangeScan,
-		CorrelationThreshold:         DefOptCorrelationThreshold,
-		CorrelationExpFactor:         DefOptCorrelationExpFactor,
-		CPUFactor:                    DefOptCPUFactor,
-		CopCPUFactor:                 DefOptCopCPUFactor,
-		CopTiFlashConcurrencyFactor:  DefOptTiFlashConcurrencyFactor,
-		NetworkFactor:                DefOptNetworkFactor,
-		ScanFactor:                   DefOptScanFactor,
-		DescScanFactor:               DefOptDescScanFactor,
-		SeekFactor:                   DefOptSeekFactor,
-		MemoryFactor:                 DefOptMemoryFactor,
-		DiskFactor:                   DefOptDiskFactor,
-		ConcurrencyFactor:            DefOptConcurrencyFactor,
-		EnableRadixJoin:              false,
-		EnableVectorizedExpression:   DefEnableVectorizedExpression,
-		L2CacheSize:                  cpuid.CPU.Cache.L2,
-		CommandValue:                 uint32(mysql.ComSleep),
-		TiDBOptJoinReorderThreshold:  DefTiDBOptJoinReorderThreshold,
-		SlowQueryFile:                config.GetGlobalConfig().Log.SlowQueryFile,
-		WaitSplitRegionFinish:        DefTiDBWaitSplitRegionFinish,
-		WaitSplitRegionTimeout:       DefWaitSplitRegionTimeout,
-		enableIndexMerge:             false,
-		EnableNoopFuncs:              DefTiDBEnableNoopFuncs,
-		replicaRead:                  kv.ReplicaReadLeader,
-		AllowRemoveAutoInc:           DefTiDBAllowRemoveAutoInc,
-		UsePlanBaselines:             DefTiDBUsePlanBaselines,
-		EvolvePlanBaselines:          DefTiDBEvolvePlanBaselines,
-		EnableExtendedStats:          false,
-		IsolationReadEngines:         make(map[kv.StoreType]struct{}),
-		LockWaitTimeout:              DefInnodbLockWaitTimeout * 1000,
-		MetricSchemaStep:             DefTiDBMetricSchemaStep,
-		MetricSchemaRangeDuration:    DefTiDBMetricSchemaRangeDuration,
-		SequenceState:                NewSequenceState(),
-		WindowingUseHighPrecision:    true,
-		PrevFoundInPlanCache:         DefTiDBFoundInPlanCache,
-		FoundInPlanCache:             DefTiDBFoundInPlanCache,
-		PrevFoundInBinding:           DefTiDBFoundInBinding,
-		FoundInBinding:               DefTiDBFoundInBinding,
-		SelectLimit:                  math.MaxUint64,
-		AllowAutoRandExplicitInsert:  DefTiDBAllowAutoRandExplicitInsert,
-		EnableClusteredIndex:         DefTiDBEnableClusteredIndex,
-		EnableParallelApply:          DefTiDBEnableParallelApply,
-		ShardAllocateStep:            DefTiDBShardAllocateStep,
-		EnableChangeColumnType:       DefTiDBChangeColumnType,
-		EnableChangeMultiSchema:      DefTiDBChangeMultiSchema,
-		EnablePointGetCache:          DefTiDBPointGetCache,
-		EnableAlterPlacement:         DefTiDBEnableAlterPlacement,
-		EnableAmendPessimisticTxn:    DefTiDBEnableAmendPessimisticTxn,
-		PartitionPruneMode:           *atomic2.NewString(DefTiDBPartitionPruneMode),
-		TxnScope:                     config.GetGlobalConfig().TxnScope,
-		EnabledRateLimitAction:       DefTiDBEnableRateLimitAction,
-		EnableAsyncCommit:            DefTiDBEnableAsyncCommit,
-		Enable1PC:                    DefTiDBEnable1PC,
-		GuaranteeExternalConsistency: DefTiDBGuaranteeExternalConsistency,
-		AnalyzeVersion:               DefTiDBAnalyzeVersion,
-		EnableIndexMergeJoin:         DefTiDBEnableIndexMergeJoin,
+		Users:                       make(map[string]types.Datum),
+		UserVarTypes:                make(map[string]*types.FieldType),
+		systems:                     make(map[string]string),
+		stmtVars:                    make(map[string]string),
+		PreparedStmts:               make(map[uint32]interface{}),
+		PreparedStmtNameToID:        make(map[string]uint32),
+		PreparedParams:              make([]types.Datum, 0, 10),
+		TxnCtx:                      &TransactionContext{},
+		RetryInfo:                   &RetryInfo{},
+		ActiveRoles:                 make([]*auth.RoleIdentity, 0, 10),
+		StrictSQLMode:               true,
+		AutoIncrementIncrement:      DefAutoIncrementIncrement,
+		AutoIncrementOffset:         DefAutoIncrementOffset,
+		Status:                      mysql.ServerStatusAutocommit,
+		StmtCtx:                     new(stmtctx.StatementContext),
+		AllowAggPushDown:            false,
+		AllowBCJ:                    false,
+		BroadcastJoinThresholdSize:  DefBroadcastJoinThresholdSize,
+		BroadcastJoinThresholdCount: DefBroadcastJoinThresholdSize,
+		OptimizerSelectivityLevel:   DefTiDBOptimizerSelectivityLevel,
+		RetryLimit:                  DefTiDBRetryLimit,
+		DisableTxnAutoRetry:         DefTiDBDisableTxnAutoRetry,
+		DDLReorgPriority:            kv.PriorityLow,
+		allowInSubqToJoinAndAgg:     DefOptInSubqToJoinAndAgg,
+		preferRangeScan:             DefOptPreferRangeScan,
+		CorrelationThreshold:        DefOptCorrelationThreshold,
+		CorrelationExpFactor:        DefOptCorrelationExpFactor,
+		CPUFactor:                   DefOptCPUFactor,
+		CopCPUFactor:                DefOptCopCPUFactor,
+		CopTiFlashConcurrencyFactor: DefOptTiFlashConcurrencyFactor,
+		NetworkFactor:               DefOptNetworkFactor,
+		ScanFactor:                  DefOptScanFactor,
+		DescScanFactor:              DefOptDescScanFactor,
+		SeekFactor:                  DefOptSeekFactor,
+		MemoryFactor:                DefOptMemoryFactor,
+		DiskFactor:                  DefOptDiskFactor,
+		ConcurrencyFactor:           DefOptConcurrencyFactor,
+		EnableRadixJoin:             false,
+		EnableVectorizedExpression:  DefEnableVectorizedExpression,
+		L2CacheSize:                 cpuid.CPU.Cache.L2,
+		CommandValue:                uint32(mysql.ComSleep),
+		TiDBOptJoinReorderThreshold: DefTiDBOptJoinReorderThreshold,
+		SlowQueryFile:               config.GetGlobalConfig().Log.SlowQueryFile,
+		WaitSplitRegionFinish:       DefTiDBWaitSplitRegionFinish,
+		WaitSplitRegionTimeout:      DefWaitSplitRegionTimeout,
+		enableIndexMerge:            false,
+		EnableNoopFuncs:             DefTiDBEnableNoopFuncs,
+		replicaRead:                 kv.ReplicaReadLeader,
+		AllowRemoveAutoInc:          DefTiDBAllowRemoveAutoInc,
+		UsePlanBaselines:            DefTiDBUsePlanBaselines,
+		EvolvePlanBaselines:         DefTiDBEvolvePlanBaselines,
+		EnableExtendedStats:         false,
+		IsolationReadEngines:        make(map[kv.StoreType]struct{}),
+		LockWaitTimeout:             DefInnodbLockWaitTimeout * 1000,
+		MetricSchemaStep:            DefTiDBMetricSchemaStep,
+		MetricSchemaRangeDuration:   DefTiDBMetricSchemaRangeDuration,
+		SequenceState:               NewSequenceState(),
+		WindowingUseHighPrecision:   true,
+		PrevFoundInPlanCache:        DefTiDBFoundInPlanCache,
+		FoundInPlanCache:            DefTiDBFoundInPlanCache,
+		PrevFoundInBinding:          DefTiDBFoundInBinding,
+		FoundInBinding:              DefTiDBFoundInBinding,
+		SelectLimit:                 math.MaxUint64,
+		AllowAutoRandExplicitInsert: DefTiDBAllowAutoRandExplicitInsert,
+		EnableClusteredIndex:        DefTiDBEnableClusteredIndex,
+		EnableParallelApply:         DefTiDBEnableParallelApply,
+		ShardAllocateStep:           DefTiDBShardAllocateStep,
+		EnableChangeColumnType:      DefTiDBChangeColumnType,
+		EnableChangeMultiSchema:     DefTiDBChangeMultiSchema,
+		EnablePointGetCache:         DefTiDBPointGetCache,
+		EnableAlterPlacement:        DefTiDBEnableAlterPlacement,
+		EnableAmendPessimisticTxn:   DefTiDBEnableAmendPessimisticTxn,
+		PartitionPruneMode:          *atomic2.NewString(DefTiDBPartitionPruneMode),
+		TxnScope:                    config.GetGlobalConfig().TxnScope,
+		EnabledRateLimitAction:      DefTiDBEnableRateLimitAction,
+		EnableAsyncCommit:           DefTiDBEnableAsyncCommit,
+		Enable1PC:                   DefTiDBEnable1PC,
+		GuaranteeLinearizability:    DefTiDBGuaranteeLinearizability,
+		AnalyzeVersion:              DefTiDBAnalyzeVersion,
+		EnableIndexMergeJoin:        DefTiDBEnableIndexMergeJoin,
 	}
 	vars.KVVars = kv.NewVariables(&vars.Killed)
 	vars.Concurrency = Concurrency{
@@ -1681,8 +1681,8 @@ func (s *SessionVars) SetSystemVar(name string, val string) error {
 		s.EnableAsyncCommit = TiDBOptOn(val)
 	case TiDBEnable1PC:
 		s.Enable1PC = TiDBOptOn(val)
-	case TiDBGuaranteeExternalConsistency:
-		s.GuaranteeExternalConsistency = TiDBOptOn(val)
+	case TiDBGuaranteeLinearizability:
+		s.GuaranteeLinearizability = TiDBOptOn(val)
 	case TiDBAnalyzeVersion:
 		s.AnalyzeVersion = tidbOptPositiveInt32(val, DefTiDBAnalyzeVersion)
 	case TiDBEnableIndexMergeJoin:

sessionctx/variable/sysvar.go

@@ -746,7 +746,7 @@ var defaultSysVars = []*SysVar{
 	{Scope: ScopeGlobal | ScopeSession, Name: TiDBEnableAmendPessimisticTxn, Value: BoolToOnOff(DefTiDBEnableAmendPessimisticTxn), Type: TypeBool},
 	{Scope: ScopeGlobal | ScopeSession, Name: TiDBEnableAsyncCommit, Value: BoolToOnOff(DefTiDBEnableAsyncCommit), Type: TypeBool},
 	{Scope: ScopeGlobal | ScopeSession, Name: TiDBEnable1PC, Value: BoolToOnOff(DefTiDBEnable1PC), Type: TypeBool},
-	{Scope: ScopeGlobal | ScopeSession, Name: TiDBGuaranteeExternalConsistency, Value: BoolToOnOff(DefTiDBGuaranteeExternalConsistency), Type: TypeBool},
+	{Scope: ScopeGlobal | ScopeSession, Name: TiDBGuaranteeLinearizability, Value: BoolToOnOff(DefTiDBGuaranteeLinearizability), Type: TypeBool},
 	{Scope: ScopeGlobal | ScopeSession, Name: TiDBAnalyzeVersion, Value: strconv.Itoa(DefTiDBAnalyzeVersion), Type: TypeInt, MinValue: 1, MaxValue: 2},
 	{Scope: ScopeGlobal | ScopeSession, Name: TiDBEnableIndexMergeJoin, Value: BoolToOnOff(DefTiDBEnableIndexMergeJoin), Type: TypeBool},
 	{Scope: ScopeGlobal | ScopeSession, Name: TiDBTrackAggregateMemoryUsage, Value: BoolToOnOff(DefTiDBTrackAggregateMemoryUsage), Type: TypeBool},