Skip to content

Commit

Permalink
expression: fix typo (#27088)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fangpings
fangpings authored Sep 18, 2021
1 parent 60c0dc9 commit 3c9c01e
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
66 changes: 33 additions & 33 deletions expression/builtin_time.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2801,7 +2801,7 @@ type baseDateArithmetical struct {
intervalRegexp *regexp.Regexp
}

func newDateArighmeticalUtil() baseDateArithmetical {
func newDateArithmeticalUtil() baseDateArithmetical {
return baseDateArithmetical{
intervalRegexp: regexp.MustCompile(`-?[\d]+`),
}
Expand Down Expand Up @@ -3391,97 +3391,97 @@ func (c *addDateFunctionClass) getFunction(ctx sessionctx.Context, args []Expres
case dateEvalTp == types.ETString && intervalEvalTp == types.ETString:
sig = &builtinAddDateStringStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateStringString)
case dateEvalTp == types.ETString && intervalEvalTp == types.ETInt:
sig = &builtinAddDateStringIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateStringInt)
case dateEvalTp == types.ETString && intervalEvalTp == types.ETReal:
sig = &builtinAddDateStringRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateStringReal)
case dateEvalTp == types.ETString && intervalEvalTp == types.ETDecimal:
sig = &builtinAddDateStringDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateStringDecimal)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETString:
sig = &builtinAddDateIntStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateIntString)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETInt:
sig = &builtinAddDateIntIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateIntInt)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETReal:
sig = &builtinAddDateIntRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateIntReal)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETDecimal:
sig = &builtinAddDateIntDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateIntDecimal)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETString:
sig = &builtinAddDateDatetimeStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDatetimeString)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETInt:
sig = &builtinAddDateDatetimeIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDatetimeInt)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETReal:
sig = &builtinAddDateDatetimeRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDatetimeReal)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETDecimal:
sig = &builtinAddDateDatetimeDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDatetimeDecimal)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETString:
sig = &builtinAddDateDurationStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDurationString)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETInt:
sig = &builtinAddDateDurationIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDurationInt)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETReal:
sig = &builtinAddDateDurationRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDurationReal)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETDecimal:
sig = &builtinAddDateDurationDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_AddDateDurationDecimal)
}
Expand Down Expand Up @@ -4075,97 +4075,97 @@ func (c *subDateFunctionClass) getFunction(ctx sessionctx.Context, args []Expres
case dateEvalTp == types.ETString && intervalEvalTp == types.ETString:
sig = &builtinSubDateStringStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateStringString)
case dateEvalTp == types.ETString && intervalEvalTp == types.ETInt:
sig = &builtinSubDateStringIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateStringInt)
case dateEvalTp == types.ETString && intervalEvalTp == types.ETReal:
sig = &builtinSubDateStringRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateStringReal)
case dateEvalTp == types.ETString && intervalEvalTp == types.ETDecimal:
sig = &builtinSubDateStringDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateStringDecimal)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETString:
sig = &builtinSubDateIntStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateIntString)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETInt:
sig = &builtinSubDateIntIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateIntInt)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETReal:
sig = &builtinSubDateIntRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateIntReal)
case dateEvalTp == types.ETInt && intervalEvalTp == types.ETDecimal:
sig = &builtinSubDateIntDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateIntDecimal)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETString:
sig = &builtinSubDateDatetimeStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDatetimeString)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETInt:
sig = &builtinSubDateDatetimeIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDatetimeInt)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETReal:
sig = &builtinSubDateDatetimeRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDatetimeReal)
case dateEvalTp == types.ETDatetime && intervalEvalTp == types.ETDecimal:
sig = &builtinSubDateDatetimeDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDatetimeDecimal)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETString:
sig = &builtinSubDateDurationStringSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDurationString)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETInt:
sig = &builtinSubDateDurationIntSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDurationInt)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETReal:
sig = &builtinSubDateDurationRealSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDurationReal)
case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETDecimal:
sig = &builtinSubDateDurationDecimalSig{
baseBuiltinFunc: bf,
baseDateArithmetical: newDateArighmeticalUtil(),
baseDateArithmetical: newDateArithmeticalUtil(),
}
sig.setPbCode(tipb.ScalarFuncSig_SubDateDurationDecimal)
}
Expand Down
2 changes: 1 addition & 1 deletion expression/builtin_time_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ func (s *testEvaluatorSuite) TestAddTimeSig(c *C) {
}

// This is a test for issue 7334
du := newDateArighmeticalUtil()
du := newDateArithmeticalUtil()
resetStmtContext(s.ctx)
now, _, err := evalNowWithFsp(s.ctx, 0)
c.Assert(err, IsNil)
Expand Down

0 comments on commit 3c9c01e

Please sign in to comment.