github.com/cznic/mathutil 依赖升级为 modernc.org/mathutil （因为原依赖在go 1.16版本…

…之后无法通过编译）
hanchuanchuan · Jul 28, 2022 · 929aa8d · 929aa8d
1 parent 56171ef
commit 929aa8d
Show file tree

Hide file tree

Showing 33 changed files with 34 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ tools/bin/
 tools/check/go.sum
 node_modules
 docs/.vuepress/dist
+/goInception
diff --git a/ddl/ddl_api.go b/ddl/ddl_api.go
@@ -23,7 +23,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/ast"
 	"github.com/hanchuanchuan/goInception/expression"
 	"github.com/hanchuanchuan/goInception/infoschema"
@@ -36,6 +35,7 @@ import (
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/charset"
 	"github.com/pingcap/errors"
+	"modernc.org/mathutil"
 )
 
 func (d *ddl) CreateSchema(ctx sessionctx.Context, schema model.CIStr, charsetInfo *ast.CharsetOpt) (err error) {

diff --git a/docs/.vuepress/components/fonts/iconfont.eot b/docs/.vuepress/components/fonts/iconfont.eot
diff --git a/docs/.vuepress/components/fonts/iconfont.ttf b/docs/.vuepress/components/fonts/iconfont.ttf
diff --git a/docs/.vuepress/public/fonts/iconfont.eot b/docs/.vuepress/public/fonts/iconfont.eot
diff --git a/docs/.vuepress/public/fonts/iconfont.ttf b/docs/.vuepress/public/fonts/iconfont.ttf
diff --git a/executor/aggfuncs/func_avg.go b/executor/aggfuncs/func_avg.go
@@ -14,13 +14,13 @@
 package aggfuncs
 
 import (
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/mysql"
 	"github.com/hanchuanchuan/goInception/sessionctx"
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/hanchuanchuan/goInception/util/set"
 	"github.com/pingcap/errors"
+	"modernc.org/mathutil"
 )
 
 // All the following avg function implementations return the decimal result,

diff --git a/executor/aggfuncs/func_group_concat.go b/executor/aggfuncs/func_group_concat.go
@@ -17,12 +17,12 @@ import (
 	"bytes"
 	"sync/atomic"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/expression"
 	"github.com/hanchuanchuan/goInception/sessionctx"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/hanchuanchuan/goInception/util/set"
 	"github.com/pingcap/errors"
+	"modernc.org/mathutil"
 )
 
 type baseGroupConcat4String struct {

diff --git a/executor/builder.go b/executor/builder.go
@@ -22,7 +22,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/cznic/sortutil"
 	"github.com/hanchuanchuan/goInception/ast"
 	"github.com/hanchuanchuan/goInception/distsql"
@@ -48,6 +47,7 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tipb/go-tipb"
 	"golang.org/x/net/context"
+	"modernc.org/mathutil"
 )
 
 // executorBuilder builds an Executor from a Plan.

diff --git a/executor/executor.go b/executor/executor.go
@@ -20,7 +20,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/ast"
 	"github.com/hanchuanchuan/goInception/config"
 	"github.com/hanchuanchuan/goInception/domain"
@@ -44,6 +43,7 @@ import (
 	"github.com/pingcap/errors"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
+	"modernc.org/mathutil"
 )
 
 var (

diff --git a/executor/explain.go b/executor/explain.go
@@ -14,10 +14,10 @@
 package executor
 
 import (
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/planner/core"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"golang.org/x/net/context"
+	"modernc.org/mathutil"
 )
 
 // ExplainExec represents an explain executor.

diff --git a/executor/show.go b/executor/show.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/ast"
 	"github.com/hanchuanchuan/goInception/infoschema"
 	"github.com/hanchuanchuan/goInception/model"
@@ -39,6 +38,7 @@ import (
 	"github.com/hanchuanchuan/goInception/util/format"
 	"github.com/pingcap/errors"
 	"golang.org/x/net/context"
+	"modernc.org/mathutil"
 )
 
 // ShowExec represents a show executor.

diff --git a/expression/aggregation/avg.go b/expression/aggregation/avg.go
@@ -14,13 +14,13 @@
 package aggregation
 
 import (
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/mysql"
 	"github.com/hanchuanchuan/goInception/sessionctx/stmtctx"
 	"github.com/hanchuanchuan/goInception/terror"
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/pingcap/errors"
+	"modernc.org/mathutil"
 )
 
 type avgFunction struct {

diff --git a/expression/aggregation/concat.go b/expression/aggregation/concat.go
@@ -17,12 +17,12 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/expression"
 	"github.com/hanchuanchuan/goInception/sessionctx/stmtctx"
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/pingcap/errors"
+	"modernc.org/mathutil"
 )
 
 type concatFunction struct {

diff --git a/expression/aggregation/descriptor.go b/expression/aggregation/descriptor.go
@@ -20,7 +20,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/ast"
 	"github.com/hanchuanchuan/goInception/expression"
 	"github.com/hanchuanchuan/goInception/model"
@@ -29,6 +28,7 @@ import (
 	"github.com/hanchuanchuan/goInception/sessionctx/variable"
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/charset"
+	"modernc.org/mathutil"
 )
 
 // AggFuncDesc describes an aggregation function signature, only used in planner.

diff --git a/expression/builtin_arithmetic.go b/expression/builtin_arithmetic.go
@@ -17,14 +17,14 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/mysql"
 	"github.com/hanchuanchuan/goInception/sessionctx"
 	"github.com/hanchuanchuan/goInception/terror"
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tipb/go-tipb"
+	"modernc.org/mathutil"
 )
 
 var (

diff --git a/expression/builtin_control.go b/expression/builtin_control.go
@@ -14,7 +14,6 @@
 package expression
 
 import (
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/mysql"
 	"github.com/hanchuanchuan/goInception/sessionctx"
 	"github.com/hanchuanchuan/goInception/types"
@@ -23,6 +22,7 @@ import (
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tipb/go-tipb"
+	"modernc.org/mathutil"
 )
 
 var (

diff --git a/expression/builtin_math.go b/expression/builtin_math.go
@@ -26,13 +26,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/mysql"
 	"github.com/hanchuanchuan/goInception/sessionctx"
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tipb/go-tipb"
+	"modernc.org/mathutil"
 )
 
 var (

diff --git a/expression/builtin_time.go b/expression/builtin_time.go
@@ -25,7 +25,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/mysql"
 	"github.com/hanchuanchuan/goInception/sessionctx"
 	"github.com/hanchuanchuan/goInception/sessionctx/stmtctx"
@@ -35,6 +34,7 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/tipb/go-tipb"
 	log "github.com/sirupsen/logrus"
+	"modernc.org/mathutil"
 )
 
 const ( // GET_FORMAT first argument.

diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/cznic/golex v0.0.0-20181122101858-9c343928389c // indirect
-	github.com/cznic/mathutil v0.0.0-20181021201202-eba54fb065b7
+	github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
 	github.com/cznic/parser v0.0.0-20181122101858-d773202d5b1f
 	github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65
 	github.com/cznic/strutil v0.0.0-20181122101858-275e90344537
@@ -79,7 +79,6 @@ require (
 	github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 // indirect
 	github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 // indirect
 	github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446 // indirect
 	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
 	github.com/siddontang/go-log v0.0.0-20180807004314-8d05993dda07
 	github.com/sirupsen/logrus v1.4.2
@@ -99,5 +98,6 @@ require (
 	google.golang.org/grpc v1.16.0
 	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0
+	modernc.org/mathutil v1.4.1
 	vitess.io/vitess v2.1.1+incompatible
 )
diff --git a/go.mod_wall b/go.mod_wall
@@ -59,7 +59,6 @@ require (
 	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
 	github.com/cznic/golex v0.0.0-20181122101858-9c343928389c // indirect
-	github.com/cznic/mathutil v0.0.0-20181021201202-eba54fb065b7
 	github.com/cznic/parser v0.0.0-20181122101858-d773202d5b1f
 	github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65
 	github.com/cznic/strutil v0.0.0-20181122101858-275e90344537

diff --git a/go.sum b/go.sum
@@ -25,8 +25,8 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbp
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cznic/golex v0.0.0-20181122101858-9c343928389c h1:G8zTsaqyVfIHpgMFcGgdbhHSFhlNc77rAKkhVbQ9kQg=
 github.com/cznic/golex v0.0.0-20181122101858-9c343928389c/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc=
-github.com/cznic/mathutil v0.0.0-20181021201202-eba54fb065b7 h1:y+DH9ARrWiiNBV+6waYP2IPcsRbxdU1qsnycPfShF4c=
-github.com/cznic/mathutil v0.0.0-20181021201202-eba54fb065b7/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
+github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso=
+github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM=
 github.com/cznic/parser v0.0.0-20181122101858-d773202d5b1f h1:DUtr2TvhM9rmiHKVJWoLqDY2+MdxljW9hlaS/oYoi1c=
 github.com/cznic/parser v0.0.0-20181122101858-d773202d5b1f/go.mod h1:2B43mz36vGZNZEwkWi8ayRSSUXLfjL8OkbzwW4NcPMM=
 github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65 h1:hxuZop6tSoOi0sxFzoGGYdRqNrPubyaIf9KoBG9tPiE=
@@ -189,8 +189,8 @@ github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 h1:Cto4X6SVMWRPB
 github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d h1:GoAlyOgbOEIFdaDqxJVlbOQ1DtGmZWs/Qau0hIlk+WQ=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446 h1:/NRJ5vAYoqz+7sG51ubIDHXeWO8DlTSrToPu6q11ziA=
-github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@@ -269,7 +269,6 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8=
 golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -315,3 +314,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
+modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
diff --git a/meta/autoid/autoid.go b/meta/autoid/autoid.go
@@ -18,12 +18,12 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/kv"
 	"github.com/hanchuanchuan/goInception/meta"
 	"github.com/hanchuanchuan/goInception/terror"
 	"github.com/pingcap/errors"
 	log "github.com/sirupsen/logrus"
+	"modernc.org/mathutil"
 )
 
 // Test needs to change it, so it's a variable.

diff --git a/parser/goyacc/main.go b/parser/goyacc/main.go
@@ -141,11 +141,11 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/cznic/mathutil"
 	parser "github.com/cznic/parser/yacc"
 	"github.com/cznic/sortutil"
 	"github.com/cznic/strutil"
 	"github.com/cznic/y"
+	"modernc.org/mathutil"
 )
 
 var (

diff --git a/planner/core/logical_plan_builder.go b/planner/core/logical_plan_builder.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/ast"
 	"github.com/hanchuanchuan/goInception/domain"
 	"github.com/hanchuanchuan/goInception/expression"
@@ -38,6 +37,7 @@ import (
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/chunk"
 	"github.com/pingcap/errors"
+	"modernc.org/mathutil"
 )
 
 const (

diff --git a/planner/core/planbuilder.go b/planner/core/planbuilder.go
@@ -17,7 +17,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/ast"
 	"github.com/hanchuanchuan/goInception/ddl"
 	"github.com/hanchuanchuan/goInception/expression"
@@ -31,6 +30,7 @@ import (
 	"github.com/hanchuanchuan/goInception/types"
 	"github.com/hanchuanchuan/goInception/util/ranger"
 	"github.com/pingcap/errors"
+	"modernc.org/mathutil"
 )
 
 type visitInfo struct {

diff --git a/statistics/feedback.go b/statistics/feedback.go
@@ -22,7 +22,6 @@ import (
 	"sort"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/kv"
 	"github.com/hanchuanchuan/goInception/mysql"
 	"github.com/hanchuanchuan/goInception/sessionctx/stmtctx"
@@ -34,6 +33,7 @@ import (
 	"github.com/pingcap/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/spaolacci/murmur3"
+	"modernc.org/mathutil"
 )
 
 // `feedback` represents the total scan count in range [lower, upper).

diff --git a/statistics/gc.go b/statistics/gc.go
@@ -17,12 +17,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/infoschema"
 	"github.com/hanchuanchuan/goInception/store/tikv/oracle"
 	"github.com/hanchuanchuan/goInception/util/sqlexec"
 	"github.com/pingcap/errors"
 	"golang.org/x/net/context"
+	"modernc.org/mathutil"
 )
 
 // GCStats will garbage collect the useless stats info. For dropped tables, we will first update their version so that

diff --git a/store/tikv/coprocessor.go b/store/tikv/coprocessor.go
@@ -23,7 +23,6 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/cznic/mathutil"
 	"github.com/hanchuanchuan/goInception/kv"
 	"github.com/hanchuanchuan/goInception/store/tikv/tikvrpc"
 	"github.com/hanchuanchuan/goInception/util/execdetails"
@@ -33,6 +32,7 @@ import (
 	"github.com/pingcap/tipb/go-tipb"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
+	"modernc.org/mathutil"
 )
 
 // CopClient is coprocessor client.