Skip to content

Commit c38023e

Browse files
nvbnvb
committed
vendor: upgrade cockroachdb/apd to v3
This commit picks up the following changes to `cockroachdb/apd`: - cockroachdb/apd#103 - cockroachdb/apd#104 - cockroachdb/apd#107 - cockroachdb/apd#108 - cockroachdb/apd#109 - cockroachdb/apd#110 - cockroachdb/apd#111 Release note (performance improvement): The memory representation of DECIMAL datums has been optimized to save space, avoid heap allocations, and eliminate indirection. This increases the speed of DECIMAL arithmetic and aggregation by up to 20% on large data sets.
1 parent fdd672f commit c38023e

File tree

160 files changed

+334
-374
lines changed

Some content is hidden

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

160 files changed

+334
-374
lines changed

‎DEPS.bzl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,13 +1111,13 @@ def go_deps():
11111111
],
11121112
)
11131113
go_repository(
1114-
name = "com_github_cockroachdb_apd_v2",
1114+
name = "com_github_cockroachdb_apd_v3",
11151115
build_file_proto_mode = "disable_global",
1116-
importpath = "github.com/cockroachdb/apd/v2",
1117-
sha256 = "25204b49acbbf2f900f4f82b7f07481847f4f78452aff64dcbd05c543b21e35d",
1118-
strip_prefix = "github.com/cockroachdb/apd/v2@v2.0.2",
1116+
importpath = "github.com/cockroachdb/apd/v3",
1117+
sha256 = "c461aad0b12e37d042402e0ad2478092d846b1981b5708bb7a63fcc07a154816",
1118+
strip_prefix = "github.com/cockroachdb/apd/v3@v3.0.0",
11191119
urls = [
1120-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v2/com_github_cockroachdb_apd_v2-v2.0.2.zip",
1120+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v3/com_github_cockroachdb_apd_v3-v3.0.0.zip",
11211121
],
11221122
)
11231123
go_repository(

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/bufbuild/buf v0.56.0
3333
github.com/cenkalti/backoff v2.2.1+incompatible
3434
github.com/client9/misspell v0.3.4
35-
github.com/cockroachdb/apd/v2 v2.0.2
35+
github.com/cockroachdb/apd/v3 v3.0.0
3636
github.com/cockroachdb/circuitbreaker v2.2.2-0.20190114160014-a614b14ccf63+incompatible
3737
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
3838
github.com/cockroachdb/cockroach-go/v2 v2.1.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/
386386
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
387387
github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
388388
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
389-
github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
390-
github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
389+
github.com/cockroachdb/apd/v3 v3.0.0 h1:7uckTv9DQFr2/kh9tTEc2PTrPr85n9T+MWX4p5pVS/Y=
390+
github.com/cockroachdb/apd/v3 v3.0.0/go.mod h1:6qgPBMXjATAdD/VefbRP9NoSLKjbB4LCoA7gN4LpHs4=
391391
github.com/cockroachdb/circuitbreaker v2.2.2-0.20190114160014-a614b14ccf63+incompatible h1:u3uQ4oAKM5g2eODBAsDdDSrTs7zRWXtvu+nvSDA9098=
392392
github.com/cockroachdb/circuitbreaker v2.2.2-0.20190114160014-a614b14ccf63+incompatible/go.mod h1:v3T8+rm/HmCL0D1BwDcGaHHAQDuFPW7EsnYs2nBRqUo=
393393
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 h1:dzj1/xcivGjNPwwifh/dWTczkwcuqsXXFHY1X/TZMtw=

‎pkg/ccl/changefeedccl/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ go_library(
105105
"//pkg/util/timeutil",
106106
"//pkg/util/tracing",
107107
"//pkg/util/uuid",
108-
"@com_github_cockroachdb_apd_v2//:apd",
108+
"@com_github_cockroachdb_apd_v3//:apd",
109109
"@com_github_cockroachdb_errors//:errors",
110110
"@com_github_cockroachdb_logtags//:logtags",
111111
"@com_github_google_btree//:btree",
@@ -223,7 +223,7 @@ go_test(
223223
"//pkg/workload/bank",
224224
"//pkg/workload/ledger",
225225
"//pkg/workload/workloadsql",
226-
"@com_github_cockroachdb_apd_v2//:apd",
226+
"@com_github_cockroachdb_apd_v3//:apd",
227227
"@com_github_cockroachdb_cockroach_go_v2//crdb",
228228
"@com_github_cockroachdb_errors//:errors",
229229
"@com_github_dustin_go_humanize//:go-humanize",

‎pkg/ccl/changefeedccl/avro.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"math/big"
1414
"time"
1515

16-
"github.com/cockroachdb/apd/v2"
16+
"github.com/cockroachdb/apd/v3"
1717
"github.com/cockroachdb/cockroach/pkg/geo"
1818
"github.com/cockroachdb/cockroach/pkg/geo/geopb"
1919
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
@@ -1015,12 +1015,13 @@ func decimalToRat(dec apd.Decimal, scale int32) (big.Rat, error) {
10151015
if dec.Exponent >= 0 {
10161016
exp := big.NewInt(10)
10171017
exp = exp.Exp(exp, big.NewInt(int64(dec.Exponent)), nil)
1018-
var coeff big.Int
1019-
r.SetFrac(coeff.Mul(&dec.Coeff, exp), big.NewInt(1))
1018+
coeff := dec.Coeff.MathBigInt()
1019+
r.SetFrac(coeff.Mul(coeff, exp), big.NewInt(1))
10201020
} else {
10211021
exp := big.NewInt(10)
10221022
exp = exp.Exp(exp, big.NewInt(int64(-dec.Exponent)), nil)
1023-
r.SetFrac(&dec.Coeff, exp)
1023+
coeff := dec.Coeff.MathBigInt()
1024+
r.SetFrac(coeff, exp)
10241025
}
10251026
if dec.Negative {
10261027
r.Mul(&r, big.NewRat(-1, 1))
@@ -1036,7 +1037,8 @@ func ratToDecimal(rat big.Rat, scale int32) apd.Decimal {
10361037
exp := big.NewInt(10)
10371038
exp = exp.Exp(exp, big.NewInt(int64(scale)), nil)
10381039
sf := denom.Div(exp, denom)
1039-
coeff := num.Mul(num, sf)
1040-
dec := apd.NewWithBigInt(coeff, -scale)
1040+
var coeff apd.BigInt
1041+
coeff.SetMathBigInt(num.Mul(num, sf))
1042+
dec := apd.NewWithBigInt(&coeff, -scale)
10411043
return *dec
10421044
}

‎pkg/ccl/changefeedccl/avro_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"testing"
1919
"time"
2020

21-
"github.com/cockroachdb/apd/v2"
21+
"github.com/cockroachdb/apd/v3"
2222
"github.com/cockroachdb/cockroach/pkg/ccl/importccl"
2323
"github.com/cockroachdb/cockroach/pkg/keys"
2424
"github.com/cockroachdb/cockroach/pkg/settings/cluster"

‎pkg/ccl/changefeedccl/helpers_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"testing"
2323
"time"
2424

25-
"github.com/cockroachdb/apd/v2"
25+
"github.com/cockroachdb/apd/v3"
2626
"github.com/cockroachdb/cockroach/pkg/base"
2727
"github.com/cockroachdb/cockroach/pkg/blobs"
2828
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdctest"

‎pkg/ccl/cliccl/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ go_library(
5252
"//pkg/util/timeutil",
5353
"//pkg/util/timeutil/pgdate",
5454
"//pkg/util/uuid",
55-
"@com_github_cockroachdb_apd_v2//:apd",
55+
"@com_github_cockroachdb_apd_v3//:apd",
5656
"@com_github_cockroachdb_errors//:errors",
5757
"@com_github_cockroachdb_errors//oserror",
5858
"@com_github_spf13_cobra//:cobra",

‎pkg/ccl/cliccl/debug_backup.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"strings"
2323
"time"
2424

25-
apd "github.com/cockroachdb/apd/v2"
25+
"github.com/cockroachdb/apd/v3"
2626
"github.com/cockroachdb/cockroach/pkg/base"
2727
"github.com/cockroachdb/cockroach/pkg/blobs"
2828
"github.com/cockroachdb/cockroach/pkg/ccl/backupccl"

‎pkg/ccl/importccl/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ go_library(
9191
"//pkg/util/timeutil/pgdate",
9292
"//pkg/util/tracing",
9393
"//pkg/workload",
94-
"@com_github_cockroachdb_apd_v2//:apd",
94+
"@com_github_cockroachdb_apd_v3//:apd",
9595
"@com_github_cockroachdb_errors//:errors",
9696
"@com_github_cockroachdb_logtags//:logtags",
9797
"@com_github_fraugster_parquet_go//:parquet-go",

0 commit comments

Comments
 (0)