diff --git a/expression/builtin_string.go b/expression/builtin_string.go index 529decefab..ec6e92a2d1 100644 --- a/expression/builtin_string.go +++ b/expression/builtin_string.go @@ -2647,10 +2647,13 @@ func (b *builtinOrdSig) evalInt(row chunk.Row) (int64, bool, error) { if isNull || err != nil { return 0, isNull, err } - if len(str) == 0 { - return 0, false, nil - } + return ord(str), false, nil +} +func ord(str string) int64 { + if len(str) == 0 { + return 0 + } _, size := utf8.DecodeRuneInString(str) leftMost := str[:size] var result int64 @@ -2659,8 +2662,7 @@ func (b *builtinOrdSig) evalInt(row chunk.Row) (int64, bool, error) { result += int64(leftMost[i]) * factor factor *= 256 } - - return result, false, nil + return result } type quoteFunctionClass struct { diff --git a/expression/builtin_string_vec.go b/expression/builtin_string_vec.go index 2922ad24ba..1eb7a0fecd 100644 --- a/expression/builtin_string_vec.go +++ b/expression/builtin_string_vec.go @@ -1287,11 +1287,30 @@ func (b *builtinTrim3ArgsSig) vecEvalString(input *chunk.Chunk, result *chunk.Co } func (b *builtinOrdSig) vectorized() bool { - return false + return true } func (b *builtinOrdSig) vecEvalInt(input *chunk.Chunk, result *chunk.Column) error { - return errors.Errorf("not implemented") + n := input.NumRows() + buf, err := b.bufAllocator.get(types.ETString, n) + if err != nil { + return err + } + defer b.bufAllocator.put(buf) + if err := b.args[0].VecEvalString(b.ctx, input, buf); err != nil { + return err + } + result.ResizeInt64(n, false) + result.MergeNulls(buf) + i64s := result.Int64s() + for i := 0; i < n; i++ { + if result.IsNull(i) { + continue + } + str := buf.GetString(i) + i64s[i] = ord(str) + } + return nil } func (b *builtinInstrBinarySig) vectorized() bool { diff --git a/expression/builtin_string_vec_test.go b/expression/builtin_string_vec_test.go index 054c7defe4..811e5084d8 100644 --- a/expression/builtin_string_vec_test.go +++ b/expression/builtin_string_vec_test.go @@ -151,7 +151,9 @@ var vecBuiltinStringCases = map[string][]vecExprBenchCase{ {retEvalType: types.ETString, childrenTypes: []types.EvalType{types.ETInt}}, {retEvalType: types.ETString, childrenTypes: []types.EvalType{types.ETString}, geners: []dataGenerator{&numStrGener{rangeInt64Gener{-10, 10}}}}, }, - ast.Ord: {}, + ast.Ord: { + {retEvalType: types.ETInt, childrenTypes: []types.EvalType{types.ETString}}, + }, ast.Quote: {}, ast.Bin: { {retEvalType: types.ETString, childrenTypes: []types.EvalType{types.ETInt}},