Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1111,13 +1111,13 @@ def go_deps():
],
)
go_repository(
name = "com_github_cockroachdb_apd_v2",
name = "com_github_cockroachdb_apd_v3",
build_file_proto_mode = "disable_global",
importpath = "github.com/cockroachdb/apd/v2",
sha256 = "25204b49acbbf2f900f4f82b7f07481847f4f78452aff64dcbd05c543b21e35d",
strip_prefix = "github.com/cockroachdb/apd/v2@v2.0.2",
importpath = "github.com/cockroachdb/apd/v3",
sha256 = "c461aad0b12e37d042402e0ad2478092d846b1981b5708bb7a63fcc07a154816",
strip_prefix = "github.com/cockroachdb/apd/v3@v3.0.0",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v2/com_github_cockroachdb_apd_v2-v2.0.2.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/apd/v3/com_github_cockroachdb_apd_v3-v3.0.0.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/bufbuild/buf v0.56.0
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/client9/misspell v0.3.4
github.com/cockroachdb/apd/v2 v2.0.2
github.com/cockroachdb/apd/v3 v3.0.0
github.com/cockroachdb/circuitbreaker v2.2.2-0.20190114160014-a614b14ccf63+incompatible
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292
github.com/cockroachdb/cockroach-go/v2 v2.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,8 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b8034E=
github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw=
github.com/cockroachdb/apd/v3 v3.0.0 h1:7uckTv9DQFr2/kh9tTEc2PTrPr85n9T+MWX4p5pVS/Y=
github.com/cockroachdb/apd/v3 v3.0.0/go.mod h1:6qgPBMXjATAdD/VefbRP9NoSLKjbB4LCoA7gN4LpHs4=
github.com/cockroachdb/circuitbreaker v2.2.2-0.20190114160014-a614b14ccf63+incompatible h1:u3uQ4oAKM5g2eODBAsDdDSrTs7zRWXtvu+nvSDA9098=
github.com/cockroachdb/circuitbreaker v2.2.2-0.20190114160014-a614b14ccf63+incompatible/go.mod h1:v3T8+rm/HmCL0D1BwDcGaHHAQDuFPW7EsnYs2nBRqUo=
github.com/cockroachdb/cmux v0.0.0-20170110192607-30d10be49292 h1:dzj1/xcivGjNPwwifh/dWTczkwcuqsXXFHY1X/TZMtw=
Expand Down
4 changes: 2 additions & 2 deletions pkg/ccl/changefeedccl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ go_library(
"//pkg/util/timeutil",
"//pkg/util/tracing",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_logtags//:logtags",
"@com_github_google_btree//:btree",
Expand Down Expand Up @@ -223,7 +223,7 @@ go_test(
"//pkg/workload/bank",
"//pkg/workload/ledger",
"//pkg/workload/workloadsql",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_cockroach_go_v2//crdb",
"@com_github_cockroachdb_errors//:errors",
"@com_github_dustin_go_humanize//:go-humanize",
Expand Down
14 changes: 8 additions & 6 deletions pkg/ccl/changefeedccl/avro.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"math/big"
"time"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/geo"
"github.com/cockroachdb/cockroach/pkg/geo/geopb"
"github.com/cockroachdb/cockroach/pkg/sql/catalog"
Expand Down Expand Up @@ -1015,12 +1015,13 @@ func decimalToRat(dec apd.Decimal, scale int32) (big.Rat, error) {
if dec.Exponent >= 0 {
exp := big.NewInt(10)
exp = exp.Exp(exp, big.NewInt(int64(dec.Exponent)), nil)
var coeff big.Int
r.SetFrac(coeff.Mul(&dec.Coeff, exp), big.NewInt(1))
coeff := dec.Coeff.MathBigInt()
r.SetFrac(coeff.Mul(coeff, exp), big.NewInt(1))
} else {
exp := big.NewInt(10)
exp = exp.Exp(exp, big.NewInt(int64(-dec.Exponent)), nil)
r.SetFrac(&dec.Coeff, exp)
coeff := dec.Coeff.MathBigInt()
r.SetFrac(coeff, exp)
}
if dec.Negative {
r.Mul(&r, big.NewRat(-1, 1))
Expand All @@ -1036,7 +1037,8 @@ func ratToDecimal(rat big.Rat, scale int32) apd.Decimal {
exp := big.NewInt(10)
exp = exp.Exp(exp, big.NewInt(int64(scale)), nil)
sf := denom.Div(exp, denom)
coeff := num.Mul(num, sf)
dec := apd.NewWithBigInt(coeff, -scale)
var coeff apd.BigInt
coeff.SetMathBigInt(num.Mul(num, sf))
dec := apd.NewWithBigInt(&coeff, -scale)
return *dec
}
2 changes: 1 addition & 1 deletion pkg/ccl/changefeedccl/avro_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"
"time"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/ccl/importccl"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/changefeedccl/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/blobs"
"github.com/cockroachdb/cockroach/pkg/ccl/changefeedccl/cdctest"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/cliccl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ go_library(
"//pkg/util/timeutil",
"//pkg/util/timeutil/pgdate",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_errors//oserror",
"@com_github_spf13_cobra//:cobra",
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/cliccl/debug_backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strings"
"time"

apd "github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/blobs"
"github.com/cockroachdb/cockroach/pkg/ccl/backupccl"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/importccl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ go_library(
"//pkg/util/timeutil/pgdate",
"//pkg/util/tracing",
"//pkg/workload",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_logtags//:logtags",
"@com_github_fraugster_parquet_go//:parquet-go",
Expand Down
2 changes: 1 addition & 1 deletion pkg/ccl/importccl/read_import_workload.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"sync/atomic"
"unsafe"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/cloud"
"github.com/cockroachdb/cockroach/pkg/col/coldata"
"github.com/cockroachdb/cockroach/pkg/roachpb"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ go_library(
"//pkg/workload/tpch",
"//pkg/workload/workloadsql",
"//pkg/workload/ycsb",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_errors//oserror",
"@com_github_cockroachdb_logtags//:logtags",
Expand Down
2 changes: 1 addition & 1 deletion pkg/cli/doctor.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strings"
"time"

apd "github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/cli/clierror"
"github.com/cockroachdb/cockroach/pkg/cli/clierrorplus"
"github.com/cockroachdb/cockroach/pkg/cli/clisqlclient"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cmp-sql/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ go_library(
visibility = ["//visibility:private"],
deps = [
"//pkg/util/randutil",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_jackc_pgtype//:pgtype",
"@com_github_jackc_pgx_v4//:pgx",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cmp-sql/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"regexp"
"strings"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/util/randutil"
"github.com/jackc/pgtype"
"github.com/jackc/pgx/v4"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/cmpconn/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ go_library(
"//pkg/sql/randgen",
"//pkg/sql/sem/tree",
"//pkg/util/duration",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_google_go_cmp//cmp",
"@com_github_google_go_cmp//cmp/cmpopts",
Expand All @@ -28,7 +28,7 @@ go_test(
srcs = ["compare_test.go"],
embed = [":cmpconn"],
deps = [
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_jackc_pgtype//:pgtype",
],
)
6 changes: 4 additions & 2 deletions pkg/cmd/cmpconn/compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"math/big"
"strings"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/util/duration"
"github.com/cockroachdb/errors"
Expand Down Expand Up @@ -118,7 +118,9 @@ var (
if t.NaN {
v = &apd.Decimal{Form: apd.NaN}
} else {
v = apd.NewWithBigInt(t.Int, t.Exp)
var coeff apd.BigInt
coeff.SetMathBigInt(t.Int)
v = apd.NewWithBigInt(&coeff, t.Exp)
}
}
case int64:
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/cmpconn/compare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"math/big"
"testing"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/jackc/pgtype"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/col/coldata/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ go_library(
"//pkg/util/duration",
"//pkg/util/json",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_stretchr_testify//require",
],
Expand Down
4 changes: 1 addition & 3 deletions pkg/col/coldata/native_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package coldata
import (
"time"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/util/duration"
)

Expand Down Expand Up @@ -106,8 +106,6 @@ func (c Float64s) Set(idx int, val float64) { c[idx] = val }
// Note that this method is usually inlined, but it isn't in case of the merge
// joiner generated code (probably because of the size of the functions), so we
// don't assert the inlining with the GCAssert linter.
// TODO(yuzefovich): consider whether Get and Set on Decimals should operate on
// pointers to apd.Decimal.
func (c Decimals) Set(idx int, val apd.Decimal) { c[idx].Set(&val) }

// Set sets the element at index idx of the vector to val.
Expand Down
2 changes: 1 addition & 1 deletion pkg/col/coldata/vec.eg.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/col/coldata/vec_tmpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ package coldata
import (
"fmt"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/col/typeconv"
"github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen"
"github.com/cockroachdb/cockroach/pkg/sql/colexecerror"
Expand Down
2 changes: 1 addition & 1 deletion pkg/col/colserde/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ go_test(
"@com_github_apache_arrow_go_arrow//:arrow",
"@com_github_apache_arrow_go_arrow//array",
"@com_github_apache_arrow_go_arrow//memory",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_stretchr_testify//require",
],
)
2 changes: 1 addition & 1 deletion pkg/col/colserde/record_batch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/apache/arrow/go/arrow"
"github.com/apache/arrow/go/arrow/array"
"github.com/apache/arrow/go/arrow/memory"
"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/col/coldata"
"github.com/cockroachdb/cockroach/pkg/col/colserde"
"github.com/cockroachdb/cockroach/pkg/col/typeconv"
Expand Down
2 changes: 1 addition & 1 deletion pkg/col/typeconv/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ go_library(
"//pkg/sql/types",
"//pkg/util/duration",
"//pkg/util/json",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
],
)
2 changes: 1 addition & 1 deletion pkg/col/typeconv/typeconv.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"fmt"
"time"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/sql/types"
"github.com/cockroachdb/cockroach/pkg/util/duration"
"github.com/cockroachdb/cockroach/pkg/util/json"
Expand Down
2 changes: 1 addition & 1 deletion pkg/jobs/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ go_test(
"//pkg/util/timeutil",
"//pkg/util/tracing",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_redact//:redact",
"@com_github_gogo_protobuf//types",
Expand Down
2 changes: 1 addition & 1 deletion pkg/jobs/jobs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"
"time"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/clusterversion"
"github.com/cockroachdb/cockroach/pkg/jobs"
Expand Down
2 changes: 1 addition & 1 deletion pkg/keys/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ go_test(
"//pkg/util/keysutil",
"//pkg/util/leaktest",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_stretchr_testify//require",
],
Expand Down
2 changes: 1 addition & 1 deletion pkg/keys/printer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"
"unicode/utf8"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/keys"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/util/bitarray"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ go_library(
"//pkg/util/timeutil",
"//pkg/util/tracing",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
],
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/kv/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"reflect"
"time"

"github.com/cockroachdb/apd/v2"
"github.com/cockroachdb/apd/v3"
"github.com/cockroachdb/cockroach/pkg/roachpb"
"github.com/cockroachdb/cockroach/pkg/util/duration"
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
Expand Down
6 changes: 3 additions & 3 deletions pkg/roachpb/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ go_library(
"//pkg/util/protoutil",
"//pkg/util/timetz",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_errors//errorspb",
"@com_github_cockroachdb_errors//extgrpc",
Expand Down Expand Up @@ -108,7 +108,7 @@ go_library(
"//pkg/util/uuid",
"@com_github_aws_aws_sdk_go//aws",
"@com_github_aws_aws_sdk_go//aws/credentials",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_errors//errorspb",
"@com_github_cockroachdb_errors//extgrpc",
Expand Down Expand Up @@ -176,7 +176,7 @@ go_test(
"//pkg/util/randutil",
"//pkg/util/timeutil",
"//pkg/util/uuid",
"@com_github_cockroachdb_apd_v2//:apd",
"@com_github_cockroachdb_apd_v3//:apd",
"@com_github_cockroachdb_errors//:errors",
"@com_github_cockroachdb_redact//:redact",
"@com_github_gogo_protobuf//proto",
Expand Down
Loading