Skip to content

Commit 8cbacf0

Browse files
5kbperslonng
5kbpers
authored and
lonng
committed
wasm: fix compile error for wasm (pingcap#14160)
Signed-off-by: 5kbpers <[email protected]>
1 parent 2e1b8c1 commit 8cbacf0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+269
-47
lines changed

‎cmd/importer/data.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"sync"
2020
"time"
2121

22-
"github.com/cznic/mathutil"
22+
"github.com/pingcap/tidb/util/mathutil"
2323
)
2424

2525
type datum struct {

‎ddl/ddl_api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"sync/atomic"
2727
"time"
2828

29-
"github.com/cznic/mathutil"
3029
"github.com/pingcap/errors"
3130
"github.com/pingcap/parser/ast"
3231
"github.com/pingcap/parser/charset"
@@ -49,6 +48,7 @@ import (
4948
"github.com/pingcap/tidb/util/chunk"
5049
"github.com/pingcap/tidb/util/domainutil"
5150
"github.com/pingcap/tidb/util/logutil"
51+
"github.com/pingcap/tidb/util/mathutil"
5252
"github.com/pingcap/tidb/util/mock"
5353
"github.com/pingcap/tidb/util/set"
5454
"go.uber.org/zap"

‎distsql/distsql_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121
"time"
2222

23-
"github.com/cznic/mathutil"
2423
. "github.com/pingcap/check"
2524
"github.com/pingcap/parser/charset"
2625
"github.com/pingcap/parser/mysql"
@@ -32,6 +31,7 @@ import (
3231
"github.com/pingcap/tidb/util/chunk"
3332
"github.com/pingcap/tidb/util/codec"
3433
"github.com/pingcap/tidb/util/execdetails"
34+
"github.com/pingcap/tidb/util/mathutil"
3535
"github.com/pingcap/tidb/util/memory"
3636
"github.com/pingcap/tidb/util/stringutil"
3737
"github.com/pingcap/tipb/go-tipb"

‎executor/aggfuncs/func_avg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
package aggfuncs
1515

1616
import (
17-
"github.com/cznic/mathutil"
1817
"github.com/pingcap/parser/mysql"
1918
"github.com/pingcap/tidb/sessionctx"
2019
"github.com/pingcap/tidb/types"
2120
"github.com/pingcap/tidb/util/chunk"
2221
"github.com/pingcap/tidb/util/hack"
22+
"github.com/pingcap/tidb/util/mathutil"
2323
"github.com/pingcap/tidb/util/set"
2424
)
2525

‎executor/aggfuncs/func_group_concat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
"bytes"
1818
"sync/atomic"
1919

20-
"github.com/cznic/mathutil"
2120
"github.com/pingcap/tidb/expression"
2221
"github.com/pingcap/tidb/sessionctx"
2322
"github.com/pingcap/tidb/util/chunk"
2423
"github.com/pingcap/tidb/util/codec"
2524
"github.com/pingcap/tidb/util/hack"
25+
"github.com/pingcap/tidb/util/mathutil"
2626
"github.com/pingcap/tidb/util/set"
2727
)
2828

‎executor/aggregate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"fmt"
2020
"sync"
2121

22-
"github.com/cznic/mathutil"
2322
"github.com/pingcap/errors"
2423
"github.com/pingcap/failpoint"
2524
"github.com/pingcap/parser/mysql"
@@ -32,6 +31,7 @@ import (
3231
"github.com/pingcap/tidb/util/chunk"
3332
"github.com/pingcap/tidb/util/codec"
3433
"github.com/pingcap/tidb/util/logutil"
34+
"github.com/pingcap/tidb/util/mathutil"
3535
"github.com/pingcap/tidb/util/set"
3636
"github.com/spaolacci/murmur3"
3737
"go.uber.org/zap"

‎executor/analyze.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"sync/atomic"
2626
"time"
2727

28-
"github.com/cznic/mathutil"
2928
"github.com/pingcap/errors"
3029
"github.com/pingcap/failpoint"
3130
"github.com/pingcap/kvproto/pkg/debugpb"
@@ -48,6 +47,7 @@ import (
4847
"github.com/pingcap/tidb/util/chunk"
4948
"github.com/pingcap/tidb/util/codec"
5049
"github.com/pingcap/tidb/util/logutil"
50+
"github.com/pingcap/tidb/util/mathutil"
5151
"github.com/pingcap/tidb/util/ranger"
5252
"github.com/pingcap/tipb/go-tipb"
5353
"go.uber.org/zap"

‎executor/builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"sync"
2424
"time"
2525

26-
"github.com/cznic/mathutil"
2726
"github.com/cznic/sortutil"
2827
"github.com/pingcap/errors"
2928
"github.com/pingcap/kvproto/pkg/diagnosticspb"
@@ -47,6 +46,7 @@ import (
4746
"github.com/pingcap/tidb/util/admin"
4847
"github.com/pingcap/tidb/util/chunk"
4948
"github.com/pingcap/tidb/util/execdetails"
49+
"github.com/pingcap/tidb/util/mathutil"
5050
"github.com/pingcap/tidb/util/ranger"
5151
"github.com/pingcap/tidb/util/stringutil"
5252
"github.com/pingcap/tidb/util/timeutil"

‎executor/executor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"sync/atomic"
2323
"time"
2424

25-
"github.com/cznic/mathutil"
2625
"github.com/opentracing/opentracing-go"
2726
"github.com/pingcap/errors"
2827
"github.com/pingcap/parser/ast"
@@ -50,6 +49,7 @@ import (
5049
"github.com/pingcap/tidb/util/disk"
5150
"github.com/pingcap/tidb/util/execdetails"
5251
"github.com/pingcap/tidb/util/logutil"
52+
"github.com/pingcap/tidb/util/mathutil"
5353
"github.com/pingcap/tidb/util/memory"
5454
"github.com/pingcap/tidb/util/stringutil"
5555
"go.uber.org/zap"

‎executor/executor_required_rows_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"math/rand"
2121
"time"
2222

23-
"github.com/cznic/mathutil"
2423
. "github.com/pingcap/check"
2524
"github.com/pingcap/parser/ast"
2625
"github.com/pingcap/parser/mysql"
@@ -33,6 +32,7 @@ import (
3332
"github.com/pingcap/tidb/types/json"
3433
"github.com/pingcap/tidb/util/chunk"
3534
"github.com/pingcap/tidb/util/disk"
35+
"github.com/pingcap/tidb/util/mathutil"
3636
"github.com/pingcap/tidb/util/memory"
3737
"github.com/pingcap/tidb/util/mock"
3838
)

‎executor/explain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ package executor
1616
import (
1717
"context"
1818

19-
"github.com/cznic/mathutil"
2019
"github.com/pingcap/tidb/planner/core"
2120
"github.com/pingcap/tidb/util/chunk"
21+
"github.com/pingcap/tidb/util/mathutil"
2222
)
2323

2424
// ExplainExec represents an explain executor.

‎executor/show.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"strings"
2424
"time"
2525

26-
"github.com/cznic/mathutil"
2726
"github.com/pingcap/errors"
2827
"github.com/pingcap/parser"
2928
"github.com/pingcap/parser/ast"
@@ -56,6 +55,7 @@ import (
5655
"github.com/pingcap/tidb/util/chunk"
5756
"github.com/pingcap/tidb/util/format"
5857
"github.com/pingcap/tidb/util/hack"
58+
"github.com/pingcap/tidb/util/mathutil"
5959
"github.com/pingcap/tidb/util/sqlexec"
6060
)
6161

‎executor/split.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"math"
2222
"time"
2323

24-
"github.com/cznic/mathutil"
2524
"github.com/pingcap/errors"
2625
"github.com/pingcap/kvproto/pkg/metapb"
2726
"github.com/pingcap/parser/model"
@@ -36,6 +35,7 @@ import (
3635
"github.com/pingcap/tidb/util/chunk"
3736
"github.com/pingcap/tidb/util/codec"
3837
"github.com/pingcap/tidb/util/logutil"
38+
"github.com/pingcap/tidb/util/mathutil"
3939
"go.uber.org/zap"
4040
)
4141

‎executor/table_readers_required_rows_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"fmt"
1919
"math/rand"
2020

21-
"github.com/cznic/mathutil"
2221
. "github.com/pingcap/check"
2322
"github.com/pingcap/parser/model"
2423
"github.com/pingcap/parser/mysql"
@@ -31,6 +30,7 @@ import (
3130
"github.com/pingcap/tidb/table/tables"
3231
"github.com/pingcap/tidb/types"
3332
"github.com/pingcap/tidb/util/chunk"
33+
"github.com/pingcap/tidb/util/mathutil"
3434
"github.com/pingcap/tipb/go-tipb"
3535
)
3636

‎executor/window.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ package executor
1616
import (
1717
"context"
1818

19-
"github.com/cznic/mathutil"
2019
"github.com/pingcap/errors"
2120
"github.com/pingcap/parser/ast"
2221
"github.com/pingcap/tidb/executor/aggfuncs"
2322
"github.com/pingcap/tidb/expression"
2423
"github.com/pingcap/tidb/planner/core"
2524
"github.com/pingcap/tidb/sessionctx"
2625
"github.com/pingcap/tidb/util/chunk"
26+
"github.com/pingcap/tidb/util/mathutil"
2727
)
2828

2929
// WindowExec is the executor for window functions.

‎expression/aggregation/avg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
package aggregation
1515

1616
import (
17-
"github.com/cznic/mathutil"
1817
"github.com/pingcap/parser/mysql"
1918
"github.com/pingcap/parser/terror"
2019
"github.com/pingcap/tidb/sessionctx/stmtctx"
2120
"github.com/pingcap/tidb/types"
2221
"github.com/pingcap/tidb/util/chunk"
22+
"github.com/pingcap/tidb/util/mathutil"
2323
)
2424

2525
type avgFunction struct {

‎expression/aggregation/base_func.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import (
1818
"math"
1919
"strings"
2020

21-
"github.com/cznic/mathutil"
2221
"github.com/pingcap/errors"
2322
"github.com/pingcap/parser/ast"
2423
"github.com/pingcap/parser/charset"
2524
"github.com/pingcap/parser/mysql"
2625
"github.com/pingcap/tidb/expression"
2726
"github.com/pingcap/tidb/sessionctx"
2827
"github.com/pingcap/tidb/types"
28+
"github.com/pingcap/tidb/util/mathutil"
2929
)
3030

3131
// baseFuncDesc describes an function signature, only used in planner.

‎expression/aggregation/concat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
"bytes"
1818
"fmt"
1919

20-
"github.com/cznic/mathutil"
2120
"github.com/pingcap/errors"
2221
"github.com/pingcap/tidb/expression"
2322
"github.com/pingcap/tidb/sessionctx/stmtctx"
2423
"github.com/pingcap/tidb/types"
2524
"github.com/pingcap/tidb/util/chunk"
25+
"github.com/pingcap/tidb/util/mathutil"
2626
)
2727

2828
type concatFunction struct {

‎expression/builtin_arithmetic.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
"fmt"
1818
"math"
1919

20-
"github.com/cznic/mathutil"
2120
"github.com/pingcap/parser/mysql"
2221
"github.com/pingcap/parser/terror"
2322
"github.com/pingcap/tidb/sessionctx"
2423
"github.com/pingcap/tidb/types"
2524
"github.com/pingcap/tidb/util/chunk"
25+
"github.com/pingcap/tidb/util/mathutil"
2626
"github.com/pingcap/tipb/go-tipb"
2727
)
2828

‎expression/builtin_control.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
package expression
1515

1616
import (
17-
"github.com/cznic/mathutil"
1817
"github.com/pingcap/parser/charset"
1918
"github.com/pingcap/parser/mysql"
2019
"github.com/pingcap/tidb/sessionctx"
2120
"github.com/pingcap/tidb/types"
2221
"github.com/pingcap/tidb/types/json"
2322
"github.com/pingcap/tidb/util/chunk"
23+
"github.com/pingcap/tidb/util/mathutil"
2424
"github.com/pingcap/tipb/go-tipb"
2525
)
2626

‎expression/builtin_math.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import (
2727
"sync"
2828
"time"
2929

30-
"github.com/cznic/mathutil"
3130
"github.com/pingcap/parser/mysql"
3231
"github.com/pingcap/tidb/sessionctx"
3332
"github.com/pingcap/tidb/types"
3433
"github.com/pingcap/tidb/util/chunk"
34+
"github.com/pingcap/tidb/util/mathutil"
3535
"github.com/pingcap/tipb/go-tipb"
3636
)
3737

‎expression/builtin_math_vec.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"strconv"
2222
"time"
2323

24-
"github.com/cznic/mathutil"
2524
"github.com/pingcap/parser/mysql"
2625
"github.com/pingcap/tidb/types"
2726
"github.com/pingcap/tidb/util/chunk"
27+
"github.com/pingcap/tidb/util/mathutil"
2828
)
2929

3030
func (b *builtinLog1ArgSig) vecEvalReal(input *chunk.Chunk, result *chunk.Column) error {

‎expression/builtin_time.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/cznic/mathutil"
2928
"github.com/pingcap/errors"
3029
"github.com/pingcap/parser/mysql"
3130
"github.com/pingcap/parser/terror"
@@ -36,6 +35,7 @@ import (
3635
"github.com/pingcap/tidb/types"
3736
"github.com/pingcap/tidb/util/chunk"
3837
"github.com/pingcap/tidb/util/logutil"
38+
"github.com/pingcap/tidb/util/mathutil"
3939
"github.com/pingcap/tipb/go-tipb"
4040
"go.uber.org/zap"
4141
)

‎meta/autoid/autoid.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import (
1919
"sync"
2020
"time"
2121

22-
"github.com/cznic/mathutil"
2322
"github.com/pingcap/errors"
2423
"github.com/pingcap/failpoint"
2524
"github.com/pingcap/parser/model"
2625
"github.com/pingcap/tidb/kv"
2726
"github.com/pingcap/tidb/meta"
2827
"github.com/pingcap/tidb/metrics"
2928
"github.com/pingcap/tidb/util/logutil"
29+
"github.com/pingcap/tidb/util/mathutil"
3030
"go.uber.org/zap"
3131
)
3232

‎planner/core/logical_plan_builder.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
"strings"
2424
"unicode"
2525

26-
"github.com/cznic/mathutil"
2726
"github.com/pingcap/errors"
2827
"github.com/pingcap/parser"
2928
"github.com/pingcap/parser/ast"
@@ -47,6 +46,7 @@ import (
4746
"github.com/pingcap/tidb/types"
4847
driver "github.com/pingcap/tidb/types/parser_driver"
4948
"github.com/pingcap/tidb/util/chunk"
49+
"github.com/pingcap/tidb/util/mathutil"
5050
"github.com/pingcap/tidb/util/plancodec"
5151
)
5252

‎planner/core/memtable_predicate_extractor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ import (
1919
"strings"
2020
"time"
2121

22-
"github.com/cznic/mathutil"
2322
"github.com/pingcap/parser/ast"
2423
"github.com/pingcap/parser/mysql"
2524
"github.com/pingcap/tidb/expression"
2625
"github.com/pingcap/tidb/sessionctx"
2726
"github.com/pingcap/tidb/types"
27+
"github.com/pingcap/tidb/util/mathutil"
2828
"github.com/pingcap/tidb/util/set"
2929
"github.com/pingcap/tidb/util/stringutil"
3030
)

‎planner/core/rule_topn_push_down.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ package core
1616
import (
1717
"context"
1818

19-
"github.com/cznic/mathutil"
2019
"github.com/pingcap/tidb/expression"
20+
"github.com/pingcap/tidb/util/mathutil"
2121
)
2222

2323
// pushDownTopNOptimizer pushes down the topN or limit. In the future we will remove the limit from `requiredProperty` in CBO phase.

0 commit comments

Comments
 (0)