diff --git a/pkg/acceptance/cluster/cluster.go b/pkg/acceptance/cluster/cluster.go index a39d8fe71f79..cbf828ce5cbc 100644 --- a/pkg/acceptance/cluster/cluster.go +++ b/pkg/acceptance/cluster/cluster.go @@ -16,7 +16,7 @@ import ( "net" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // A Cluster is an abstraction away from a concrete cluster deployment (i.e. diff --git a/pkg/acceptance/cluster/docker.go b/pkg/acceptance/cluster/docker.go index 0464379853d5..fe8a0cf409af 100644 --- a/pkg/acceptance/cluster/docker.go +++ b/pkg/acceptance/cluster/docker.go @@ -27,6 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/contextutil" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/docker/distribution/reference" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" @@ -36,7 +37,6 @@ import ( "github.com/docker/docker/pkg/jsonmessage" "github.com/docker/go-connections/nat" isatty "github.com/mattn/go-isatty" - "github.com/pkg/errors" ) // Retrieve the IP address of docker itself. diff --git a/pkg/acceptance/cluster/dockercluster.go b/pkg/acceptance/cluster/dockercluster.go index 56f67d834d88..cdeea36e1fe0 100644 --- a/pkg/acceptance/cluster/dockercluster.go +++ b/pkg/acceptance/cluster/dockercluster.go @@ -38,6 +38,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/events" @@ -45,7 +46,6 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/pkg/stdcopy" "github.com/docker/go-connections/nat" - "github.com/pkg/errors" ) const ( diff --git a/pkg/acceptance/compose/gss/psql/gss_test.go b/pkg/acceptance/compose/gss/psql/gss_test.go index 274a5e6c555d..b1a1aed501c4 100644 --- a/pkg/acceptance/compose/gss/psql/gss_test.go +++ b/pkg/acceptance/compose/gss/psql/gss_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" ) func TestGSS(t *testing.T) { diff --git a/pkg/acceptance/localcluster/cluster.go b/pkg/acceptance/localcluster/cluster.go index e0ecd69a7041..3ce93b0d006b 100644 --- a/pkg/acceptance/localcluster/cluster.go +++ b/pkg/acceptance/localcluster/cluster.go @@ -46,10 +46,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" // Import postgres driver. _ "github.com/lib/pq" - "github.com/pkg/errors" ) func repoRoot() string { diff --git a/pkg/acceptance/localcluster/localcluster.go b/pkg/acceptance/localcluster/localcluster.go index 3aec04005bf2..d49e5f3dccb0 100644 --- a/pkg/acceptance/localcluster/localcluster.go +++ b/pkg/acceptance/localcluster/localcluster.go @@ -20,7 +20,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/acceptance/cluster" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // LocalCluster implements cluster.Cluster. diff --git a/pkg/acceptance/localcluster/tc/tc.go b/pkg/acceptance/localcluster/tc/tc.go index 1f7bde81b7b6..eafc19e30a9c 100644 --- a/pkg/acceptance/localcluster/tc/tc.go +++ b/pkg/acceptance/localcluster/tc/tc.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/acceptance/util_cluster.go b/pkg/acceptance/util_cluster.go index d068ccb8328b..14c4416b39a2 100644 --- a/pkg/acceptance/util_cluster.go +++ b/pkg/acceptance/util_cluster.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/base/addr_validation.go b/pkg/base/addr_validation.go index 228ccd90f19b..cb4d7eeedf2d 100644 --- a/pkg/base/addr_validation.go +++ b/pkg/base/addr_validation.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ValidateAddrs controls the address fields in the Config object diff --git a/pkg/blobs/client.go b/pkg/blobs/client.go index 03b00db09692..134730aab0ef 100644 --- a/pkg/blobs/client.go +++ b/pkg/blobs/client.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/rpc" "github.com/cockroachdb/cockroach/pkg/rpc/nodedialer" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "google.golang.org/grpc/metadata" ) diff --git a/pkg/blobs/service.go b/pkg/blobs/service.go index 15f5199110f4..8517a74aac27 100644 --- a/pkg/blobs/service.go +++ b/pkg/blobs/service.go @@ -29,7 +29,7 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/blobs/blobspb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "google.golang.org/grpc/metadata" ) diff --git a/pkg/ccl/backupccl/backup_test.go b/pkg/ccl/backupccl/backup_test.go index 54b05e31cec7..578853ecb8bf 100644 --- a/pkg/ccl/backupccl/backup_test.go +++ b/pkg/ccl/backupccl/backup_test.go @@ -59,9 +59,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload/bank" "github.com/cockroachdb/cockroach/pkg/workload/workloadsql" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/pkg/ccl/baseccl/encryption_spec.go b/pkg/ccl/baseccl/encryption_spec.go index bede8298a35a..d7b53ab7a582 100644 --- a/pkg/ccl/baseccl/encryption_spec.go +++ b/pkg/ccl/baseccl/encryption_spec.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/ccl/cliccl/cliflagsccl" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/ccl/changefeedccl/avro_test.go b/pkg/ccl/changefeedccl/avro_test.go index 2b2a4712de34..3c6789045e49 100644 --- a/pkg/ccl/changefeedccl/avro_test.go +++ b/pkg/ccl/changefeedccl/avro_test.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/changefeedccl/bench_test.go b/pkg/ccl/changefeedccl/bench_test.go index 913ffa1409df..cce2aefe7c3a 100644 --- a/pkg/ccl/changefeedccl/bench_test.go +++ b/pkg/ccl/changefeedccl/bench_test.go @@ -39,7 +39,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/bank" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/changefeedccl/cdctest/testfeed.go b/pkg/ccl/changefeedccl/cdctest/testfeed.go index 10fec92f04df..dd271f6150fe 100644 --- a/pkg/ccl/changefeedccl/cdctest/testfeed.go +++ b/pkg/ccl/changefeedccl/cdctest/testfeed.go @@ -35,8 +35,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" - "github.com/pkg/errors" ) // TestFeedFactory is an interface to create changefeeds. diff --git a/pkg/ccl/changefeedccl/cdctest/validator.go b/pkg/ccl/changefeedccl/cdctest/validator.go index 84cddf78bd9c..bde0827231f4 100644 --- a/pkg/ccl/changefeedccl/cdctest/validator.go +++ b/pkg/ccl/changefeedccl/cdctest/validator.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Validator checks for violations of our changefeed ordering and delivery diff --git a/pkg/ccl/changefeedccl/changefeed_stmt.go b/pkg/ccl/changefeedccl/changefeed_stmt.go index 01f59311165d..6cd442fc037e 100644 --- a/pkg/ccl/changefeedccl/changefeed_stmt.go +++ b/pkg/ccl/changefeedccl/changefeed_stmt.go @@ -38,8 +38,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" crdberrors "github.com/cockroachdb/errors" - "github.com/pkg/errors" ) func init() { diff --git a/pkg/ccl/changefeedccl/changefeed_test.go b/pkg/ccl/changefeedccl/changefeed_test.go index aafb6562a697..0c1e99868769 100644 --- a/pkg/ccl/changefeedccl/changefeed_test.go +++ b/pkg/ccl/changefeedccl/changefeed_test.go @@ -57,8 +57,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" crdberrors "github.com/cockroachdb/errors" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/changefeedccl/encoder.go b/pkg/ccl/changefeedccl/encoder.go index 3469fbf12d34..8dc4266f0285 100644 --- a/pkg/ccl/changefeedccl/encoder.go +++ b/pkg/ccl/changefeedccl/encoder.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/json" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/ccl/changefeedccl/encoder_test.go b/pkg/ccl/changefeedccl/encoder_test.go index 6681ef4221d5..8809cf83f8de 100644 --- a/pkg/ccl/changefeedccl/encoder_test.go +++ b/pkg/ccl/changefeedccl/encoder_test.go @@ -30,8 +30,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/workload/ledger" "github.com/cockroachdb/cockroach/pkg/workload/workloadsql" + "github.com/cockroachdb/errors" "github.com/linkedin/goavro" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go b/pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go index 2538d5d802a6..b607f6e956b5 100644 --- a/pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go +++ b/pkg/ccl/changefeedccl/schemafeed/schema_feed_test.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/changefeedccl/sink.go b/pkg/ccl/changefeedccl/sink.go index aa435fb9af35..62b193a96468 100644 --- a/pkg/ccl/changefeedccl/sink.go +++ b/pkg/ccl/changefeedccl/sink.go @@ -41,8 +41,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" ) // Sink is an abstraction for anything that a changefeed may emit into. diff --git a/pkg/ccl/changefeedccl/sink_test.go b/pkg/ccl/changefeedccl/sink_test.go index a5ac3a5f80ee..6d220bd0865b 100644 --- a/pkg/ccl/changefeedccl/sink_test.go +++ b/pkg/ccl/changefeedccl/sink_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/cliccl/debug.go b/pkg/ccl/cliccl/debug.go index 86652b8d3ab7..669e061746bc 100644 --- a/pkg/ccl/cliccl/debug.go +++ b/pkg/ccl/cliccl/debug.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/ccl/cliccl/load.go b/pkg/ccl/cliccl/load.go index 7e8364a53156..e21041c89e55 100644 --- a/pkg/ccl/cliccl/load.go +++ b/pkg/ccl/cliccl/load.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/ccl/cmdccl/enc_utils/main.go b/pkg/ccl/cmdccl/enc_utils/main.go index cf577208f57e..85333a0b1599 100644 --- a/pkg/ccl/cmdccl/enc_utils/main.go +++ b/pkg/ccl/cmdccl/enc_utils/main.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const fileRegistryPath = "COCKROACHDB_REGISTRY" diff --git a/pkg/ccl/gssapiccl/gssapi.go b/pkg/ccl/gssapiccl/gssapi.go index 70cb709baf83..6208f161551d 100644 --- a/pkg/ccl/gssapiccl/gssapi.go +++ b/pkg/ccl/gssapiccl/gssapi.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/pgwire" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/hba" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // #cgo LDFLAGS: -lgssapi_krb5 -lcom_err -lkrb5 -lkrb5support -ldl -lk5crypto -lresolv diff --git a/pkg/ccl/importccl/csv_testdata_helpers_test.go b/pkg/ccl/importccl/csv_testdata_helpers_test.go index c85d5163bbfe..b8a3b1785209 100644 --- a/pkg/ccl/importccl/csv_testdata_helpers_test.go +++ b/pkg/ccl/importccl/csv_testdata_helpers_test.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/envutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var rewriteCSVTestData = envutil.EnvOrDefaultBool("COCKROACH_REWRITE_CSV_TESTDATA", false) diff --git a/pkg/ccl/importccl/exportcsv.go b/pkg/ccl/importccl/exportcsv.go index 5d8594e90887..2550ad01de09 100644 --- a/pkg/ccl/importccl/exportcsv.go +++ b/pkg/ccl/importccl/exportcsv.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/cloud" "github.com/cockroachdb/cockroach/pkg/util/encoding/csv" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const exportFilePatternPart = "%part%" diff --git a/pkg/ccl/importccl/import_stmt_test.go b/pkg/ccl/importccl/import_stmt_test.go index 8cd8212e4c73..3a8da2a35e85 100644 --- a/pkg/ccl/importccl/import_stmt_test.go +++ b/pkg/ccl/importccl/import_stmt_test.go @@ -51,8 +51,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/importccl/load.go b/pkg/ccl/importccl/load.go index 4146a4dfd9b7..43ef6e469802 100644 --- a/pkg/ccl/importccl/load.go +++ b/pkg/ccl/importccl/load.go @@ -37,7 +37,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TestingGetDescriptorFromDB is a wrapper for getDescriptorFromDB. diff --git a/pkg/ccl/importccl/read_import_workload.go b/pkg/ccl/importccl/read_import_workload.go index de887edd52b5..99db2c8aebec 100644 --- a/pkg/ccl/importccl/read_import_workload.go +++ b/pkg/ccl/importccl/read_import_workload.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" "github.com/cockroachdb/cockroach/pkg/util/timeutil/pgdate" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type workloadReader struct { diff --git a/pkg/ccl/partitionccl/drop_test.go b/pkg/ccl/partitionccl/drop_test.go index a8757cc99da5..a3f1e96e8fc3 100644 --- a/pkg/ccl/partitionccl/drop_test.go +++ b/pkg/ccl/partitionccl/drop_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func subzoneExists(cfg *zonepb.ZoneConfig, index uint32, partition string) bool { diff --git a/pkg/ccl/partitionccl/partition_test.go b/pkg/ccl/partitionccl/partition_test.go index c73720805bff..5562337843d3 100644 --- a/pkg/ccl/partitionccl/partition_test.go +++ b/pkg/ccl/partitionccl/partition_test.go @@ -41,8 +41,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/randutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" yaml "gopkg.in/yaml.v2" ) diff --git a/pkg/ccl/storageccl/encryption.go b/pkg/ccl/storageccl/encryption.go index b2c1f1e545ca..27c457c5c14a 100644 --- a/pkg/ccl/storageccl/encryption.go +++ b/pkg/ccl/storageccl/encryption.go @@ -15,7 +15,7 @@ import ( crypto_rand "crypto/rand" "crypto/sha256" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/crypto/pbkdf2" ) diff --git a/pkg/ccl/storageccl/engineccl/rocksdb.go b/pkg/ccl/storageccl/engineccl/rocksdb.go index f99ec37143a8..565b4d344acb 100644 --- a/pkg/ccl/storageccl/engineccl/rocksdb.go +++ b/pkg/ccl/storageccl/engineccl/rocksdb.go @@ -14,7 +14,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/storage/enginepb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TODO(tamird): why does rocksdb not link jemalloc,snappy statically? diff --git a/pkg/ccl/storageccl/export.go b/pkg/ccl/storageccl/export.go index b0d392db6c49..f76296f85184 100644 --- a/pkg/ccl/storageccl/export.go +++ b/pkg/ccl/storageccl/export.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/cloud" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ExportRequestTargetFileSize controls the target file size for SSTs created diff --git a/pkg/ccl/storageccl/import.go b/pkg/ccl/storageccl/import.go index 32c081df21d7..60c0a6f23889 100644 --- a/pkg/ccl/storageccl/import.go +++ b/pkg/ccl/storageccl/import.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var importBatchSize = func() *settings.ByteSizeSetting { diff --git a/pkg/ccl/storageccl/import_test.go b/pkg/ccl/storageccl/import_test.go index 35fad6eec028..08340d80f847 100644 --- a/pkg/ccl/storageccl/import_test.go +++ b/pkg/ccl/storageccl/import_test.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestMaxImportBatchSize(t *testing.T) { diff --git a/pkg/ccl/storageccl/key_rewriter.go b/pkg/ccl/storageccl/key_rewriter.go index 723c39d58939..4e05ad52ef47 100644 --- a/pkg/ccl/storageccl/key_rewriter.go +++ b/pkg/ccl/storageccl/key_rewriter.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // prefixRewrite holds information for a single []byte replacement of a prefix. diff --git a/pkg/ccl/storageccl/writebatch.go b/pkg/ccl/storageccl/writebatch.go index 6f757f4f4999..9dcc37c03534 100644 --- a/pkg/ccl/storageccl/writebatch.go +++ b/pkg/ccl/storageccl/writebatch.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/ccl/utilccl/sampledataccl/bankdata.go b/pkg/ccl/utilccl/sampledataccl/bankdata.go index 84be9b1dba6e..da74efe36e32 100644 --- a/pkg/ccl/utilccl/sampledataccl/bankdata.go +++ b/pkg/ccl/utilccl/sampledataccl/bankdata.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/workloadsql" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ToBackup creates an enterprise backup in `dir`. diff --git a/pkg/ccl/workloadccl/allccl/all_test.go b/pkg/ccl/workloadccl/allccl/all_test.go index 818f2a0ae94f..cb8e9c1194b7 100644 --- a/pkg/ccl/workloadccl/allccl/all_test.go +++ b/pkg/ccl/workloadccl/allccl/all_test.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/workloadsql" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/ccl/workloadccl/cliccl/fixtures.go b/pkg/ccl/workloadccl/cliccl/fixtures.go index 9db65425dd55..6fd07de156c3 100644 --- a/pkg/ccl/workloadccl/cliccl/fixtures.go +++ b/pkg/ccl/workloadccl/cliccl/fixtures.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/workload" workloadcli "github.com/cockroachdb/cockroach/pkg/workload/cli" "github.com/cockroachdb/cockroach/pkg/workload/workloadsql" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" "google.golang.org/api/option" diff --git a/pkg/ccl/workloadccl/fixture.go b/pkg/ccl/workloadccl/fixture.go index 94c2ec14bfba..b74e0ca92aa6 100644 --- a/pkg/ccl/workloadccl/fixture.go +++ b/pkg/ccl/workloadccl/fixture.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" "google.golang.org/api/iterator" ) diff --git a/pkg/ccl/workloadccl/format/sstable.go b/pkg/ccl/workloadccl/format/sstable.go index 98114a3a111c..9f8cf5a9e756 100644 --- a/pkg/ccl/workloadccl/format/sstable.go +++ b/pkg/ccl/workloadccl/format/sstable.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ToTableDescriptor returns the corresponding TableDescriptor for a workload diff --git a/pkg/cli/cert.go b/pkg/cli/cert.go index e10b919f40ee..ef054f3ced2a 100644 --- a/pkg/cli/cert.go +++ b/pkg/cli/cert.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/security" "github.com/cockroachdb/cockroach/pkg/sql" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go index b2bd9c899e33..64d2d1e57f71 100644 --- a/pkg/cli/cli_test.go +++ b/pkg/cli/cli_test.go @@ -42,7 +42,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" // register some workloads for TestWorkload _ "github.com/cockroachdb/cockroach/pkg/workload/examples" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/cli/client_url.go b/pkg/cli/client_url.go index 2a537bdcdbad..2e40b42ef355 100644 --- a/pkg/cli/client_url.go +++ b/pkg/cli/client_url.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cli/cliflags" "github.com/cockroachdb/cockroach/pkg/security" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cli/debug_synctest.go b/pkg/cli/debug_synctest.go index ce026931c359..25e0baaee589 100644 --- a/pkg/cli/debug_synctest.go +++ b/pkg/cli/debug_synctest.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cli/flags_util.go b/pkg/cli/flags_util.go index 85d5609a1ed3..82ecffef821b 100644 --- a/pkg/cli/flags_util.go +++ b/pkg/cli/flags_util.go @@ -25,9 +25,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/keysutil" + "github.com/cockroachdb/errors" humanize "github.com/dustin/go-humanize" "github.com/elastic/gosigar" - "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/pkg/cli/haproxy.go b/pkg/cli/haproxy.go index 501e5568dc2f..06daa9359d6c 100644 --- a/pkg/cli/haproxy.go +++ b/pkg/cli/haproxy.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/serverpb" "github.com/cockroachdb/cockroach/pkg/server/status/statuspb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/cli/node.go b/pkg/cli/node.go index 51fcbf7d5b46..c309ae2af3c7 100644 --- a/pkg/cli/node.go +++ b/pkg/cli/node.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/serverpb" "github.com/cockroachdb/cockroach/pkg/util/retry" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" "google.golang.org/grpc" ) diff --git a/pkg/cli/nodelocal.go b/pkg/cli/nodelocal.go index f7a931ea66e7..346e20d89c1e 100644 --- a/pkg/cli/nodelocal.go +++ b/pkg/cli/nodelocal.go @@ -18,7 +18,7 @@ import ( "path/filepath" "github.com/cockroachdb/cockroach/pkg/sql" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cli/sqlfmt.go b/pkg/cli/sqlfmt.go index 1c325db23a5e..e9b4bec9eaae 100644 --- a/pkg/cli/sqlfmt.go +++ b/pkg/cli/sqlfmt.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/parser" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cli/syncbench/syncbench.go b/pkg/cli/syncbench/syncbench.go index 8528c228659f..921007dc9ddb 100644 --- a/pkg/cli/syncbench/syncbench.go +++ b/pkg/cli/syncbench/syncbench.go @@ -28,8 +28,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/sysutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/codahale/hdrhistogram" - "github.com/pkg/errors" ) var numOps uint64 diff --git a/pkg/cli/systembench/cpu_bench.go b/pkg/cli/systembench/cpu_bench.go index bf0880f0b9d5..10f8784e30e7 100644 --- a/pkg/cli/systembench/cpu_bench.go +++ b/pkg/cli/systembench/cpu_bench.go @@ -18,8 +18,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/dustin/go-humanize" - "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cli/systembench/disk_bench.go b/pkg/cli/systembench/disk_bench.go index 65d67610fd2a..662a0f28cfb3 100644 --- a/pkg/cli/systembench/disk_bench.go +++ b/pkg/cli/systembench/disk_bench.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/sysutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/clusterversion/keyed_versions.go b/pkg/clusterversion/keyed_versions.go index c013bce301f1..83a711485de7 100644 --- a/pkg/clusterversion/keyed_versions.go +++ b/pkg/clusterversion/keyed_versions.go @@ -17,8 +17,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) // keyedVersion associates a key to a version. diff --git a/pkg/cmd/allocsim/main.go b/pkg/cmd/allocsim/main.go index 7756379045ee..1cd2732df217 100644 --- a/pkg/cmd/allocsim/main.go +++ b/pkg/cmd/allocsim/main.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var workers = flag.Int("w", 1, "number of workers; the i'th worker talks to node i%numNodes") diff --git a/pkg/cmd/cmp-protocol/main.go b/pkg/cmd/cmp-protocol/main.go index 3ba53e03619a..90daa2d71e14 100644 --- a/pkg/cmd/cmp-protocol/main.go +++ b/pkg/cmd/cmp-protocol/main.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/randutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/cmd/cmp-protocol/pgconnect/pgconnect.go b/pkg/cmd/cmp-protocol/pgconnect/pgconnect.go index 687fc558b99b..0b37dfad902e 100644 --- a/pkg/cmd/cmp-protocol/pgconnect/pgconnect.go +++ b/pkg/cmd/cmp-protocol/pgconnect/pgconnect.go @@ -18,8 +18,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgwirebase" "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" + "github.com/cockroachdb/errors" "github.com/jackc/pgx/pgproto3" - "github.com/pkg/errors" ) // Connect connects to the postgres-compatible server at addr with specified diff --git a/pkg/cmd/cmpconn/compare.go b/pkg/cmd/cmpconn/compare.go index 6fa4f821ff1d..5195facf0a86 100644 --- a/pkg/cmd/cmpconn/compare.go +++ b/pkg/cmd/cmpconn/compare.go @@ -17,10 +17,10 @@ import ( "github.com/cockroachdb/apd" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/util/duration" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/jackc/pgx/pgtype" - "github.com/pkg/errors" ) // CompareVals returns an error if a and b differ, specifying what the diff --git a/pkg/cmd/cmpconn/conn.go b/pkg/cmd/cmpconn/conn.go index a9eb5751eb1a..ebba05646434 100644 --- a/pkg/cmd/cmpconn/conn.go +++ b/pkg/cmd/cmpconn/conn.go @@ -21,9 +21,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/mutations" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" "github.com/lib/pq" - "github.com/pkg/errors" ) // Conn holds gosql and pgx connections and provides some utility methods. diff --git a/pkg/cmd/cr2pg/main.go b/pkg/cmd/cr2pg/main.go index e663fc41341f..4718ce419fa5 100644 --- a/pkg/cmd/cr2pg/main.go +++ b/pkg/cmd/cr2pg/main.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/cr2pg/sqlstream" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/cr2pg/sqlstream/stream.go b/pkg/cmd/cr2pg/sqlstream/stream.go index 8215ae2c1567..22c8d9e1cc65 100644 --- a/pkg/cmd/cr2pg/sqlstream/stream.go +++ b/pkg/cmd/cr2pg/sqlstream/stream.go @@ -19,7 +19,7 @@ import ( // Include this because the parser assumes builtin functions exist. _ "github.com/cockroachdb/cockroach/pkg/sql/sem/builtins" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Modified from importccl/read_import_pgdump.go. diff --git a/pkg/cmd/docgen/diagrams.go b/pkg/cmd/docgen/diagrams.go index b9c1ff074774..c3a217a4fae6 100644 --- a/pkg/cmd/docgen/diagrams.go +++ b/pkg/cmd/docgen/diagrams.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/docgen/extract" "github.com/cockroachdb/cockroach/pkg/util/envutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/docgen/funcs.go b/pkg/cmd/docgen/funcs.go index 2cb9fca71edd..052c2741498c 100644 --- a/pkg/cmd/docgen/funcs.go +++ b/pkg/cmd/docgen/funcs.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/builtins" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" + "github.com/cockroachdb/errors" "github.com/golang-commonmark/markdown" - "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/pkg/cmd/github-post/main.go b/pkg/cmd/github-post/main.go index fd5d186fccbf..ae0573d63c8f 100644 --- a/pkg/cmd/github-post/main.go +++ b/pkg/cmd/github-post/main.go @@ -33,7 +33,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/cmd/internal/issues" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/cmd/internal/issues/issues.go b/pkg/cmd/internal/issues/issues.go index aad569edf4ea..761d7b7fe79f 100644 --- a/pkg/cmd/internal/issues/issues.go +++ b/pkg/cmd/internal/issues/issues.go @@ -22,8 +22,8 @@ import ( "text/template" "github.com/cockroachdb/cockroach/pkg/util/version" + "github.com/cockroachdb/errors" "github.com/google/go-github/github" - "github.com/pkg/errors" "golang.org/x/oauth2" ) diff --git a/pkg/cmd/publish-provisional-artifacts/main_test.go b/pkg/cmd/publish-provisional-artifacts/main_test.go index 387f80ebb93b..95cec3fc77de 100644 --- a/pkg/cmd/publish-provisional-artifacts/main_test.go +++ b/pkg/cmd/publish-provisional-artifacts/main_test.go @@ -22,7 +22,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/cockroachdb/cockroach/pkg/testutils" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/cmd/roachprod/cloud/cluster_cloud.go b/pkg/cmd/roachprod/cloud/cluster_cloud.go index 445476ba2aff..cbbf6a11b91c 100644 --- a/pkg/cmd/roachprod/cloud/cluster_cloud.go +++ b/pkg/cmd/roachprod/cloud/cluster_cloud.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/config" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const vmNameFormat = "user--" diff --git a/pkg/cmd/roachprod/hosts.go b/pkg/cmd/roachprod/hosts.go index 3a2deb3ff453..c01bd4eb5ca4 100644 --- a/pkg/cmd/roachprod/hosts.go +++ b/pkg/cmd/roachprod/hosts.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/cloud" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/config" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/install" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func initDirs() error { diff --git a/pkg/cmd/roachprod/install/cluster_synced.go b/pkg/cmd/roachprod/install/cluster_synced.go index bfa8911e61d6..8ff6c732c532 100644 --- a/pkg/cmd/roachprod/install/cluster_synced.go +++ b/pkg/cmd/roachprod/install/cluster_synced.go @@ -37,8 +37,8 @@ import ( clog "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" crdberrors "github.com/cockroachdb/errors" - "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/roachprod/install/cockroach.go b/pkg/cmd/roachprod/install/cockroach.go index c633882ef86a..7a865835c489 100644 --- a/pkg/cmd/roachprod/install/cockroach.go +++ b/pkg/cmd/roachprod/install/cockroach.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/ssh" "github.com/cockroachdb/cockroach/pkg/util/envutil" "github.com/cockroachdb/cockroach/pkg/util/version" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // StartOpts TODO(peter): document diff --git a/pkg/cmd/roachprod/install/expander.go b/pkg/cmd/roachprod/install/expander.go index d01b60ac6d8e..021501cf1fd1 100644 --- a/pkg/cmd/roachprod/install/expander.go +++ b/pkg/cmd/roachprod/install/expander.go @@ -15,7 +15,7 @@ import ( "regexp" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var parameterRe = regexp.MustCompile(`{[^}]*}`) diff --git a/pkg/cmd/roachprod/install/session.go b/pkg/cmd/roachprod/install/session.go index 0b0ac46781a1..9812684fdcee 100644 --- a/pkg/cmd/roachprod/install/session.go +++ b/pkg/cmd/roachprod/install/session.go @@ -19,7 +19,7 @@ import ( "sync" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/config" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type session interface { diff --git a/pkg/cmd/roachprod/main.go b/pkg/cmd/roachprod/main.go index 66ea651cadf4..587fdac28d0a 100644 --- a/pkg/cmd/roachprod/main.go +++ b/pkg/cmd/roachprod/main.go @@ -39,7 +39,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm/gce" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm/local" "github.com/cockroachdb/cockroach/pkg/util/flagutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" "golang.org/x/crypto/ssh/terminal" "golang.org/x/sys/unix" diff --git a/pkg/cmd/roachprod/ssh/ssh.go b/pkg/cmd/roachprod/ssh/ssh.go index a5253d7e29ed..0c4533c6c542 100644 --- a/pkg/cmd/roachprod/ssh/ssh.go +++ b/pkg/cmd/roachprod/ssh/ssh.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/config" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/agent" "golang.org/x/crypto/ssh/knownhosts" diff --git a/pkg/cmd/roachprod/vm/aws/aws.go b/pkg/cmd/roachprod/vm/aws/aws.go index 1e152605ee93..cf4730fdc9e6 100644 --- a/pkg/cmd/roachprod/vm/aws/aws.go +++ b/pkg/cmd/roachprod/vm/aws/aws.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm/flagstub" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" "golang.org/x/sync/errgroup" "golang.org/x/time/rate" diff --git a/pkg/cmd/roachprod/vm/aws/keys.go b/pkg/cmd/roachprod/vm/aws/keys.go index 067f506e9070..59fb9d128eb9 100644 --- a/pkg/cmd/roachprod/vm/aws/keys.go +++ b/pkg/cmd/roachprod/vm/aws/keys.go @@ -18,7 +18,7 @@ import ( "os" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const sshPublicKeyFile = "${HOME}/.ssh/id_rsa.pub" diff --git a/pkg/cmd/roachprod/vm/aws/support.go b/pkg/cmd/roachprod/vm/aws/support.go index ab94c33948d8..f987eb080bb4 100644 --- a/pkg/cmd/roachprod/vm/aws/support.go +++ b/pkg/cmd/roachprod/vm/aws/support.go @@ -20,7 +20,7 @@ import ( "text/template" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Both M5 and I3 machines expose their EBS or local SSD volumes as NVMe block diff --git a/pkg/cmd/roachprod/vm/flagstub/flagstub.go b/pkg/cmd/roachprod/vm/flagstub/flagstub.go index 5fb8e2fcc949..c8228d5e3b92 100644 --- a/pkg/cmd/roachprod/vm/flagstub/flagstub.go +++ b/pkg/cmd/roachprod/vm/flagstub/flagstub.go @@ -14,7 +14,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // New wraps a delegate vm.Provider to only return its name and diff --git a/pkg/cmd/roachprod/vm/gce/gcloud.go b/pkg/cmd/roachprod/vm/gce/gcloud.go index 9cf18066ef0d..c673aa6299ee 100644 --- a/pkg/cmd/roachprod/vm/gce/gcloud.go +++ b/pkg/cmd/roachprod/vm/gce/gcloud.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/config" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm/flagstub" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/roachprod/vm/gce/utils.go b/pkg/cmd/roachprod/vm/gce/utils.go index cf81d561b14f..0b7cccb0f920 100644 --- a/pkg/cmd/roachprod/vm/gce/utils.go +++ b/pkg/cmd/roachprod/vm/gce/utils.go @@ -21,7 +21,7 @@ import ( "text/template" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/cmd/roachprod/vm/local/local.go b/pkg/cmd/roachprod/vm/local/local.go index 779ee1f4bb60..97d637a47b51 100644 --- a/pkg/cmd/roachprod/vm/local/local.go +++ b/pkg/cmd/roachprod/vm/local/local.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/install" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/vm" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/cmd/roachprod/vm/vm.go b/pkg/cmd/roachprod/vm/vm.go index 1c9c19dd1b9a..bce49b1b05f0 100644 --- a/pkg/cmd/roachprod/vm/vm.go +++ b/pkg/cmd/roachprod/vm/vm.go @@ -19,7 +19,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/cmd/roachprod/config" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/roachtest/allocator.go b/pkg/cmd/roachtest/allocator.go index 138d18dfe116..cd88c6351b96 100644 --- a/pkg/cmd/roachtest/allocator.go +++ b/pkg/cmd/roachtest/allocator.go @@ -19,7 +19,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func registerAllocator(r *testRegistry) { diff --git a/pkg/cmd/roachtest/autoupgrade.go b/pkg/cmd/roachtest/autoupgrade.go index c1315f8a4786..7692ed103951 100644 --- a/pkg/cmd/roachtest/autoupgrade.go +++ b/pkg/cmd/roachtest/autoupgrade.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/binfetcher" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // This test verifies that preserve_downgrade_option is respected and that in the diff --git a/pkg/cmd/roachtest/backup.go b/pkg/cmd/roachtest/backup.go index 0f10cb3fe97b..0a284cac436c 100644 --- a/pkg/cmd/roachtest/backup.go +++ b/pkg/cmd/roachtest/backup.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/version" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func registerBackup(r *testRegistry) { diff --git a/pkg/cmd/roachtest/bank.go b/pkg/cmd/roachtest/bank.go index 9ed317d93b0e..a817446daadb 100644 --- a/pkg/cmd/roachtest/bank.go +++ b/pkg/cmd/roachtest/bank.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/cmd/roachtest/chaos.go b/pkg/cmd/roachtest/chaos.go index 34cc6e93c5ff..c6cdcd3314ec 100644 --- a/pkg/cmd/roachtest/chaos.go +++ b/pkg/cmd/roachtest/chaos.go @@ -15,7 +15,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ChaosTimer configures a chaos schedule. diff --git a/pkg/cmd/roachtest/copy.go b/pkg/cmd/roachtest/copy.go index 565b71e1dc26..e8db4f5b27d3 100644 --- a/pkg/cmd/roachtest/copy.go +++ b/pkg/cmd/roachtest/copy.go @@ -17,8 +17,8 @@ import ( "strings" "github.com/cockroachdb/cockroach-go/crdb" + "github.com/cockroachdb/errors" _ "github.com/lib/pq" - "github.com/pkg/errors" ) func registerCopy(r *testRegistry) { diff --git a/pkg/cmd/roachtest/decommission.go b/pkg/cmd/roachtest/decommission.go index 849fa31ad693..dc1f24add56f 100644 --- a/pkg/cmd/roachtest/decommission.go +++ b/pkg/cmd/roachtest/decommission.go @@ -23,9 +23,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/kr/pretty" _ "github.com/lib/pq" - "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/roachtest/encryption.go b/pkg/cmd/roachtest/encryption.go index f431f545a234..2ccf9662bb92 100644 --- a/pkg/cmd/roachtest/encryption.go +++ b/pkg/cmd/roachtest/encryption.go @@ -14,7 +14,7 @@ import ( "context" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func registerEncryption(r *testRegistry) { diff --git a/pkg/cmd/roachtest/engine_switch.go b/pkg/cmd/roachtest/engine_switch.go index 49de61f66c4c..51587147bbaf 100644 --- a/pkg/cmd/roachtest/engine_switch.go +++ b/pkg/cmd/roachtest/engine_switch.go @@ -16,8 +16,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" _ "github.com/lib/pq" - "github.com/pkg/errors" "golang.org/x/exp/rand" ) diff --git a/pkg/cmd/roachtest/follower_reads.go b/pkg/cmd/roachtest/follower_reads.go index 2a630bdb4ee5..2c26443771fc 100644 --- a/pkg/cmd/roachtest/follower_reads.go +++ b/pkg/cmd/roachtest/follower_reads.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/ts/tspb" "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/roachtest/gossip.go b/pkg/cmd/roachtest/gossip.go index c994bdabee3e..18e3dc2b21ef 100644 --- a/pkg/cmd/roachtest/gossip.go +++ b/pkg/cmd/roachtest/gossip.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func registerGossip(r *testRegistry) { diff --git a/pkg/cmd/roachtest/hotspotsplits.go b/pkg/cmd/roachtest/hotspotsplits.go index d55877eeabff..bb99764fe5e4 100644 --- a/pkg/cmd/roachtest/hotspotsplits.go +++ b/pkg/cmd/roachtest/hotspotsplits.go @@ -17,8 +17,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" _ "github.com/lib/pq" - "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cmd/roachtest/import.go b/pkg/cmd/roachtest/import.go index 566a8df68ce9..587b0cfebcfd 100644 --- a/pkg/cmd/roachtest/import.go +++ b/pkg/cmd/roachtest/import.go @@ -17,7 +17,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/retry" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func registerImportTPCC(r *testRegistry) { diff --git a/pkg/cmd/roachtest/kvbench.go b/pkg/cmd/roachtest/kvbench.go index 0e4ebc1853b7..f54b53969929 100644 --- a/pkg/cmd/roachtest/kvbench.go +++ b/pkg/cmd/roachtest/kvbench.go @@ -21,9 +21,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/search" "github.com/cockroachdb/cockroach/pkg/workload/histogram" + "github.com/cockroachdb/errors" "github.com/cockroachdb/ttycolor" "github.com/codahale/hdrhistogram" - "github.com/pkg/errors" ) // kvBenchKeyDistribution represents the distribution of keys generated by `workload`. diff --git a/pkg/cmd/roachtest/rapid_restart.go b/pkg/cmd/roachtest/rapid_restart.go index 21965849df2c..3f88be930366 100644 --- a/pkg/cmd/roachtest/rapid_restart.go +++ b/pkg/cmd/roachtest/rapid_restart.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/sysutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func runRapidRestart(ctx context.Context, t *test, c *cluster) { diff --git a/pkg/cmd/roachtest/restore.go b/pkg/cmd/roachtest/restore.go index 37ccf04d178f..5e898baf2ecb 100644 --- a/pkg/cmd/roachtest/restore.go +++ b/pkg/cmd/roachtest/restore.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // HealthChecker runs a regular check that verifies that a specified subset diff --git a/pkg/cmd/roachtest/schemachange.go b/pkg/cmd/roachtest/schemachange.go index 93ee1e50bcf0..6c417c92a11d 100644 --- a/pkg/cmd/roachtest/schemachange.go +++ b/pkg/cmd/roachtest/schemachange.go @@ -17,7 +17,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func registerSchemaChangeDuringKV(r *testRegistry) { diff --git a/pkg/cmd/roachtest/split.go b/pkg/cmd/roachtest/split.go index 8b3ee07c8d8f..a9e901996dd6 100644 --- a/pkg/cmd/roachtest/split.go +++ b/pkg/cmd/roachtest/split.go @@ -19,9 +19,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/retry" + "github.com/cockroachdb/errors" humanize "github.com/dustin/go-humanize" _ "github.com/lib/pq" - "github.com/pkg/errors" ) type splitParams struct { diff --git a/pkg/cmd/roachtest/test_registry.go b/pkg/cmd/roachtest/test_registry.go index 8c9ef978df9a..2b351e55618e 100644 --- a/pkg/cmd/roachtest/test_registry.go +++ b/pkg/cmd/roachtest/test_registry.go @@ -20,7 +20,7 @@ import ( "strings" "github.com/cockroachdb/cockroach/pkg/util/version" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Owner is a valid entry for the Owners field of a roachtest. They should be diff --git a/pkg/cmd/roachtest/toxiproxy.go b/pkg/cmd/roachtest/toxiproxy.go index b491765efe91..0f25e5220a45 100644 --- a/pkg/cmd/roachtest/toxiproxy.go +++ b/pkg/cmd/roachtest/toxiproxy.go @@ -21,7 +21,7 @@ import ( "time" toxiproxy "github.com/Shopify/toxiproxy/client" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // cockroachToxiWrapper replaces the cockroach binary. It modifies the listening port so diff --git a/pkg/cmd/roachtest/tpcc.go b/pkg/cmd/roachtest/tpcc.go index f9ceb2acd23d..0491721acc89 100644 --- a/pkg/cmd/roachtest/tpcc.go +++ b/pkg/cmd/roachtest/tpcc.go @@ -29,9 +29,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/version" "github.com/cockroachdb/cockroach/pkg/workload/histogram" "github.com/cockroachdb/cockroach/pkg/workload/tpcc" + "github.com/cockroachdb/errors" "github.com/cockroachdb/ttycolor" "github.com/lib/pq" - "github.com/pkg/errors" ) type tpccOptions struct { diff --git a/pkg/cmd/roachtest/version.go b/pkg/cmd/roachtest/version.go index 8aa0e4b4a183..f5637aed4b20 100644 --- a/pkg/cmd/roachtest/version.go +++ b/pkg/cmd/roachtest/version.go @@ -18,8 +18,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/binfetcher" + "github.com/cockroachdb/errors" _ "github.com/lib/pq" - "github.com/pkg/errors" ) // TODO(tbg): remove this test. Use the harness in versionupgrade.go diff --git a/pkg/cmd/smithtest/main.go b/pkg/cmd/smithtest/main.go index 2b24d11577ea..eb9298b5125c 100644 --- a/pkg/cmd/smithtest/main.go +++ b/pkg/cmd/smithtest/main.go @@ -34,11 +34,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/google/go-github/github" "github.com/jackc/pgx" "github.com/lib/pq" "github.com/pkg/browser" - "github.com/pkg/errors" ) var ( diff --git a/pkg/cmd/wraprules/wraprules.go b/pkg/cmd/wraprules/wraprules.go index b545929fb584..e7c6024b44a9 100644 --- a/pkg/cmd/wraprules/wraprules.go +++ b/pkg/cmd/wraprules/wraprules.go @@ -15,7 +15,7 @@ import ( "io/ioutil" "os" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" "gopkg.in/yaml.v2" ) diff --git a/pkg/col/coldata/bytes_test.go b/pkg/col/coldata/bytes_test.go index 9a92a5dcd3c5..237e79b236e8 100644 --- a/pkg/col/coldata/bytes_test.go +++ b/pkg/col/coldata/bytes_test.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/randutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/col/colserde/file.go b/pkg/col/colserde/file.go index 23a653f3b64a..e89ffd8127ba 100644 --- a/pkg/col/colserde/file.go +++ b/pkg/col/colserde/file.go @@ -23,9 +23,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/errors" mmap "github.com/edsrzf/mmap-go" flatbuffers "github.com/google/flatbuffers/go" - "github.com/pkg/errors" ) const fileMagic = `ARROW1` diff --git a/pkg/col/colserde/record_batch.go b/pkg/col/colserde/record_batch.go index 3a9d75c9b18f..a46ad9101233 100644 --- a/pkg/col/colserde/record_batch.go +++ b/pkg/col/colserde/record_batch.go @@ -19,8 +19,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/col/colserde/arrowserde" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/errors" flatbuffers "github.com/google/flatbuffers/go" - "github.com/pkg/errors" ) const ( diff --git a/pkg/col/typeconv/typeconv.go b/pkg/col/typeconv/typeconv.go index d9c9ddfd3187..cfe8629e418f 100644 --- a/pkg/col/typeconv/typeconv.go +++ b/pkg/col/typeconv/typeconv.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/apd" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TypeFamilyToCanonicalTypeFamily maps all type families that are supported by diff --git a/pkg/config/zonepb/zone.go b/pkg/config/zonepb/zone.go index c7bd6a4ed58b..03c047d3a4f9 100644 --- a/pkg/config/zonepb/zone.go +++ b/pkg/config/zonepb/zone.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgcode" "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) // Several ranges outside of the SQL keyspace are given special names so they diff --git a/pkg/gossip/client.go b/pkg/gossip/client.go index 92ff62acbd2e..9b8c536c160f 100644 --- a/pkg/gossip/client.go +++ b/pkg/gossip/client.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // client is a client-side RPC connection to a gossip peer node. diff --git a/pkg/gossip/client_test.go b/pkg/gossip/client_test.go index 628d10ec1abf..121932716bfd 100644 --- a/pkg/gossip/client_test.go +++ b/pkg/gossip/client_test.go @@ -32,8 +32,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "google.golang.org/grpc" ) diff --git a/pkg/gossip/gossip.go b/pkg/gossip/gossip.go index 17bdbcd4a635..85d3cd02712a 100644 --- a/pkg/gossip/gossip.go +++ b/pkg/gossip/gossip.go @@ -76,9 +76,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "google.golang.org/grpc" ) diff --git a/pkg/gossip/gossip_test.go b/pkg/gossip/gossip_test.go index 7e6e47aa53cb..172eacffad87 100644 --- a/pkg/gossip/gossip_test.go +++ b/pkg/gossip/gossip_test.go @@ -35,8 +35,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) // TestGossipInfoStore verifies operation of gossip instance infostore. diff --git a/pkg/gossip/infostore.go b/pkg/gossip/infostore.go index 268b76cbd2e0..1bc0d23e0b4b 100644 --- a/pkg/gossip/infostore.go +++ b/pkg/gossip/infostore.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type stringMatcher interface { diff --git a/pkg/gossip/keys.go b/pkg/gossip/keys.go index 5d5f6b73be73..4da7ab39628c 100644 --- a/pkg/gossip/keys.go +++ b/pkg/gossip/keys.go @@ -16,7 +16,7 @@ import ( "strings" "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // separator is used to separate the non-prefix components of a diff --git a/pkg/gossip/resolver/resolver.go b/pkg/gossip/resolver/resolver.go index 70b3048f63df..571ae089ff37 100644 --- a/pkg/gossip/resolver/resolver.go +++ b/pkg/gossip/resolver/resolver.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/netutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/gossip/resolver/socket.go b/pkg/gossip/resolver/socket.go index 414df0692711..7fc7435a69a0 100644 --- a/pkg/gossip/resolver/socket.go +++ b/pkg/gossip/resolver/socket.go @@ -14,7 +14,7 @@ import ( "net" "github.com/cockroachdb/cockroach/pkg/util" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // socketResolver represents the different types of socket-based diff --git a/pkg/gossip/server.go b/pkg/gossip/server.go index 638fba8f823f..358f40d281ec 100644 --- a/pkg/gossip/server.go +++ b/pkg/gossip/server.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type serverInfo struct { diff --git a/pkg/gossip/storage_test.go b/pkg/gossip/storage_test.go index 15ef6b4a608d..31141922c88d 100644 --- a/pkg/gossip/storage_test.go +++ b/pkg/gossip/storage_test.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type testStorage struct { diff --git a/pkg/internal/rsg/yacc/parse.go b/pkg/internal/rsg/yacc/parse.go index 05e7fed3ff91..aec2af09b4bd 100644 --- a/pkg/internal/rsg/yacc/parse.go +++ b/pkg/internal/rsg/yacc/parse.go @@ -24,7 +24,7 @@ import ( "fmt" "runtime" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Tree is the representation of a single parsed file. diff --git a/pkg/jobs/jobs_test.go b/pkg/jobs/jobs_test.go index 5cca416d9857..05328fad91d6 100644 --- a/pkg/jobs/jobs_test.go +++ b/pkg/jobs/jobs_test.go @@ -41,9 +41,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/google/go-cmp/cmp" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/jobs/jobsprotectedts/jobs_protected_ts.go b/pkg/jobs/jobsprotectedts/jobs_protected_ts.go index 710644ff03d0..f80833d221b1 100644 --- a/pkg/jobs/jobsprotectedts/jobs_protected_ts.go +++ b/pkg/jobs/jobsprotectedts/jobs_protected_ts.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // MetaType is the value used in the ptpb.Record.MetaType field for records diff --git a/pkg/jobs/registry_external_test.go b/pkg/jobs/registry_external_test.go index 3f51cea21f16..08db8cf25bf6 100644 --- a/pkg/jobs/registry_external_test.go +++ b/pkg/jobs/registry_external_test.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestRoundtripJob(t *testing.T) { diff --git a/pkg/jobs/update.go b/pkg/jobs/update.go index dedf97bc8d7d..3c433336fa40 100644 --- a/pkg/jobs/update.go +++ b/pkg/jobs/update.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // UpdateFn is the callback passed to Job.Update. It is called from the context diff --git a/pkg/keys/keys.go b/pkg/keys/keys.go index 8451e868b6a4..ae180d67916a 100644 --- a/pkg/keys/keys.go +++ b/pkg/keys/keys.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func makeKey(keys ...[]byte) []byte { diff --git a/pkg/keys/printer.go b/pkg/keys/printer.go index 09c704e68cf1..c6a100847d41 100644 --- a/pkg/keys/printer.go +++ b/pkg/keys/printer.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // PrettyPrintTimeseriesKey is a hook for pretty printing a timeseries key. The diff --git a/pkg/keys/sql.go b/pkg/keys/sql.go index a787a717a342..d5ade3a7d798 100644 --- a/pkg/keys/sql.go +++ b/pkg/keys/sql.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // MakeTenantPrefix creates the key prefix associated with the specified tenant. diff --git a/pkg/kv/batch.go b/pkg/kv/batch.go index 665ebbdbdc57..4ca3a632e842 100644 --- a/pkg/kv/batch.go +++ b/pkg/kv/batch.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/kv/bulk/buffering_adder.go b/pkg/kv/bulk/buffering_adder.go index 326fbc5dc1a2..e0aea67177a3 100644 --- a/pkg/kv/bulk/buffering_adder.go +++ b/pkg/kv/bulk/buffering_adder.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // BufferingAdder is a wrapper for an SSTBatcher that allows out-of-order calls diff --git a/pkg/kv/bulk/kv_buf.go b/pkg/kv/bulk/kv_buf.go index ce3e21a4e0d2..7b9b9f4029d8 100644 --- a/pkg/kv/bulk/kv_buf.go +++ b/pkg/kv/bulk/kv_buf.go @@ -14,7 +14,7 @@ import ( "bytes" "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // kvBuf collects []byte key-value pairs in a sortable buffer. diff --git a/pkg/kv/bulk/sst_batcher.go b/pkg/kv/bulk/sst_batcher.go index 76a31bac9296..26971013e321 100644 --- a/pkg/kv/bulk/sst_batcher.go +++ b/pkg/kv/bulk/sst_batcher.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/kv/client_test.go b/pkg/kv/client_test.go index e6410f7ab721..da55da728c44 100644 --- a/pkg/kv/client_test.go +++ b/pkg/kv/client_test.go @@ -37,8 +37,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) // testUser has valid client certs. diff --git a/pkg/kv/db.go b/pkg/kv/db.go index 36bb0ce6021e..3ed3cbbb2448 100644 --- a/pkg/kv/db.go +++ b/pkg/kv/db.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // KeyValue represents a single key/value pair. This is similar to diff --git a/pkg/kv/kvclient/kvcoord/batch.go b/pkg/kv/kvclient/kvcoord/batch.go index d516bf5f245f..d749b4d2dfe2 100644 --- a/pkg/kv/kvclient/kvcoord/batch.go +++ b/pkg/kv/kvclient/kvcoord/batch.go @@ -13,7 +13,7 @@ package kvcoord import ( "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var emptySpan = roachpb.Span{} diff --git a/pkg/kv/kvclient/kvcoord/dist_sender.go b/pkg/kv/kvclient/kvcoord/dist_sender.go index 4376140d38e7..a6700398cc82 100644 --- a/pkg/kv/kvclient/kvcoord/dist_sender.go +++ b/pkg/kv/kvclient/kvcoord/dist_sender.go @@ -36,7 +36,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/kv/kvclient/kvcoord/dist_sender_test.go b/pkg/kv/kvclient/kvcoord/dist_sender_test.go index a1577950fb25..e5b675bcdff4 100644 --- a/pkg/kv/kvclient/kvcoord/dist_sender_test.go +++ b/pkg/kv/kvclient/kvcoord/dist_sender_test.go @@ -43,7 +43,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvclient/kvcoord/range_cache.go b/pkg/kv/kvclient/kvcoord/range_cache.go index 3234a812f4a2..c3dcfdcc3c53 100644 --- a/pkg/kv/kvclient/kvcoord/range_cache.go +++ b/pkg/kv/kvclient/kvcoord/range_cache.go @@ -28,8 +28,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil/singleflight" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" ) // rangeCacheKey is the key type used to store and sort values in the diff --git a/pkg/kv/kvclient/kvcoord/range_cache_test.go b/pkg/kv/kvclient/kvcoord/range_cache_test.go index b1d68bef19a9..6b004ed51f34 100644 --- a/pkg/kv/kvclient/kvcoord/range_cache_test.go +++ b/pkg/kv/kvclient/kvcoord/range_cache_test.go @@ -24,8 +24,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) type testDescriptorDB struct { diff --git a/pkg/kv/kvclient/kvcoord/split_test.go b/pkg/kv/kvclient/kvcoord/split_test.go index ac78609b20b1..e4a32874761c 100644 --- a/pkg/kv/kvclient/kvcoord/split_test.go +++ b/pkg/kv/kvclient/kvcoord/split_test.go @@ -31,8 +31,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/randutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) // startTestWriter creates a writer which initiates a sequence of diff --git a/pkg/kv/kvclient/kvcoord/transport.go b/pkg/kv/kvclient/kvcoord/transport.go index fa2d729c15d7..ddde5e294ff0 100644 --- a/pkg/kv/kvclient/kvcoord/transport.go +++ b/pkg/kv/kvclient/kvcoord/transport.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) // A SendOptions structure describes the algorithm for sending RPCs to one or diff --git a/pkg/kv/kvclient/kvcoord/txn_coord_sender_test.go b/pkg/kv/kvclient/kvcoord/txn_coord_sender_test.go index 6c57f190ebd1..80987642baa3 100644 --- a/pkg/kv/kvclient/kvcoord/txn_coord_sender_test.go +++ b/pkg/kv/kvclient/kvcoord/txn_coord_sender_test.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kv/kvclient/kvcoord/txn_correctness_test.go b/pkg/kv/kvclient/kvcoord/txn_correctness_test.go index 510afe5f51e6..c1df32027944 100644 --- a/pkg/kv/kvclient/kvcoord/txn_correctness_test.go +++ b/pkg/kv/kvclient/kvcoord/txn_correctness_test.go @@ -32,7 +32,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type retryError struct { diff --git a/pkg/kv/kvclient/kvcoord/txn_interceptor_heartbeater_test.go b/pkg/kv/kvclient/kvcoord/txn_interceptor_heartbeater_test.go index 3679ac9f52dd..263c0e0ecb64 100644 --- a/pkg/kv/kvclient/kvcoord/txn_interceptor_heartbeater_test.go +++ b/pkg/kv/kvclient/kvcoord/txn_interceptor_heartbeater_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvclient/kvcoord/txn_test.go b/pkg/kv/kvclient/kvcoord/txn_test.go index 0492dec0d20b..e5073eaaedcf 100644 --- a/pkg/kv/kvclient/kvcoord/txn_test.go +++ b/pkg/kv/kvclient/kvcoord/txn_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/localtestcluster" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/abortspan/abortspan.go b/pkg/kv/kvserver/abortspan/abortspan.go index e337875be5a1..36f82bb8de51 100644 --- a/pkg/kv/kvserver/abortspan/abortspan.go +++ b/pkg/kv/kvserver/abortspan/abortspan.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // An AbortSpan sets markers for aborted transactions to provide protection diff --git a/pkg/kv/kvserver/addressing.go b/pkg/kv/kvserver/addressing.go index dfb0e3492b45..33ac948bdc49 100644 --- a/pkg/kv/kvserver/addressing.go +++ b/pkg/kv/kvserver/addressing.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type metaAction func(*kv.Batch, roachpb.Key, *roachpb.RangeDescriptor) diff --git a/pkg/kv/kvserver/allocator.go b/pkg/kv/kvserver/allocator.go index 29a0d50d6c28..1f0c1a44e10d 100644 --- a/pkg/kv/kvserver/allocator.go +++ b/pkg/kv/kvserver/allocator.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/tracker" ) diff --git a/pkg/kv/kvserver/allocator_test.go b/pkg/kv/kvserver/allocator_test.go index 3515400103bf..80f849ecb7f1 100644 --- a/pkg/kv/kvserver/allocator_test.go +++ b/pkg/kv/kvserver/allocator_test.go @@ -41,9 +41,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/olekukonko/tablewriter" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft" diff --git a/pkg/kv/kvserver/apply/task_test.go b/pkg/kv/kvserver/apply/task_test.go index 6bac8d5349c7..8806409a995b 100644 --- a/pkg/kv/kvserver/apply/task_test.go +++ b/pkg/kv/kvserver/apply/task_test.go @@ -16,7 +16,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/apply" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/batch_spanset_test.go b/pkg/kv/kvserver/batch_spanset_test.go index 60ff4f2268e0..10a2b5c7eb47 100644 --- a/pkg/kv/kvserver/batch_spanset_test.go +++ b/pkg/kv/kvserver/batch_spanset_test.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestSpanSetBatchBoundaries(t *testing.T) { diff --git a/pkg/kv/kvserver/batcheval/cmd_add_sstable.go b/pkg/kv/kvserver/batcheval/cmd_add_sstable.go index bb1b3b354980..a1670463bced 100644 --- a/pkg/kv/kvserver/batcheval/cmd_add_sstable.go +++ b/pkg/kv/kvserver/batcheval/cmd_add_sstable.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_push_txn.go b/pkg/kv/kvserver/batcheval/cmd_push_txn.go index 7a5545a6f2bf..b7163c9dfd5d 100644 --- a/pkg/kv/kvserver/batcheval/cmd_push_txn.go +++ b/pkg/kv/kvserver/batcheval/cmd_push_txn.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_query_txn.go b/pkg/kv/kvserver/batcheval/cmd_query_txn.go index a62804eac07c..0d52e8b46798 100644 --- a/pkg/kv/kvserver/batcheval/cmd_query_txn.go +++ b/pkg/kv/kvserver/batcheval/cmd_query_txn.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go b/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go index cad470533ffc..c1974eb1fc12 100644 --- a/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go +++ b/pkg/kv/kvserver/batcheval/cmd_recompute_stats.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_recover_txn.go b/pkg/kv/kvserver/batcheval/cmd_recover_txn.go index bdfc263febb4..44ee056731ec 100644 --- a/pkg/kv/kvserver/batcheval/cmd_recover_txn.go +++ b/pkg/kv/kvserver/batcheval/cmd_recover_txn.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_refresh.go b/pkg/kv/kvserver/batcheval/cmd_refresh.go index a7e6ded92086..13dfc6e7c783 100644 --- a/pkg/kv/kvserver/batcheval/cmd_refresh.go +++ b/pkg/kv/kvserver/batcheval/cmd_refresh.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_refresh_range.go b/pkg/kv/kvserver/batcheval/cmd_refresh_range.go index 0da3617762e7..3667cd26f460 100644 --- a/pkg/kv/kvserver/batcheval/cmd_refresh_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_refresh_range.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_revert_range.go b/pkg/kv/kvserver/batcheval/cmd_revert_range.go index 1dd0a302ae0e..218c8c91f379 100644 --- a/pkg/kv/kvserver/batcheval/cmd_revert_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_revert_range.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_subsume.go b/pkg/kv/kvserver/batcheval/cmd_subsume.go index 0f75dbae1e64..9435a9656f87 100644 --- a/pkg/kv/kvserver/batcheval/cmd_subsume.go +++ b/pkg/kv/kvserver/batcheval/cmd_subsume.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/spanset" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/storage" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/cmd_truncate_log.go b/pkg/kv/kvserver/batcheval/cmd_truncate_log.go index 35673db0c589..b35bd1539a2a 100644 --- a/pkg/kv/kvserver/batcheval/cmd_truncate_log.go +++ b/pkg/kv/kvserver/batcheval/cmd_truncate_log.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/kv/kvserver/batcheval/result/result.go b/pkg/kv/kvserver/batcheval/result/result.go index 784f078a46cc..950030208431 100644 --- a/pkg/kv/kvserver/batcheval/result/result.go +++ b/pkg/kv/kvserver/batcheval/result/result.go @@ -17,8 +17,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) // LocalResult is data belonging to an evaluated command that is diff --git a/pkg/kv/kvserver/batcheval/transaction.go b/pkg/kv/kvserver/batcheval/transaction.go index a1993fb7888b..a14e725f3850 100644 --- a/pkg/kv/kvserver/batcheval/transaction.go +++ b/pkg/kv/kvserver/batcheval/transaction.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ErrTransactionUnsupported is returned when a non-transactional command is diff --git a/pkg/kv/kvserver/cclglue.go b/pkg/kv/kvserver/cclglue.go index e94787ebdd19..5befa3535a54 100644 --- a/pkg/kv/kvserver/cclglue.go +++ b/pkg/kv/kvserver/cclglue.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/batcheval" "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var importCmdFn ImportCmdFunc = func(context.Context, batcheval.CommandArgs) (*roachpb.ImportResponse, error) { diff --git a/pkg/kv/kvserver/client_atomic_membership_change_test.go b/pkg/kv/kvserver/client_atomic_membership_change_test.go index 6030af6062c7..403d3646a366 100644 --- a/pkg/kv/kvserver/client_atomic_membership_change_test.go +++ b/pkg/kv/kvserver/client_atomic_membership_change_test.go @@ -21,8 +21,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/confchange" diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go index e669061177e4..4ec7682bef55 100644 --- a/pkg/kv/kvserver/client_merge_test.go +++ b/pkg/kv/kvserver/client_merge_test.go @@ -53,8 +53,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/raftpb" diff --git a/pkg/kv/kvserver/client_metrics_test.go b/pkg/kv/kvserver/client_metrics_test.go index a7a5ad2c7546..95a74e18e90f 100644 --- a/pkg/kv/kvserver/client_metrics_test.go +++ b/pkg/kv/kvserver/client_metrics_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/metric" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/client_protectedts_test.go b/pkg/kv/kvserver/client_protectedts_test.go index 8c9fe9abff0a..20db872d60dc 100644 --- a/pkg/kv/kvserver/client_protectedts_test.go +++ b/pkg/kv/kvserver/client_protectedts_test.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/client_raft_test.go b/pkg/kv/kvserver/client_raft_test.go index 3971badc3dcf..c23a1adc829f 100644 --- a/pkg/kv/kvserver/client_raft_test.go +++ b/pkg/kv/kvserver/client_raft_test.go @@ -52,7 +52,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft" diff --git a/pkg/kv/kvserver/client_replica_backpressure_test.go b/pkg/kv/kvserver/client_replica_backpressure_test.go index c9b0dcdc124b..fc821d06373b 100644 --- a/pkg/kv/kvserver/client_replica_backpressure_test.go +++ b/pkg/kv/kvserver/client_replica_backpressure_test.go @@ -28,8 +28,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/randutil" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/client_replica_gc_test.go b/pkg/kv/kvserver/client_replica_gc_test.go index 4abd16e0b4fe..e25a2a3a4192 100644 --- a/pkg/kv/kvserver/client_replica_gc_test.go +++ b/pkg/kv/kvserver/client_replica_gc_test.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TestReplicaGCQueueDropReplica verifies that a removed replica is diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go index a4bf3c748302..2a06dd61fd87 100644 --- a/pkg/kv/kvserver/client_replica_test.go +++ b/pkg/kv/kvserver/client_replica_test.go @@ -50,7 +50,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/raftpb" diff --git a/pkg/kv/kvserver/client_split_test.go b/pkg/kv/kvserver/client_split_test.go index c3bbec694f17..3c750747628a 100644 --- a/pkg/kv/kvserver/client_split_test.go +++ b/pkg/kv/kvserver/client_split_test.go @@ -57,8 +57,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/client_status_test.go b/pkg/kv/kvserver/client_status_test.go index 51940611df0f..d2a57f89eedd 100644 --- a/pkg/kv/kvserver/client_status_test.go +++ b/pkg/kv/kvserver/client_status_test.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestComputeStatsForKeySpan(t *testing.T) { diff --git a/pkg/kv/kvserver/client_test.go b/pkg/kv/kvserver/client_test.go index d7f48fd02fc1..9b2a203e2a32 100644 --- a/pkg/kv/kvserver/client_test.go +++ b/pkg/kv/kvserver/client_test.go @@ -61,8 +61,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft" "google.golang.org/grpc" diff --git a/pkg/kv/kvserver/closed_timestamp_test.go b/pkg/kv/kvserver/closed_timestamp_test.go index c8831630a28e..7c5371817665 100644 --- a/pkg/kv/kvserver/closed_timestamp_test.go +++ b/pkg/kv/kvserver/closed_timestamp_test.go @@ -36,7 +36,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kv/kvserver/closedts/container/container_test.go b/pkg/kv/kvserver/closedts/container/container_test.go index f447675b865e..01e63709c8ce 100644 --- a/pkg/kv/kvserver/closedts/container/container_test.go +++ b/pkg/kv/kvserver/closedts/container/container_test.go @@ -29,8 +29,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/closedts/minprop/tracker_test.go b/pkg/kv/kvserver/closedts/minprop/tracker_test.go index 7771b0e57431..cbc8bc7c6636 100644 --- a/pkg/kv/kvserver/closedts/minprop/tracker_test.go +++ b/pkg/kv/kvserver/closedts/minprop/tracker_test.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kv/kvserver/closedts/provider/provider_test.go b/pkg/kv/kvserver/closedts/provider/provider_test.go index aa0dd6357aee..9901c669053d 100644 --- a/pkg/kv/kvserver/closedts/provider/provider_test.go +++ b/pkg/kv/kvserver/closedts/provider/provider_test.go @@ -29,8 +29,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kv/kvserver/closedts/storage/storage_test.go b/pkg/kv/kvserver/closedts/storage/storage_test.go index 0742db43ca58..a09856b9a7cd 100644 --- a/pkg/kv/kvserver/closedts/storage/storage_test.go +++ b/pkg/kv/kvserver/closedts/storage/storage_test.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kv/kvserver/closedts/transport/transport_test.go b/pkg/kv/kvserver/closedts/transport/transport_test.go index 2b32f7fb819b..81cadd6030c3 100644 --- a/pkg/kv/kvserver/closedts/transport/transport_test.go +++ b/pkg/kv/kvserver/closedts/transport/transport_test.go @@ -25,8 +25,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) // NewTestContainer sets up an environment suitable for black box testing the diff --git a/pkg/kv/kvserver/compactor/compactor.go b/pkg/kv/kvserver/compactor/compactor.go index 83d7944c24d5..690b559d7cc7 100644 --- a/pkg/kv/kvserver/compactor/compactor.go +++ b/pkg/kv/kvserver/compactor/compactor.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" ) type storeCapacityFunc func() (roachpb.StoreCapacity, error) diff --git a/pkg/kv/kvserver/compactor/compactor_test.go b/pkg/kv/kvserver/compactor/compactor_test.go index 181cc70cce0e..1b55ede0e3aa 100644 --- a/pkg/kv/kvserver/compactor/compactor_test.go +++ b/pkg/kv/kvserver/compactor/compactor_test.go @@ -30,7 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const testCompactionLatency = 1 * time.Millisecond diff --git a/pkg/kv/kvserver/compactor/settings.go b/pkg/kv/kvserver/compactor/settings.go index b38c3901f895..88209b25d094 100644 --- a/pkg/kv/kvserver/compactor/settings.go +++ b/pkg/kv/kvserver/compactor/settings.go @@ -14,7 +14,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/settings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func validateFraction(v float64) error { diff --git a/pkg/kv/kvserver/gc_queue.go b/pkg/kv/kvserver/gc_queue.go index a20136ef6f68..987d65b4521a 100644 --- a/pkg/kv/kvserver/gc_queue.go +++ b/pkg/kv/kvserver/gc_queue.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/kv/kvserver/gc_queue_test.go b/pkg/kv/kvserver/gc_queue_test.go index 262ffa3186a0..943e8234d578 100644 --- a/pkg/kv/kvserver/gc_queue_test.go +++ b/pkg/kv/kvserver/gc_queue_test.go @@ -36,8 +36,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "golang.org/x/sync/syncmap" ) diff --git a/pkg/kv/kvserver/helpers_test.go b/pkg/kv/kvserver/helpers_test.go index c9a93c990755..c36800cfe83c 100644 --- a/pkg/kv/kvserver/helpers_test.go +++ b/pkg/kv/kvserver/helpers_test.go @@ -41,7 +41,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/quotapool" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" ) diff --git a/pkg/kv/kvserver/idalloc/id_alloc.go b/pkg/kv/kvserver/idalloc/id_alloc.go index 220acce6646a..eb544eb16852 100644 --- a/pkg/kv/kvserver/idalloc/id_alloc.go +++ b/pkg/kv/kvserver/idalloc/id_alloc.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // An Allocator is used to increment a key in allocation blocks diff --git a/pkg/kv/kvserver/idalloc/id_alloc_test.go b/pkg/kv/kvserver/idalloc/id_alloc_test.go index 06691ea8bdee..760a33b249ef 100644 --- a/pkg/kv/kvserver/idalloc/id_alloc_test.go +++ b/pkg/kv/kvserver/idalloc/id_alloc_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // newTestAllocator creates and returns a new idalloc.Allocator, backed by a diff --git a/pkg/kv/kvserver/intentresolver/intent_resolver.go b/pkg/kv/kvserver/intentresolver/intent_resolver.go index d45031efa4c8..c07aa369f4ec 100644 --- a/pkg/kv/kvserver/intentresolver/intent_resolver.go +++ b/pkg/kv/kvserver/intentresolver/intent_resolver.go @@ -32,7 +32,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/kv/kvserver/intentresolver/intent_resolver_test.go b/pkg/kv/kvserver/intentresolver/intent_resolver_test.go index 1665b8476e21..07498770b383 100644 --- a/pkg/kv/kvserver/intentresolver/intent_resolver_test.go +++ b/pkg/kv/kvserver/intentresolver/intent_resolver_test.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/kv/kvserver/log.go b/pkg/kv/kvserver/log.go index aebb711daa64..3265366d2ffb 100644 --- a/pkg/kv/kvserver/log.go +++ b/pkg/kv/kvserver/log.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func (s *Store) insertRangeLogEvent( diff --git a/pkg/kv/kvserver/merge_queue.go b/pkg/kv/kvserver/merge_queue.go index 8386ca59ef5c..eb623cb83794 100644 --- a/pkg/kv/kvserver/merge_queue.go +++ b/pkg/kv/kvserver/merge_queue.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/kv/kvserver/node_liveness.go b/pkg/kv/kvserver/node_liveness.go index c43cb9a71207..969d275acac6 100644 --- a/pkg/kv/kvserver/node_liveness.go +++ b/pkg/kv/kvserver/node_liveness.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/kv/kvserver/node_liveness_test.go b/pkg/kv/kvserver/node_liveness_test.go index 5942849038ef..c781f0e1affa 100644 --- a/pkg/kv/kvserver/node_liveness_test.go +++ b/pkg/kv/kvserver/node_liveness_test.go @@ -37,9 +37,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/protectedts/ptcache/cache.go b/pkg/kv/kvserver/protectedts/ptcache/cache.go index 0c333d4d2c8f..b4102872520f 100644 --- a/pkg/kv/kvserver/protectedts/ptcache/cache.go +++ b/pkg/kv/kvserver/protectedts/ptcache/cache.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil/singleflight" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Cache implements protectedts.Cache. diff --git a/pkg/kv/kvserver/protectedts/ptcache/cache_test.go b/pkg/kv/kvserver/protectedts/ptcache/cache_test.go index f126b0892f4f..8f289ffe6e38 100644 --- a/pkg/kv/kvserver/protectedts/ptcache/cache_test.go +++ b/pkg/kv/kvserver/protectedts/ptcache/cache_test.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/protectedts/ptverifier/verifier.go b/pkg/kv/kvserver/protectedts/ptverifier/verifier.go index 3969f70a77ee..c12b6eba6281 100644 --- a/pkg/kv/kvserver/protectedts/ptverifier/verifier.go +++ b/pkg/kv/kvserver/protectedts/ptverifier/verifier.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // verifier implements protectedts.Verifier. diff --git a/pkg/kv/kvserver/queue.go b/pkg/kv/kvserver/queue.go index f3ba6ef24b97..93d8e050f764 100644 --- a/pkg/kv/kvserver/queue.go +++ b/pkg/kv/kvserver/queue.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/kv/kvserver/queue_helpers_testutil.go b/pkg/kv/kvserver/queue_helpers_testutil.go index cda7b4f89b9a..31cf64f7154f 100644 --- a/pkg/kv/kvserver/queue_helpers_testutil.go +++ b/pkg/kv/kvserver/queue_helpers_testutil.go @@ -14,7 +14,7 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Code in this file is for testing usage only. It is exported only because it diff --git a/pkg/kv/kvserver/queue_test.go b/pkg/kv/kvserver/queue_test.go index de0fac377b63..a8ab00197755 100644 --- a/pkg/kv/kvserver/queue_test.go +++ b/pkg/kv/kvserver/queue_test.go @@ -34,8 +34,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/raft_log_queue.go b/pkg/kv/kvserver/raft_log_queue.go index 5637e6c9a1c0..d735d71980ec 100644 --- a/pkg/kv/kvserver/raft_log_queue.go +++ b/pkg/kv/kvserver/raft_log_queue.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/tracker" ) diff --git a/pkg/kv/kvserver/raft_log_queue_test.go b/pkg/kv/kvserver/raft_log_queue_test.go index bceeb115c01d..eca1228c6edd 100644 --- a/pkg/kv/kvserver/raft_log_queue_test.go +++ b/pkg/kv/kvserver/raft_log_queue_test.go @@ -30,7 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/tracker" diff --git a/pkg/kv/kvserver/raft_snapshot_queue.go b/pkg/kv/kvserver/raft_snapshot_queue.go index cd6941c2cef9..07f006bb69cf 100644 --- a/pkg/kv/kvserver/raft_snapshot_queue.go +++ b/pkg/kv/kvserver/raft_snapshot_queue.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft/tracker" ) diff --git a/pkg/kv/kvserver/raft_transport.go b/pkg/kv/kvserver/raft_transport.go index 1d4ee995e9ea..3b642536f0e6 100644 --- a/pkg/kv/kvserver/raft_transport.go +++ b/pkg/kv/kvserver/raft_transport.go @@ -30,7 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft/raftpb" "google.golang.org/grpc" ) diff --git a/pkg/kv/kvserver/raft_transport_test.go b/pkg/kv/kvserver/raft_transport_test.go index 20e75096a7a2..207cf6d436a1 100644 --- a/pkg/kv/kvserver/raft_transport_test.go +++ b/pkg/kv/kvserver/raft_transport_test.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/raft_transport_unit_test.go b/pkg/kv/kvserver/raft_transport_unit_test.go index 104e33da8850..b0bc28275e6f 100644 --- a/pkg/kv/kvserver/raft_transport_unit_test.go +++ b/pkg/kv/kvserver/raft_transport_unit_test.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestRaftTransportStartNewQueue(t *testing.T) { diff --git a/pkg/kv/kvserver/raftentry/cache.go b/pkg/kv/kvserver/raftentry/cache.go index f1f04b0aa660..0dbe7f9a7c93 100644 --- a/pkg/kv/kvserver/raftentry/cache.go +++ b/pkg/kv/kvserver/raftentry/cache.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/rangefeed/registry.go b/pkg/kv/kvserver/rangefeed/registry.go index f94c46463df5..3774860830bd 100644 --- a/pkg/kv/kvserver/rangefeed/registry.go +++ b/pkg/kv/kvserver/rangefeed/registry.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Stream is a object capable of transmitting RangeFeedEvents. diff --git a/pkg/kv/kvserver/rangefeed/task.go b/pkg/kv/kvserver/rangefeed/task.go index 2643dc2f65cd..83d9b3ddbd5a 100644 --- a/pkg/kv/kvserver/rangefeed/task.go +++ b/pkg/kv/kvserver/rangefeed/task.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // A runnable can be run as an async task. diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go index 9beadaf19e2e..fd1477249d12 100644 --- a/pkg/kv/kvserver/replica.go +++ b/pkg/kv/kvserver/replica.go @@ -52,9 +52,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/google/btree" "github.com/kr/pretty" - "github.com/pkg/errors" "go.etcd.io/etcd/raft" ) diff --git a/pkg/kv/kvserver/replica_application_state_machine.go b/pkg/kv/kvserver/replica_application_state_machine.go index 02884f5c963a..5186a31e236b 100644 --- a/pkg/kv/kvserver/replica_application_state_machine.go +++ b/pkg/kv/kvserver/replica_application_state_machine.go @@ -25,8 +25,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/replica_backpressure.go b/pkg/kv/kvserver/replica_backpressure.go index 370ae015d694..7cd8e83f0c94 100644 --- a/pkg/kv/kvserver/replica_backpressure.go +++ b/pkg/kv/kvserver/replica_backpressure.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var backpressureLogLimiter = log.Every(500 * time.Millisecond) diff --git a/pkg/kv/kvserver/replica_batch_updates.go b/pkg/kv/kvserver/replica_batch_updates.go index e18fbbce093e..27605fdd6794 100644 --- a/pkg/kv/kvserver/replica_batch_updates.go +++ b/pkg/kv/kvserver/replica_batch_updates.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ---------------------------------------------------------------------------- diff --git a/pkg/kv/kvserver/replica_command.go b/pkg/kv/kvserver/replica_command.go index b4eeabd065e9..3fb3e1494940 100644 --- a/pkg/kv/kvserver/replica_command.go +++ b/pkg/kv/kvserver/replica_command.go @@ -39,10 +39,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/retry" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - crdberrors "github.com/cockroachdb/errors" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/raftpb" "go.etcd.io/etcd/raft/tracker" @@ -2139,7 +2138,7 @@ func (s *Store) relocateOne( if len(rangeReplicas) != len(desc.Replicas().Voters()) { // The caller removed all the learners, so there shouldn't be anything but // voters. - return nil, nil, crdberrors.AssertionFailedf( + return nil, nil, errors.AssertionFailedf( `range %s had non-voter replicas: %v`, desc, desc.Replicas()) } diff --git a/pkg/kv/kvserver/replica_consistency.go b/pkg/kv/kvserver/replica_consistency.go index facc7fff09a6..e670c2d0ac98 100644 --- a/pkg/kv/kvserver/replica_consistency.go +++ b/pkg/kv/kvserver/replica_consistency.go @@ -39,7 +39,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // fatalOnStatsMismatch, if true, turns stats mismatches into fatal errors. A diff --git a/pkg/kv/kvserver/replica_destroy.go b/pkg/kv/kvserver/replica_destroy.go index 527aaf332e24..47e84cf37850 100644 --- a/pkg/kv/kvserver/replica_destroy.go +++ b/pkg/kv/kvserver/replica_destroy.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // DestroyReason indicates if a replica is alive, destroyed, corrupted or pending destruction. diff --git a/pkg/kv/kvserver/replica_gc_queue.go b/pkg/kv/kvserver/replica_gc_queue.go index 98b2080c91ed..f645c1bd6d71 100644 --- a/pkg/kv/kvserver/replica_gc_queue.go +++ b/pkg/kv/kvserver/replica_gc_queue.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/metric" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" ) diff --git a/pkg/kv/kvserver/replica_gossip.go b/pkg/kv/kvserver/replica_gossip.go index 7400bf91ef14..1529a997ac68 100644 --- a/pkg/kv/kvserver/replica_gossip.go +++ b/pkg/kv/kvserver/replica_gossip.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagepb" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const configGossipTTL = 0 // does not expire diff --git a/pkg/kv/kvserver/replica_init.go b/pkg/kv/kvserver/replica_init.go index dbb25634bf07..9619f1f043ed 100644 --- a/pkg/kv/kvserver/replica_init.go +++ b/pkg/kv/kvserver/replica_init.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" ) diff --git a/pkg/kv/kvserver/replica_proposal_buf_test.go b/pkg/kv/kvserver/replica_proposal_buf_test.go index 11a7b138e6b0..2f81e2556207 100644 --- a/pkg/kv/kvserver/replica_proposal_buf_test.go +++ b/pkg/kv/kvserver/replica_proposal_buf_test.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft" diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go index 057956d87a6d..8da15f5b8219 100644 --- a/pkg/kv/kvserver/replica_raft.go +++ b/pkg/kv/kvserver/replica_raft.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/raftpb" "go.etcd.io/etcd/raft/tracker" diff --git a/pkg/kv/kvserver/replica_raftstorage.go b/pkg/kv/kvserver/replica_raftstorage.go index c105574f6629..b37364242429 100644 --- a/pkg/kv/kvserver/replica_raftstorage.go +++ b/pkg/kv/kvserver/replica_raftstorage.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/replica_range_lease.go b/pkg/kv/kvserver/replica_range_lease.go index bb8f2a699716..4caf3f023f3b 100644 --- a/pkg/kv/kvserver/replica_range_lease.go +++ b/pkg/kv/kvserver/replica_range_lease.go @@ -55,9 +55,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) var leaseStatusLogLimiter = log.Every(5 * time.Second) diff --git a/pkg/kv/kvserver/replica_rangefeed.go b/pkg/kv/kvserver/replica_rangefeed.go index 36d249c0e1da..82e50a70767e 100644 --- a/pkg/kv/kvserver/replica_rangefeed.go +++ b/pkg/kv/kvserver/replica_rangefeed.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // RangefeedEnabled is a cluster setting that enables rangefeed requests. diff --git a/pkg/kv/kvserver/replica_rangefeed_test.go b/pkg/kv/kvserver/replica_rangefeed_test.go index 7dd8d3e14a04..76ad35e4b121 100644 --- a/pkg/kv/kvserver/replica_rangefeed_test.go +++ b/pkg/kv/kvserver/replica_rangefeed_test.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/raftpb" diff --git a/pkg/kv/kvserver/replica_send.go b/pkg/kv/kvserver/replica_send.go index 6a416b7efde8..16241378eefe 100644 --- a/pkg/kv/kvserver/replica_send.go +++ b/pkg/kv/kvserver/replica_send.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) // Send executes a command on this range, dispatching it to the diff --git a/pkg/kv/kvserver/replica_sideload.go b/pkg/kv/kvserver/replica_sideload.go index 26bebfa31b7e..9f07dcb01309 100644 --- a/pkg/kv/kvserver/replica_sideload.go +++ b/pkg/kv/kvserver/replica_sideload.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/replica_sideload_disk.go b/pkg/kv/kvserver/replica_sideload_disk.go index c8e635653b39..6189335633ab 100644 --- a/pkg/kv/kvserver/replica_sideload_disk.go +++ b/pkg/kv/kvserver/replica_sideload_disk.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/time/rate" ) diff --git a/pkg/kv/kvserver/replica_sideload_test.go b/pkg/kv/kvserver/replica_sideload_test.go index 340e435a7e1d..47652732bc3c 100644 --- a/pkg/kv/kvserver/replica_sideload_test.go +++ b/pkg/kv/kvserver/replica_sideload_test.go @@ -41,8 +41,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" "go.etcd.io/etcd/raft/raftpb" "golang.org/x/time/rate" ) diff --git a/pkg/kv/kvserver/replica_sst_snapshot_storage.go b/pkg/kv/kvserver/replica_sst_snapshot_storage.go index 8bebc02570f0..7d189380905c 100644 --- a/pkg/kv/kvserver/replica_sst_snapshot_storage.go +++ b/pkg/kv/kvserver/replica_sst_snapshot_storage.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/storage/fs" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/time/rate" ) diff --git a/pkg/kv/kvserver/replica_test.go b/pkg/kv/kvserver/replica_test.go index ea7030850833..0f96d3cbe85b 100644 --- a/pkg/kv/kvserver/replica_test.go +++ b/pkg/kv/kvserver/replica_test.go @@ -64,11 +64,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" "github.com/gogo/protobuf/proto" "github.com/kr/pretty" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft" diff --git a/pkg/kv/kvserver/replicate_queue_test.go b/pkg/kv/kvserver/replicate_queue_test.go index 1f990930f497..74d435461def 100644 --- a/pkg/kv/kvserver/replicate_queue_test.go +++ b/pkg/kv/kvserver/replicate_queue_test.go @@ -33,8 +33,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft/tracker" ) diff --git a/pkg/kv/kvserver/replicate_test.go b/pkg/kv/kvserver/replicate_test.go index 10affcb6294b..dd6c163d837a 100644 --- a/pkg/kv/kvserver/replicate_test.go +++ b/pkg/kv/kvserver/replicate_test.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestEagerReplication(t *testing.T) { diff --git a/pkg/kv/kvserver/scanner_test.go b/pkg/kv/kvserver/scanner_test.go index 2ad6ce81391c..87d65bcf3bb4 100644 --- a/pkg/kv/kvserver/scanner_test.go +++ b/pkg/kv/kvserver/scanner_test.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/google/btree" - "github.com/pkg/errors" ) func makeAmbCtx() log.AmbientContext { diff --git a/pkg/kv/kvserver/scheduler_test.go b/pkg/kv/kvserver/scheduler_test.go index c011761e29de..e450c880c439 100644 --- a/pkg/kv/kvserver/scheduler_test.go +++ b/pkg/kv/kvserver/scheduler_test.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestRangeIDChunk(t *testing.T) { diff --git a/pkg/kv/kvserver/single_key_test.go b/pkg/kv/kvserver/single_key_test.go index f88302eb0ca3..0063df4b526b 100644 --- a/pkg/kv/kvserver/single_key_test.go +++ b/pkg/kv/kvserver/single_key_test.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TestSingleKey stresses the transaction retry machinery by starting diff --git a/pkg/kv/kvserver/spanset/spanset.go b/pkg/kv/kvserver/spanset/spanset.go index 6006e6e5e299..faffc8f877b3 100644 --- a/pkg/kv/kvserver/spanset/spanset.go +++ b/pkg/kv/kvserver/spanset/spanset.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // SpanAccess records the intended mode of access in a SpanSet. diff --git a/pkg/kv/kvserver/split_queue.go b/pkg/kv/kvserver/split_queue.go index 60303232fe37..006d7d4bc7ba 100644 --- a/pkg/kv/kvserver/split_queue.go +++ b/pkg/kv/kvserver/split_queue.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/kv/kvserver/stateloader/initial.go b/pkg/kv/kvserver/stateloader/initial.go index 710a2ce2ccf5..aa1da0c45fd2 100644 --- a/pkg/kv/kvserver/stateloader/initial.go +++ b/pkg/kv/kvserver/stateloader/initial.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // raftInitialLog{Index,Term} are the starting points for the raft log. We diff --git a/pkg/kv/kvserver/stateloader/stateloader.go b/pkg/kv/kvserver/stateloader/stateloader.go index f2b0588b6818..95eb8e09fa87 100644 --- a/pkg/kv/kvserver/stateloader/stateloader.go +++ b/pkg/kv/kvserver/stateloader/stateloader.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/store_bootstrap.go b/pkg/kv/kvserver/store_bootstrap.go index 273fda51da3b..70f778212078 100644 --- a/pkg/kv/kvserver/store_bootstrap.go +++ b/pkg/kv/kvserver/store_bootstrap.go @@ -21,8 +21,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) // InitEngine writes a new store ident to the underlying engine. To diff --git a/pkg/kv/kvserver/store_create_replica.go b/pkg/kv/kvserver/store_create_replica.go index 149bb3f86499..d4d2e15b5760 100644 --- a/pkg/kv/kvserver/store_create_replica.go +++ b/pkg/kv/kvserver/store_create_replica.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var errRetry = errors.New("retry: orphaned replica") diff --git a/pkg/kv/kvserver/store_merge.go b/pkg/kv/kvserver/store_merge.go index 94d6de4fd3cd..0cec083052d5 100644 --- a/pkg/kv/kvserver/store_merge.go +++ b/pkg/kv/kvserver/store_merge.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // MergeRange expands the left-hand replica, leftRepl, to absorb the right-hand diff --git a/pkg/kv/kvserver/store_pool.go b/pkg/kv/kvserver/store_pool.go index 19f472e09300..0b6e629db604 100644 --- a/pkg/kv/kvserver/store_pool.go +++ b/pkg/kv/kvserver/store_pool.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/shuffle" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/kv/kvserver/store_pool_test.go b/pkg/kv/kvserver/store_pool_test.go index ec04d1b6cd16..d7c8f93c6992 100644 --- a/pkg/kv/kvserver/store_pool_test.go +++ b/pkg/kv/kvserver/store_pool_test.go @@ -37,8 +37,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) var uniqueStore = []*roachpb.StoreDescriptor{ diff --git a/pkg/kv/kvserver/store_remove_replica.go b/pkg/kv/kvserver/store_remove_replica.go index 9457ca5ba086..a227c40f5109 100644 --- a/pkg/kv/kvserver/store_remove_replica.go +++ b/pkg/kv/kvserver/store_remove_replica.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // RemoveOptions bundles boolean parameters for Store.RemoveReplica. diff --git a/pkg/kv/kvserver/store_snapshot.go b/pkg/kv/kvserver/store_snapshot.go index 26aa6c96a685..620a3051f7a6 100644 --- a/pkg/kv/kvserver/store_snapshot.go +++ b/pkg/kv/kvserver/store_snapshot.go @@ -28,8 +28,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" crdberrors "github.com/cockroachdb/errors" - "github.com/pkg/errors" "go.etcd.io/etcd/raft/raftpb" "golang.org/x/time/rate" ) diff --git a/pkg/kv/kvserver/store_split.go b/pkg/kv/kvserver/store_split.go index f4e42376c949..5677d81b4494 100644 --- a/pkg/kv/kvserver/store_split.go +++ b/pkg/kv/kvserver/store_split.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/kv/kvserver/store_test.go b/pkg/kv/kvserver/store_test.go index ce61577aae29..c89263b7a68a 100644 --- a/pkg/kv/kvserver/store_test.go +++ b/pkg/kv/kvserver/store_test.go @@ -52,9 +52,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "go.etcd.io/etcd/raft" "go.etcd.io/etcd/raft/raftpb" diff --git a/pkg/kv/kvserver/stores.go b/pkg/kv/kvserver/stores.go index 57548a953b49..875505b87fb5 100644 --- a/pkg/kv/kvserver/stores.go +++ b/pkg/kv/kvserver/stores.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Stores provides methods to access a collection of stores. There's diff --git a/pkg/kv/kvserver/ts_maintenance_queue_test.go b/pkg/kv/kvserver/ts_maintenance_queue_test.go index de6dda586c14..b0211ec17d6e 100644 --- a/pkg/kv/kvserver/ts_maintenance_queue_test.go +++ b/pkg/kv/kvserver/ts_maintenance_queue_test.go @@ -35,8 +35,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) type modelTimeSeriesDataStore struct { diff --git a/pkg/kv/kvserver/tscache/cache_test.go b/pkg/kv/kvserver/tscache/cache_test.go index bdbffb6fb3b6..195082490883 100644 --- a/pkg/kv/kvserver/tscache/cache_test.go +++ b/pkg/kv/kvserver/tscache/cache_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/kv/kvserver/txn_wait_queue_test.go b/pkg/kv/kvserver/txn_wait_queue_test.go index b682bb3b675f..9973562efa22 100644 --- a/pkg/kv/kvserver/txn_wait_queue_test.go +++ b/pkg/kv/kvserver/txn_wait_queue_test.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/kv/kvserver/txnrecovery/manager.go b/pkg/kv/kvserver/txnrecovery/manager.go index f9e510a572bf..df3fe03b4be9 100644 --- a/pkg/kv/kvserver/txnrecovery/manager.go +++ b/pkg/kv/kvserver/txnrecovery/manager.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil/singleflight" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Manager organizes the recovery of transactions whose states require global diff --git a/pkg/kv/range_lookup.go b/pkg/kv/range_lookup.go index 1cdf6d5fa69a..c4c9dc6fc240 100644 --- a/pkg/kv/range_lookup.go +++ b/pkg/kv/range_lookup.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // RangeLookup is used to look up RangeDescriptors - a RangeDescriptor is a diff --git a/pkg/kv/txn_test.go b/pkg/kv/txn_test.go index 003ea4bffb38..5857fc171a18 100644 --- a/pkg/kv/txn_test.go +++ b/pkg/kv/txn_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/roachpb/api.go b/pkg/roachpb/api.go index e3f76334ea63..b13fb4130bd2 100644 --- a/pkg/roachpb/api.go +++ b/pkg/roachpb/api.go @@ -17,7 +17,7 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // UserPriority is a custom type for transaction's user priority. diff --git a/pkg/roachpb/data.go b/pkg/roachpb/data.go index 81f14addf807..e4483b7abdcc 100644 --- a/pkg/roachpb/data.go +++ b/pkg/roachpb/data.go @@ -40,7 +40,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timetz" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/raft/raftpb" ) diff --git a/pkg/roachpb/metadata.go b/pkg/roachpb/metadata.go index 8fe56e00b382..bb375a87eb8f 100644 --- a/pkg/roachpb/metadata.go +++ b/pkg/roachpb/metadata.go @@ -19,8 +19,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) // NodeID is a custom type for a cockroach node ID. (not a raft node ID) diff --git a/pkg/roachpb/metadata_test.go b/pkg/roachpb/metadata_test.go index 058487184d11..73a0b55ba827 100644 --- a/pkg/roachpb/metadata_test.go +++ b/pkg/roachpb/metadata_test.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestPercentilesFromData(t *testing.T) { diff --git a/pkg/roachpb/version.go b/pkg/roachpb/version.go index 21560820c752..9435e93d3159 100644 --- a/pkg/roachpb/version.go +++ b/pkg/roachpb/version.go @@ -15,7 +15,7 @@ import ( "strconv" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Less compares two Versions. diff --git a/pkg/rpc/context.go b/pkg/rpc/context.go index 08c914c1f09a..a31f93aaeec4 100644 --- a/pkg/rpc/context.go +++ b/pkg/rpc/context.go @@ -38,9 +38,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "golang.org/x/sync/syncmap" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/pkg/rpc/context_test.go b/pkg/rpc/context_test.go index ea9f4550a939..e7a1f0ece070 100644 --- a/pkg/rpc/context_test.go +++ b/pkg/rpc/context_test.go @@ -37,8 +37,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/pkg/rpc/heartbeat.go b/pkg/rpc/heartbeat.go index 137ce68999a3..90532161af07 100644 --- a/pkg/rpc/heartbeat.go +++ b/pkg/rpc/heartbeat.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func (r RemoteOffset) measuredAt() time.Time { diff --git a/pkg/rpc/nodedialer/nodedialer.go b/pkg/rpc/nodedialer/nodedialer.go index 4ab86be3a84c..924b0d93b578 100644 --- a/pkg/rpc/nodedialer/nodedialer.go +++ b/pkg/rpc/nodedialer/nodedialer.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "google.golang.org/grpc" ) diff --git a/pkg/rpc/nodedialer/nodedialer_test.go b/pkg/rpc/nodedialer/nodedialer_test.go index e8c333a2d86b..89373e362ca2 100644 --- a/pkg/rpc/nodedialer/nodedialer_test.go +++ b/pkg/rpc/nodedialer/nodedialer_test.go @@ -32,7 +32,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "google.golang.org/grpc" ) diff --git a/pkg/security/auth.go b/pkg/security/auth.go index 9987bc2ab3c2..bd4049b2e2df 100644 --- a/pkg/security/auth.go +++ b/pkg/security/auth.go @@ -16,7 +16,7 @@ import ( "strings" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/security/certificate_loader.go b/pkg/security/certificate_loader.go index 9d0ff8680258..9eb7928c62c1 100644 --- a/pkg/security/certificate_loader.go +++ b/pkg/security/certificate_loader.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/envutil" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/security/certificate_manager.go b/pkg/security/certificate_manager.go index 1092ad1bfbd1..e3d838902063 100644 --- a/pkg/security/certificate_manager.go +++ b/pkg/security/certificate_manager.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/sysutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/security/certs.go b/pkg/security/certs.go index 78b67a343b4c..8f38a812df8c 100644 --- a/pkg/security/certs.go +++ b/pkg/security/certs.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/envutil" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/security/certs_rotation_test.go b/pkg/security/certs_rotation_test.go index b3b5d71b61de..631f35481eb8 100644 --- a/pkg/security/certs_rotation_test.go +++ b/pkg/security/certs_rotation_test.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sys/unix" ) diff --git a/pkg/security/certs_test.go b/pkg/security/certs_test.go index 7b5ecc2a042e..7af1755d9057 100644 --- a/pkg/security/certs_test.go +++ b/pkg/security/certs_test.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const testKeySize = 1024 diff --git a/pkg/security/password.go b/pkg/security/password.go index d105b8da6056..fb3e69d7d791 100644 --- a/pkg/security/password.go +++ b/pkg/security/password.go @@ -15,7 +15,7 @@ import ( "fmt" "os" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/crypto/bcrypt" "golang.org/x/crypto/ssh/terminal" ) diff --git a/pkg/security/pem.go b/pkg/security/pem.go index 462fa5a1eeb1..c813362dacd3 100644 --- a/pkg/security/pem.go +++ b/pkg/security/pem.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // WritePEMToFile writes an arbitrary number of PEM blocks to a file. diff --git a/pkg/security/tls.go b/pkg/security/tls.go index fdb380837eb9..e1576771f5f2 100644 --- a/pkg/security/tls.go +++ b/pkg/security/tls.go @@ -14,7 +14,7 @@ import ( "crypto/tls" "crypto/x509" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // EmbeddedCertsDir is the certs directory inside embedded assets. diff --git a/pkg/security/x509.go b/pkg/security/x509.go index 04088980d0b0..c305842d5e24 100644 --- a/pkg/security/x509.go +++ b/pkg/security/x509.go @@ -20,7 +20,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Utility to generate x509 certificates, both CA and not. diff --git a/pkg/server/admin_cluster_test.go b/pkg/server/admin_cluster_test.go index 5d4f121627aa..4b5524eb6964 100644 --- a/pkg/server/admin_cluster_test.go +++ b/pkg/server/admin_cluster_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestAdminAPITableStats(t *testing.T) { diff --git a/pkg/server/admin_test.go b/pkg/server/admin_test.go index f3014750ea4b..280a79fe2fdd 100644 --- a/pkg/server/admin_test.go +++ b/pkg/server/admin_test.go @@ -51,8 +51,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/authentication_test.go b/pkg/server/authentication_test.go index 2656620798be..246906daf947 100644 --- a/pkg/server/authentication_test.go +++ b/pkg/server/authentication_test.go @@ -41,9 +41,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/jsonpb" "github.com/lib/pq" - "github.com/pkg/errors" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/pkg/server/config.go b/pkg/server/config.go index 91fc62d40656..7d31f5695226 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -35,9 +35,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/retry" + "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble" "github.com/elastic/gosigar" - "github.com/pkg/errors" ) // Context defaults. diff --git a/pkg/server/config_unix.go b/pkg/server/config_unix.go index 5323c0df2d4d..e63d850b2dfb 100644 --- a/pkg/server/config_unix.go +++ b/pkg/server/config_unix.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // rlimit is a replacement struct for `unix.Rlimit` which abstracts diff --git a/pkg/server/debug/logspy.go b/pkg/server/debug/logspy.go index d75970951c28..4434224f4c78 100644 --- a/pkg/server/debug/logspy.go +++ b/pkg/server/debug/logspy.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/caller" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // regexpAsString wraps a *regexp.Regexp for better printing and diff --git a/pkg/server/debug/logspy_test.go b/pkg/server/debug/logspy_test.go index 4e29ae08281e..76efa8f5a5fc 100644 --- a/pkg/server/debug/logspy_test.go +++ b/pkg/server/debug/logspy_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestDebugLogSpyOptions(t *testing.T) { diff --git a/pkg/server/debug/pprofui/server.go b/pkg/server/debug/pprofui/server.go index 60cc879dc1fd..beec96377103 100644 --- a/pkg/server/debug/pprofui/server.go +++ b/pkg/server/debug/pprofui/server.go @@ -25,9 +25,9 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" "github.com/google/pprof/driver" "github.com/google/pprof/profile" - "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/pkg/server/debug/pprofui/storage_mem.go b/pkg/server/debug/pprofui/storage_mem.go index 57f1594f8e12..77f42c72917e 100644 --- a/pkg/server/debug/pprofui/storage_mem.go +++ b/pkg/server/debug/pprofui/storage_mem.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type record struct { diff --git a/pkg/server/debug/server.go b/pkg/server/debug/server.go index be13364476f6..90544feff5c7 100644 --- a/pkg/server/debug/server.go +++ b/pkg/server/debug/server.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/rcrowley/go-metrics" "github.com/rcrowley/go-metrics/exp" "golang.org/x/net/trace" diff --git a/pkg/server/goroutinedumper/goroutinedumper.go b/pkg/server/goroutinedumper/goroutinedumper.go index 3bedc8d60f5d..c2ffe4ab87cb 100644 --- a/pkg/server/goroutinedumper/goroutinedumper.go +++ b/pkg/server/goroutinedumper/goroutinedumper.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/server/goroutinedumper/goroutinedumper_test.go b/pkg/server/goroutinedumper/goroutinedumper_test.go index a67073a8ff5b..72946ca2dc1f 100644 --- a/pkg/server/goroutinedumper/goroutinedumper_test.go +++ b/pkg/server/goroutinedumper/goroutinedumper_test.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/server/heapprofiler/heapprofiler.go b/pkg/server/heapprofiler/heapprofiler.go index aedacc35f8d3..02a7962d1d8a 100644 --- a/pkg/server/heapprofiler/heapprofiler.go +++ b/pkg/server/heapprofiler/heapprofiler.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // resetHighWaterMarkInterval specifies how often the high-water mark value will diff --git a/pkg/server/node.go b/pkg/server/node.go index 540a31f4a5e5..ed722acd12f4 100644 --- a/pkg/server/node.go +++ b/pkg/server/node.go @@ -45,9 +45,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) const ( diff --git a/pkg/server/node_test.go b/pkg/server/node_test.go index f9e6d1b153d7..ce4e81c98b47 100644 --- a/pkg/server/node_test.go +++ b/pkg/server/node_test.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/server.go b/pkg/server/server.go index 327369b35c1b..1a54566fe22d 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -76,11 +76,11 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" raven "github.com/getsentry/raven-go" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "google.golang.org/grpc" ) diff --git a/pkg/server/server_systemlog_gc.go b/pkg/server/server_systemlog_gc.go index 51be6d86d427..e4c8c0c113a4 100644 --- a/pkg/server/server_systemlog_gc.go +++ b/pkg/server/server_systemlog_gc.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go index db7ed951f797..d6d62044fcf8 100644 --- a/pkg/server/server_test.go +++ b/pkg/server/server_test.go @@ -47,9 +47,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/jsonpb" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/settingsworker.go b/pkg/server/settingsworker.go index d160564698a2..d7c6725edcfb 100644 --- a/pkg/server/settingsworker.go +++ b/pkg/server/settingsworker.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // RefreshSettings starts a settings-changes listener. diff --git a/pkg/server/settingsworker_test.go b/pkg/server/settingsworker_test.go index 487432332ad3..13af3cf6d855 100644 --- a/pkg/server/settingsworker_test.go +++ b/pkg/server/settingsworker_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const strKey = "testing.str" diff --git a/pkg/server/status.go b/pkg/server/status.go index 5f242d958f3c..c42d59731d3e 100644 --- a/pkg/server/status.go +++ b/pkg/server/status.go @@ -59,8 +59,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/pkg/errors" "go.etcd.io/etcd/raft" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/pkg/server/status/recorder.go b/pkg/server/status/recorder.go index 9734287b9332..2b30e0e8f489 100644 --- a/pkg/server/status/recorder.go +++ b/pkg/server/status/recorder.go @@ -40,9 +40,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" humanize "github.com/dustin/go-humanize" "github.com/elastic/gosigar" - "github.com/pkg/errors" ) const ( diff --git a/pkg/server/status_test.go b/pkg/server/status_test.go index b4b369a6d155..196f0a4372ad 100644 --- a/pkg/server/status_test.go +++ b/pkg/server/status_test.go @@ -54,9 +54,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/kr/pretty" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/server/sticky_engine.go b/pkg/server/sticky_engine.go index f39818d46ac4..bc75ee3f272e 100644 --- a/pkg/server/sticky_engine.go +++ b/pkg/server/sticky_engine.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // stickyInMemEngine extends a normal engine, but does not allow them to be diff --git a/pkg/server/updates.go b/pkg/server/updates.go index 9813d0df9c0d..8a3a1c5de143 100644 --- a/pkg/server/updates.go +++ b/pkg/server/updates.go @@ -39,9 +39,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/mitchellh/reflectwalk" - "github.com/pkg/errors" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/host" "github.com/shirou/gopsutil/load" diff --git a/pkg/server/updates_test.go b/pkg/server/updates_test.go index 73b77f627a80..2a3162773db8 100644 --- a/pkg/server/updates_test.go +++ b/pkg/server/updates_test.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/diagutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestCheckVersion(t *testing.T) { diff --git a/pkg/server/version_cluster_test.go b/pkg/server/version_cluster_test.go index 0be6f2a29857..43e9f038dd18 100644 --- a/pkg/server/version_cluster_test.go +++ b/pkg/server/version_cluster_test.go @@ -30,7 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/settings/byte_size.go b/pkg/settings/byte_size.go index abc5ae6b2d6c..3681de5d0243 100644 --- a/pkg/settings/byte_size.go +++ b/pkg/settings/byte_size.go @@ -12,7 +12,7 @@ package settings import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ByteSizeSetting is the interface of a setting variable that will be diff --git a/pkg/settings/enum.go b/pkg/settings/enum.go index becebdeac9bb..37582c7e9c29 100644 --- a/pkg/settings/enum.go +++ b/pkg/settings/enum.go @@ -17,7 +17,7 @@ import ( "strconv" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // EnumSetting is a StringSetting that restricts the values to be one of the `enumValues` diff --git a/pkg/settings/float.go b/pkg/settings/float.go index 15550bbd6414..48b69b72c9df 100644 --- a/pkg/settings/float.go +++ b/pkg/settings/float.go @@ -13,7 +13,7 @@ package settings import ( "math" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // FloatSetting is the interface of a setting variable that will be diff --git a/pkg/settings/int.go b/pkg/settings/int.go index b78b3d4f7830..486c42a9c09b 100644 --- a/pkg/settings/int.go +++ b/pkg/settings/int.go @@ -10,7 +10,7 @@ package settings -import "github.com/pkg/errors" +import "github.com/cockroachdb/errors" // IntSetting is the interface of a setting variable that will be // updated automatically when the corresponding cluster-wide setting diff --git a/pkg/settings/settings_test.go b/pkg/settings/settings_test.go index 86aa0aa9ec5c..0bb114bc3f2d 100644 --- a/pkg/settings/settings_test.go +++ b/pkg/settings/settings_test.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/settings/string.go b/pkg/settings/string.go index 8bc4a801e705..75014d6ef8dd 100644 --- a/pkg/settings/string.go +++ b/pkg/settings/string.go @@ -10,7 +10,7 @@ package settings -import "github.com/pkg/errors" +import "github.com/cockroachdb/errors" // StringSetting is the interface of a setting variable that will be // updated automatically when the corresponding cluster-wide setting diff --git a/pkg/settings/updater.go b/pkg/settings/updater.go index af767b28c1ea..8f5271a51ce0 100644 --- a/pkg/settings/updater.go +++ b/pkg/settings/updater.go @@ -14,7 +14,7 @@ import ( "strconv" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // EncodeDuration encodes a duration in the format parseRaw expects. diff --git a/pkg/sql/ambiguous_commit_test.go b/pkg/sql/ambiguous_commit_test.go index 4d0e831b70e4..d25c28108aa6 100644 --- a/pkg/sql/ambiguous_commit_test.go +++ b/pkg/sql/ambiguous_commit_test.go @@ -29,8 +29,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" ) type interceptingTransport struct { diff --git a/pkg/sql/colexec/any_not_null_agg_tmpl.go b/pkg/sql/colexec/any_not_null_agg_tmpl.go index 40f45ae538b0..5f098170d36e 100644 --- a/pkg/sql/colexec/any_not_null_agg_tmpl.go +++ b/pkg/sql/colexec/any_not_null_agg_tmpl.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warning. diff --git a/pkg/sql/colexec/avg_agg_tmpl.go b/pkg/sql/colexec/avg_agg_tmpl.go index d86cef280686..8db18f975d55 100644 --- a/pkg/sql/colexec/avg_agg_tmpl.go +++ b/pkg/sql/colexec/avg_agg_tmpl.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // {{/* diff --git a/pkg/sql/colexec/cast_tmpl.go b/pkg/sql/colexec/cast_tmpl.go index d4aad3d46402..8973f2529502 100644 --- a/pkg/sql/colexec/cast_tmpl.go +++ b/pkg/sql/colexec/cast_tmpl.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warning. diff --git a/pkg/sql/colexec/colbatch_scan.go b/pkg/sql/colexec/colbatch_scan.go index 53361a1579f9..714303a0bcc6 100644 --- a/pkg/sql/colexec/colbatch_scan.go +++ b/pkg/sql/colexec/colbatch_scan.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/row" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TODO(yuzefovich): reading the data through a pair of colBatchScan and diff --git a/pkg/sql/colexec/columnarizer_test.go b/pkg/sql/colexec/columnarizer_test.go index 0f3fff727fe2..09ec759ea684 100644 --- a/pkg/sql/colexec/columnarizer_test.go +++ b/pkg/sql/colexec/columnarizer_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/distsqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/colexec/const_tmpl.go b/pkg/sql/colexec/const_tmpl.go index f45215f5c5da..3e36f8654b3a 100644 --- a/pkg/sql/colexec/const_tmpl.go +++ b/pkg/sql/colexec/const_tmpl.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warning. diff --git a/pkg/sql/colexec/distinct_tmpl.go b/pkg/sql/colexec/distinct_tmpl.go index 886c9a1cb4c9..9e7e2fa9f037 100644 --- a/pkg/sql/colexec/distinct_tmpl.go +++ b/pkg/sql/colexec/distinct_tmpl.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // OrderedDistinctColsToOperators is a utility function that given an input and diff --git a/pkg/sql/colexec/execgen/cmd/execgen/main.go b/pkg/sql/colexec/execgen/cmd/execgen/main.go index 6c5ec57a3d73..06d375b7e257 100644 --- a/pkg/sql/colexec/execgen/cmd/execgen/main.go +++ b/pkg/sql/colexec/execgen/cmd/execgen/main.go @@ -21,7 +21,7 @@ import ( "regexp" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/sql/colexec/execgen/cmd/execgen/overloads_gen_util.go b/pkg/sql/colexec/execgen/cmd/execgen/overloads_gen_util.go index 6c67145c3079..74e2ac5ee551 100644 --- a/pkg/sql/colexec/execgen/cmd/execgen/overloads_gen_util.go +++ b/pkg/sql/colexec/execgen/cmd/execgen/overloads_gen_util.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // populateTwoArgsOverloads creates all overload structs related to a single diff --git a/pkg/sql/colexec/min_max_agg_tmpl.go b/pkg/sql/colexec/min_max_agg_tmpl.go index 62fda14c8dfe..8b06a565dfa9 100644 --- a/pkg/sql/colexec/min_max_agg_tmpl.go +++ b/pkg/sql/colexec/min_max_agg_tmpl.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warning. diff --git a/pkg/sql/colexec/proj_const_ops_tmpl.go b/pkg/sql/colexec/proj_const_ops_tmpl.go index 63da0c93a5bb..0eb3a4a4a768 100644 --- a/pkg/sql/colexec/proj_const_ops_tmpl.go +++ b/pkg/sql/colexec/proj_const_ops_tmpl.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warning. diff --git a/pkg/sql/colexec/proj_non_const_ops_tmpl.go b/pkg/sql/colexec/proj_non_const_ops_tmpl.go index 038b8ea1b8bb..bee5bb9a50eb 100644 --- a/pkg/sql/colexec/proj_non_const_ops_tmpl.go +++ b/pkg/sql/colexec/proj_non_const_ops_tmpl.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warning. diff --git a/pkg/sql/colexec/routers_test.go b/pkg/sql/colexec/routers_test.go index 3ccdfd962c7b..866e28c4cc2f 100644 --- a/pkg/sql/colexec/routers_test.go +++ b/pkg/sql/colexec/routers_test.go @@ -32,7 +32,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/randutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/colexec/select_in_tmpl.go b/pkg/sql/colexec/select_in_tmpl.go index bc3c7fc21a17..55d56dc04f9f 100644 --- a/pkg/sql/colexec/select_in_tmpl.go +++ b/pkg/sql/colexec/select_in_tmpl.go @@ -35,7 +35,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warnings. diff --git a/pkg/sql/colexec/selection_ops_tmpl.go b/pkg/sql/colexec/selection_ops_tmpl.go index 274473b41ba6..399e93328c72 100644 --- a/pkg/sql/colexec/selection_ops_tmpl.go +++ b/pkg/sql/colexec/selection_ops_tmpl.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Remove unused warning. diff --git a/pkg/sql/colexec/sort.go b/pkg/sql/colexec/sort.go index b4e94ac82e74..b81083fb46ed 100644 --- a/pkg/sql/colexec/sort.go +++ b/pkg/sql/colexec/sort.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/execinfra" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // NewSorter returns a new sort operator, which sorts its input on the columns diff --git a/pkg/sql/colexec/sum_agg_tmpl.go b/pkg/sql/colexec/sum_agg_tmpl.go index 76b397463616..6f1eeec41325 100644 --- a/pkg/sql/colexec/sum_agg_tmpl.go +++ b/pkg/sql/colexec/sum_agg_tmpl.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // {{/* diff --git a/pkg/sql/colexec/utils.go b/pkg/sql/colexec/utils.go index 42b4378993cb..fcc7ed690cbe 100644 --- a/pkg/sql/colexec/utils.go +++ b/pkg/sql/colexec/utils.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/cockroach/pkg/util/encoding" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var ( diff --git a/pkg/sql/colexec/utils_test.go b/pkg/sql/colexec/utils_test.go index 9d0758466d14..c82133876486 100644 --- a/pkg/sql/colexec/utils_test.go +++ b/pkg/sql/colexec/utils_test.go @@ -36,7 +36,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/randutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/pmezard/go-difflib/difflib" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/sql/colflow/vectorized_flow_shutdown_test.go b/pkg/sql/colflow/vectorized_flow_shutdown_test.go index 84bcd95e9ad2..07d09b1e20ac 100644 --- a/pkg/sql/colflow/vectorized_flow_shutdown_test.go +++ b/pkg/sql/colflow/vectorized_flow_shutdown_test.go @@ -39,7 +39,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/copy_file_upload.go b/pkg/sql/copy_file_upload.go index 7eb8a6b4ddb0..372877743e5b 100644 --- a/pkg/sql/copy_file_upload.go +++ b/pkg/sql/copy_file_upload.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" ) const ( diff --git a/pkg/sql/delete_test.go b/pkg/sql/delete_test.go index 0a089b7ad267..876a85eb74aa 100644 --- a/pkg/sql/delete_test.go +++ b/pkg/sql/delete_test.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestInterleavedFastPathDeleteCheck(t *testing.T) { diff --git a/pkg/sql/distsql/columnar_utils_test.go b/pkg/sql/distsql/columnar_utils_test.go index 72b18b39a3f6..fd9eb369cbc8 100644 --- a/pkg/sql/distsql/columnar_utils_test.go +++ b/pkg/sql/distsql/columnar_utils_test.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/storage" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type verifyColOperatorArgs struct { diff --git a/pkg/sql/distsql/inbound_test.go b/pkg/sql/distsql/inbound_test.go index 57c7c38dbca5..1ea6d2b61115 100644 --- a/pkg/sql/distsql/inbound_test.go +++ b/pkg/sql/distsql/inbound_test.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/netutil" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/distsql_physical_planner_test.go b/pkg/sql/distsql_physical_planner_test.go index e1d3c60bc63c..0f2bc315443d 100644 --- a/pkg/sql/distsql_physical_planner_test.go +++ b/pkg/sql/distsql_physical_planner_test.go @@ -46,7 +46,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // SplitTable splits a range in the table, creates a replica for the right diff --git a/pkg/sql/distsql_plan_backfill.go b/pkg/sql/distsql_plan_backfill.go index 6eb99d83ddb8..b37a586f44fb 100644 --- a/pkg/sql/distsql_plan_backfill.go +++ b/pkg/sql/distsql_plan_backfill.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/physicalplan" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func initBackfillerSpec( diff --git a/pkg/sql/distsql_plan_ctas.go b/pkg/sql/distsql_plan_ctas.go index 08bac1b0e5d2..92b41941c0ce 100644 --- a/pkg/sql/distsql_plan_ctas.go +++ b/pkg/sql/distsql_plan_ctas.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" "github.com/cockroachdb/cockroach/pkg/sql/rowexec" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // PlanAndRunCTAS plans and runs the CREATE TABLE AS command. diff --git a/pkg/sql/distsql_plan_join_test.go b/pkg/sql/distsql_plan_join_test.go index 346bf2e563b4..90e86862e0cd 100644 --- a/pkg/sql/distsql_plan_join_test.go +++ b/pkg/sql/distsql_plan_join_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func setTestEqColForSide(colName string, side *scanNode, equalityIndices *[]int) error { diff --git a/pkg/sql/distsql_plan_stats.go b/pkg/sql/distsql_plan_stats.go index f6f5dd93c49d..738394950544 100644 --- a/pkg/sql/distsql_plan_stats.go +++ b/pkg/sql/distsql_plan_stats.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/hlc" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" ) type requestedStat struct { diff --git a/pkg/sql/distsql_plan_window.go b/pkg/sql/distsql_plan_window.go index 421af6f47deb..f922f120468e 100644 --- a/pkg/sql/distsql_plan_window.go +++ b/pkg/sql/distsql_plan_window.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/rowexec" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type windowPlanState struct { diff --git a/pkg/sql/drop_role.go b/pkg/sql/drop_role.go index 86bc4f0d9600..2f57bce569ad 100644 --- a/pkg/sql/drop_role.go +++ b/pkg/sql/drop_role.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/sqltelemetry" "github.com/cockroachdb/cockroach/pkg/util" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // DropRoleNode deletes entries from the system.users table. diff --git a/pkg/sql/drop_test.go b/pkg/sql/drop_test.go index dfc913d2d82a..6198935bc744 100644 --- a/pkg/sql/drop_test.go +++ b/pkg/sql/drop_test.go @@ -38,7 +38,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/event_log.go b/pkg/sql/event_log.go index 5bb9387f85ef..7e8a73beca93 100644 --- a/pkg/sql/event_log.go +++ b/pkg/sql/event_log.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // EventLogType represents an event type that can be recorded in the event log. diff --git a/pkg/sql/execinfra/base.go b/pkg/sql/execinfra/base.go index ce8b73e6f78e..a05c9a7fd21f 100644 --- a/pkg/sql/execinfra/base.go +++ b/pkg/sql/execinfra/base.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) // RowChannelBufSize is the default buffer size of a RowChannel. diff --git a/pkg/sql/execinfra/processorsbase.go b/pkg/sql/execinfra/processorsbase.go index db39f7769fa0..20a76179695b 100644 --- a/pkg/sql/execinfra/processorsbase.go +++ b/pkg/sql/execinfra/processorsbase.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) // Processor is a common interface implemented by all processors, used by the diff --git a/pkg/sql/export.go b/pkg/sql/export.go index f841a93872e2..bfde4172fd44 100644 --- a/pkg/sql/export.go +++ b/pkg/sql/export.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/util" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type exportNode struct { diff --git a/pkg/sql/flowinfra/flow_registry.go b/pkg/sql/flowinfra/flow_registry.go index 059600828fae..e434ec2c02dd 100644 --- a/pkg/sql/flowinfra/flow_registry.go +++ b/pkg/sql/flowinfra/flow_registry.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) var errNoInboundStreamConnection = errors.New("no inbound stream connection") diff --git a/pkg/sql/flowinfra/flow_registry_test.go b/pkg/sql/flowinfra/flow_registry_test.go index cb6132f30f8b..c189fb830e34 100644 --- a/pkg/sql/flowinfra/flow_registry_test.go +++ b/pkg/sql/flowinfra/flow_registry_test.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // lookupFlow returns the registered flow with the given ID. If no such flow is diff --git a/pkg/sql/flowinfra/inbound.go b/pkg/sql/flowinfra/inbound.go index 4eee16871dcc..baf386f38045 100644 --- a/pkg/sql/flowinfra/inbound.go +++ b/pkg/sql/flowinfra/inbound.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // InboundStreamHandler is a handler of an inbound stream. diff --git a/pkg/sql/flowinfra/outbox_test.go b/pkg/sql/flowinfra/outbox_test.go index c2c79d1fcfd2..e62bfbbb2e5c 100644 --- a/pkg/sql/flowinfra/outbox_test.go +++ b/pkg/sql/flowinfra/outbox_test.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // staticAddressResolver maps StaticNodeID to the given address. diff --git a/pkg/sql/flowinfra/stream_decoder.go b/pkg/sql/flowinfra/stream_decoder.go index 654ad14eb2a0..3cd26c6079a4 100644 --- a/pkg/sql/flowinfra/stream_decoder.go +++ b/pkg/sql/flowinfra/stream_decoder.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // StreamDecoder converts a sequence of ProducerMessage to rows and metadata diff --git a/pkg/sql/flowinfra/stream_encoder.go b/pkg/sql/flowinfra/stream_encoder.go index e2a40e22534f..9bc6b110e9be 100644 --- a/pkg/sql/flowinfra/stream_encoder.go +++ b/pkg/sql/flowinfra/stream_encoder.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // PreferredEncoding is the encoding used for EncDatums that don't already have diff --git a/pkg/sql/grant_revoke.go b/pkg/sql/grant_revoke.go index 7444018c4594..8b59a194fe85 100644 --- a/pkg/sql/grant_revoke.go +++ b/pkg/sql/grant_revoke.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/sqltelemetry" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Grant adds privileges to users. diff --git a/pkg/sql/lease_test.go b/pkg/sql/lease_test.go index d710606b7cad..4a948fdba0a4 100644 --- a/pkg/sql/lease_test.go +++ b/pkg/sql/lease_test.go @@ -42,8 +42,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/logictest/logic.go b/pkg/sql/logictest/logic.go index 00cca606e4cb..bc3d99ceaed2 100644 --- a/pkg/sql/logictest/logic.go +++ b/pkg/sql/logictest/logic.go @@ -61,8 +61,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" ) // This file is home to TestLogic, a general-purpose engine for diff --git a/pkg/sql/metric_util_test.go b/pkg/sql/metric_util_test.go index aafe7629bf86..817c70803fb4 100644 --- a/pkg/sql/metric_util_test.go +++ b/pkg/sql/metric_util_test.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/metric" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // initializeQueryCounter returns a queryCounter that accounts for system diff --git a/pkg/sql/opt/cat/utils.go b/pkg/sql/opt/cat/utils.go index e1136a8cdea9..9ce64a04979c 100644 --- a/pkg/sql/opt/cat/utils.go +++ b/pkg/sql/opt/cat/utils.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/util/treeprinter" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ExpandDataSourceGlob is a utility function that expands a tree.TablePattern diff --git a/pkg/sql/opt/opbench/opbench_test.go b/pkg/sql/opt/opbench/opbench_test.go index 1cc3b4f3731a..082cf22db1d4 100644 --- a/pkg/sql/opt/opbench/opbench_test.go +++ b/pkg/sql/opt/opbench/opbench_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/opt/opbench" "github.com/cockroachdb/cockroach/pkg/sql/opt/testutils/opttester" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var pgurl = flag.String("url", "postgresql://localhost:26257/tpch?sslmode=disable&user=root", "the url to connect to") diff --git a/pkg/sql/pgwire/conn_test.go b/pkg/sql/pgwire/conn_test.go index fc0311611932..68fd73998007 100644 --- a/pkg/sql/pgwire/conn_test.go +++ b/pkg/sql/pgwire/conn_test.go @@ -45,9 +45,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/stop" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" "github.com/jackc/pgx/pgproto3" - "github.com/pkg/errors" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/pkg/sql/pgwire_internal_test.go b/pkg/sql/pgwire_internal_test.go index bceaaf1364c8..0ddda51d2373 100644 --- a/pkg/sql/pgwire_internal_test.go +++ b/pkg/sql/pgwire_internal_test.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" ) // Test that abruptly closing a pgwire connection releases all leases held by diff --git a/pkg/sql/physicalplan/physical_plan.go b/pkg/sql/physicalplan/physical_plan.go index 3aabfad9f628..a7cc401df905 100644 --- a/pkg/sql/physicalplan/physical_plan.go +++ b/pkg/sql/physicalplan/physical_plan.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Processor contains the information associated with a processor in a plan. diff --git a/pkg/sql/physicalplan/replicaoracle/oracle.go b/pkg/sql/physicalplan/replicaoracle/oracle.go index 119a165eb3af..ad05dd989153 100644 --- a/pkg/sql/physicalplan/replicaoracle/oracle.go +++ b/pkg/sql/physicalplan/replicaoracle/oracle.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Policy determines how an Oracle should select a replica. diff --git a/pkg/sql/plan_opt_test.go b/pkg/sql/plan_opt_test.go index 5332525e67fd..63e9ee33f799 100644 --- a/pkg/sql/plan_opt_test.go +++ b/pkg/sql/plan_opt_test.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/randutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "golang.org/x/sync/errgroup" ) diff --git a/pkg/sql/planner.go b/pkg/sql/planner.go index e1c4cfaac3a6..5d17b835e315 100644 --- a/pkg/sql/planner.go +++ b/pkg/sql/planner.go @@ -30,8 +30,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/envutil" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/mon" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" ) // extendedEvalContext extends tree.EvalContext with fields that are needed for diff --git a/pkg/sql/privilege/privilege.go b/pkg/sql/privilege/privilege.go index c7e9f88c3f8d..33b3b40a1b99 100644 --- a/pkg/sql/privilege/privilege.go +++ b/pkg/sql/privilege/privilege.go @@ -15,7 +15,7 @@ import ( "sort" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) //go:generate stringer -type=Kind diff --git a/pkg/sql/row/fetcher_mvcc_test.go b/pkg/sql/row/fetcher_mvcc_test.go index 68093393bedf..61c1d1c35109 100644 --- a/pkg/sql/row/fetcher_mvcc_test.go +++ b/pkg/sql/row/fetcher_mvcc_test.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func slurpUserDataKVs(t testing.TB, e storage.Engine) []roachpb.KeyValue { diff --git a/pkg/sql/row/fk_test.go b/pkg/sql/row/fk_test.go index fdbcb612364f..595a9d27a1a2 100644 --- a/pkg/sql/row/fk_test.go +++ b/pkg/sql/row/fk_test.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) type testTables struct { diff --git a/pkg/sql/row/inserter.go b/pkg/sql/row/inserter.go index 0f99232770c4..b1e894b06b8d 100644 --- a/pkg/sql/row/inserter.go +++ b/pkg/sql/row/inserter.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Inserter abstracts the key/value operations for inserting table rows. diff --git a/pkg/sql/rowcontainer/hash_row_container.go b/pkg/sql/rowcontainer/hash_row_container.go index dd060617f3c0..93fe65c1d222 100644 --- a/pkg/sql/rowcontainer/hash_row_container.go +++ b/pkg/sql/rowcontainer/hash_row_container.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/mon" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type columns []uint32 diff --git a/pkg/sql/rowcontainer/row_container.go b/pkg/sql/rowcontainer/row_container.go index 9660cb28e15b..b1445ce97c4f 100644 --- a/pkg/sql/rowcontainer/row_container.go +++ b/pkg/sql/rowcontainer/row_container.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/ring" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // SortableRowContainer is a container used to store rows and optionally sort diff --git a/pkg/sql/rowcontainer/row_container_test.go b/pkg/sql/rowcontainer/row_container_test.go index 7f05be52986d..9feffbeb026e 100644 --- a/pkg/sql/rowcontainer/row_container_test.go +++ b/pkg/sql/rowcontainer/row_container_test.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // verifyRows verifies that the rows read with the given RowIterator match up diff --git a/pkg/sql/rowexec/backfiller_test.go b/pkg/sql/rowexec/backfiller_test.go index 7c194d915974..564d06edf712 100644 --- a/pkg/sql/rowexec/backfiller_test.go +++ b/pkg/sql/rowexec/backfiller_test.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sqlmigrations" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestWriteResumeSpan(t *testing.T) { diff --git a/pkg/sql/rowexec/bulk_row_writer.go b/pkg/sql/rowexec/bulk_row_writer.go index e8a658066a08..b0d54833d389 100644 --- a/pkg/sql/rowexec/bulk_row_writer.go +++ b/pkg/sql/rowexec/bulk_row_writer.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/ctxgroup" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // CTASPlanResultTypes is the result types for EXPORT plans. diff --git a/pkg/sql/rowexec/hashjoiner_test.go b/pkg/sql/rowexec/hashjoiner_test.go index 0e46d24cc25f..71d6fb68c74f 100644 --- a/pkg/sql/rowexec/hashjoiner_test.go +++ b/pkg/sql/rowexec/hashjoiner_test.go @@ -30,7 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/distsqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/mon" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestHashJoiner(t *testing.T) { diff --git a/pkg/sql/rowexec/index_skip_table_reader.go b/pkg/sql/rowexec/index_skip_table_reader.go index e6a30659f7a2..1a693ac85957 100644 --- a/pkg/sql/rowexec/index_skip_table_reader.go +++ b/pkg/sql/rowexec/index_skip_table_reader.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" "github.com/cockroachdb/cockroach/pkg/sql/row" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // indexSkipTableReader is a processor that retrieves distinct rows from diff --git a/pkg/sql/rowexec/indexjoiner.go b/pkg/sql/rowexec/indexjoiner.go index 3ad3e1158406..bc5e7dd710c5 100644 --- a/pkg/sql/rowexec/indexjoiner.go +++ b/pkg/sql/rowexec/indexjoiner.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/span" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) const indexJoinerBatchSize = 10000 diff --git a/pkg/sql/rowexec/joiner_test.go b/pkg/sql/rowexec/joiner_test.go index 1032209ad977..bbe2d29ad938 100644 --- a/pkg/sql/rowexec/joiner_test.go +++ b/pkg/sql/rowexec/joiner_test.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type joinerTestCase struct { diff --git a/pkg/sql/rowexec/joinerbase.go b/pkg/sql/rowexec/joinerbase.go index 4e21bb95cb21..1d8b966df8a8 100644 --- a/pkg/sql/rowexec/joinerbase.go +++ b/pkg/sql/rowexec/joinerbase.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // joinerBase is the common core of all joiners. diff --git a/pkg/sql/rowexec/processors.go b/pkg/sql/rowexec/processors.go index 5b365967af08..7a82b5ae5de7 100644 --- a/pkg/sql/rowexec/processors.go +++ b/pkg/sql/rowexec/processors.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // emitHelper is a utility wrapper on top of ProcOutputHelper.EmitRow(). diff --git a/pkg/sql/rowexec/stream_group_accumulator.go b/pkg/sql/rowexec/stream_group_accumulator.go index b45add7d2556..d502fd198c0f 100644 --- a/pkg/sql/rowexec/stream_group_accumulator.go +++ b/pkg/sql/rowexec/stream_group_accumulator.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/mon" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // streamGroupAccumulator groups input rows coming from src into groups dictated diff --git a/pkg/sql/rowexec/stream_merger.go b/pkg/sql/rowexec/stream_merger.go index ac006433b77b..1e690fb1c03e 100644 --- a/pkg/sql/rowexec/stream_merger.go +++ b/pkg/sql/rowexec/stream_merger.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/mon" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // We define a group to be a set of rows from a given source with the same diff --git a/pkg/sql/rowexec/tablereader.go b/pkg/sql/rowexec/tablereader.go index 8c9c91ef7c44..c756396538fd 100644 --- a/pkg/sql/rowexec/tablereader.go +++ b/pkg/sql/rowexec/tablereader.go @@ -24,8 +24,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/humanizeutil" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) // tableReader is the start of a computation flow; it performs KV operations to diff --git a/pkg/sql/rowexec/zigzagjoiner.go b/pkg/sql/rowexec/zigzagjoiner.go index e6eec11b130c..ed7584cdbee8 100644 --- a/pkg/sql/rowexec/zigzagjoiner.go +++ b/pkg/sql/rowexec/zigzagjoiner.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Consider the schema: diff --git a/pkg/sql/rowflow/input_sync.go b/pkg/sql/rowflow/input_sync.go index 12eba7512148..2e7b62d1e79f 100644 --- a/pkg/sql/rowflow/input_sync.go +++ b/pkg/sql/rowflow/input_sync.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type srcInfo struct { diff --git a/pkg/sql/rowflow/input_sync_test.go b/pkg/sql/rowflow/input_sync_test.go index 2acfdfee18fd..5d4e02188427 100644 --- a/pkg/sql/rowflow/input_sync_test.go +++ b/pkg/sql/rowflow/input_sync_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/distsqlutils" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestOrderedSync(t *testing.T) { diff --git a/pkg/sql/rowflow/routers.go b/pkg/sql/rowflow/routers.go index 3064f39570a3..6eeff161f8ee 100644 --- a/pkg/sql/rowflow/routers.go +++ b/pkg/sql/rowflow/routers.go @@ -34,8 +34,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) type router interface { diff --git a/pkg/sql/rowflow/routers_test.go b/pkg/sql/rowflow/routers_test.go index a68bf790b502..37e2a7d338af 100644 --- a/pkg/sql/rowflow/routers_test.go +++ b/pkg/sql/rowflow/routers_test.go @@ -37,8 +37,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) // setupRouter creates and starts a router. Returns the router and a WaitGroup diff --git a/pkg/sql/rowflow/row_based_flow.go b/pkg/sql/rowflow/row_based_flow.go index ad2b9941afd0..08cc9367c693 100644 --- a/pkg/sql/rowflow/row_based_flow.go +++ b/pkg/sql/rowflow/row_based_flow.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/rowexec" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type rowBasedFlow struct { diff --git a/pkg/sql/scan.go b/pkg/sql/scan.go index aeadd2385dfb..862b81bb7927 100644 --- a/pkg/sql/scan.go +++ b/pkg/sql/scan.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var scanNodePool = sync.Pool{ diff --git a/pkg/sql/scatter.go b/pkg/sql/scatter.go index 77207581f23d..fa396321a2a8 100644 --- a/pkg/sql/scatter.go +++ b/pkg/sql/scatter.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/privilege" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type scatterNode struct { diff --git a/pkg/sql/scrub_physical.go b/pkg/sql/scrub_physical.go index 1e5cd7f516f1..cf5c3d880192 100644 --- a/pkg/sql/scrub_physical.go +++ b/pkg/sql/scrub_physical.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/span" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var _ checkOperation = &physicalCheckOperation{} diff --git a/pkg/sql/sem/tree/as_of.go b/pkg/sql/sem/tree/as_of.go index 441146c7d409..cbf737bae774 100644 --- a/pkg/sql/sem/tree/as_of.go +++ b/pkg/sql/sem/tree/as_of.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // FollowerReadTimestampFunctionName is the name of the function which can be diff --git a/pkg/sql/sequence_select.go b/pkg/sql/sequence_select.go index 63f5bf790d12..572ea9a3f4cf 100644 --- a/pkg/sql/sequence_select.go +++ b/pkg/sql/sequence_select.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type sequenceSelectNode struct { diff --git a/pkg/sql/show_create_clauses.go b/pkg/sql/show_create_clauses.go index f9af4a3ac44c..52d124a6bbb9 100644 --- a/pkg/sql/show_create_clauses.go +++ b/pkg/sql/show_create_clauses.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // tableComments stores the comment data for a table. diff --git a/pkg/sql/show_stats.go b/pkg/sql/show_stats.go index 22840108e3d9..062c95b302d3 100644 --- a/pkg/sql/show_stats.go +++ b/pkg/sql/show_stats.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/stats" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/json" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) var showTableStatsColumns = sqlbase.ResultColumns{ diff --git a/pkg/sql/show_test.go b/pkg/sql/show_test.go index 2fb3a5f66cb3..b31d203eb7d4 100644 --- a/pkg/sql/show_test.go +++ b/pkg/sql/show_test.go @@ -30,7 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestShowCreateTable(t *testing.T) { diff --git a/pkg/sql/show_trace_replica.go b/pkg/sql/show_trace_replica.go index 2408bcb54580..70fd1f2ed117 100644 --- a/pkg/sql/show_trace_replica.go +++ b/pkg/sql/show_trace_replica.go @@ -17,7 +17,7 @@ import ( "strings" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // showTraceReplicaNode is a planNode that wraps another node and uses session diff --git a/pkg/sql/show_trace_replica_test.go b/pkg/sql/show_trace_replica_test.go index 38d7ff48ce46..ae8f8fd83b57 100644 --- a/pkg/sql/show_trace_replica_test.go +++ b/pkg/sql/show_trace_replica_test.go @@ -24,8 +24,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" ) func TestShowTraceReplica(t *testing.T) { diff --git a/pkg/sql/split.go b/pkg/sql/split.go index 2a399809a55b..987ac35772cc 100644 --- a/pkg/sql/split.go +++ b/pkg/sql/split.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type splitNode struct { diff --git a/pkg/sql/sqlbase/table_test.go b/pkg/sql/sqlbase/table_test.go index efc11e946c6f..8dfef6871905 100644 --- a/pkg/sql/sqlbase/table_test.go +++ b/pkg/sql/sqlbase/table_test.go @@ -36,7 +36,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeofday" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil/pgdate" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type indexKeyTest struct { diff --git a/pkg/sql/sqlbase/testutils.go b/pkg/sql/sqlbase/testutils.go index f9da92241eed..560971e7bc3d 100644 --- a/pkg/sql/sqlbase/testutils.go +++ b/pkg/sql/sqlbase/testutils.go @@ -42,8 +42,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil/pgdate" "github.com/cockroachdb/cockroach/pkg/util/uint128" "github.com/cockroachdb/cockroach/pkg/util/uuid" + "github.com/cockroachdb/errors" "github.com/lib/pq/oid" - "github.com/pkg/errors" ) // This file contains utility functions for tests (in other packages). diff --git a/pkg/sql/stats/create_stats_job_test.go b/pkg/sql/stats/create_stats_job_test.go index 3d332a2f0863..cb90f81898f3 100644 --- a/pkg/sql/stats/create_stats_job_test.go +++ b/pkg/sql/stats/create_stats_job_test.go @@ -34,7 +34,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/retry" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TestCreateStatsControlJob tests that PAUSE JOB, RESUME JOB, and CANCEL JOB diff --git a/pkg/sql/stats/stats_cache.go b/pkg/sql/stats/stats_cache.go index 823092b513fc..6843da69e102 100644 --- a/pkg/sql/stats/stats_cache.go +++ b/pkg/sql/stats/stats_cache.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // A TableStatistic object holds a statistic for a particular column or group diff --git a/pkg/sql/stats/stats_cache_test.go b/pkg/sql/stats/stats_cache_test.go index fec4e98da49c..9a099e3fa5f5 100644 --- a/pkg/sql/stats/stats_cache_test.go +++ b/pkg/sql/stats/stats_cache_test.go @@ -30,7 +30,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func insertTableStat( diff --git a/pkg/sql/temporary_schema_test.go b/pkg/sql/temporary_schema_test.go index f2a993536b54..d265a2a4f0dc 100644 --- a/pkg/sql/temporary_schema_test.go +++ b/pkg/sql/temporary_schema_test.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/tests/end_txn_trigger.go b/pkg/sql/tests/end_txn_trigger.go index b45908e41537..ac3ca93c9ba0 100644 --- a/pkg/sql/tests/end_txn_trigger.go +++ b/pkg/sql/tests/end_txn_trigger.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/storagebase" "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // CheckEndTxnTrigger verifies that an EndTxnRequest that includes intents for diff --git a/pkg/sql/tests/kv_test.go b/pkg/sql/tests/kv_test.go index 4931dabbea0d..7fc84e9640a2 100644 --- a/pkg/sql/tests/kv_test.go +++ b/pkg/sql/tests/kv_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" kv2 "github.com/cockroachdb/cockroach/pkg/kv" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type kvInterface interface { diff --git a/pkg/sql/tests/rsg_test.go b/pkg/sql/tests/rsg_test.go index 661cce5c53bd..af8873f50794 100644 --- a/pkg/sql/tests/rsg_test.go +++ b/pkg/sql/tests/rsg_test.go @@ -41,8 +41,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" ) var ( diff --git a/pkg/sql/tests/split_test.go b/pkg/sql/tests/split_test.go index ad5ca008f1f9..ebe9bb139fe0 100644 --- a/pkg/sql/tests/split_test.go +++ b/pkg/sql/tests/split_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // getRangeKeys returns the end keys of all ranges. diff --git a/pkg/sql/tests/table_split_test.go b/pkg/sql/tests/table_split_test.go index 130488edf026..6b63cf2f1aa7 100644 --- a/pkg/sql/tests/table_split_test.go +++ b/pkg/sql/tests/table_split_test.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestSplitAtTableBoundary(t *testing.T) { diff --git a/pkg/sql/truncate.go b/pkg/sql/truncate.go index 0e0adf07e9e7..53c754af5ba8 100644 --- a/pkg/sql/truncate.go +++ b/pkg/sql/truncate.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TableTruncateChunkSize is the maximum number of keys deleted per chunk diff --git a/pkg/sql/txn_restart_test.go b/pkg/sql/txn_restart_test.go index a4c2f9bc63b5..4171276efead 100644 --- a/pkg/sql/txn_restart_test.go +++ b/pkg/sql/txn_restart_test.go @@ -42,8 +42,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/shuffle" "github.com/cockroachdb/cockroach/pkg/util/syncutil" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/txn_state_test.go b/pkg/sql/txn_state_test.go index dfea6b2da765..2b1948e03a8e 100644 --- a/pkg/sql/txn_state_test.go +++ b/pkg/sql/txn_state_test.go @@ -29,9 +29,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" ) var noRewindExpected = CmdPos(-1) diff --git a/pkg/sql/union.go b/pkg/sql/union.go index f493059af3ba..7726a8b2fd87 100644 --- a/pkg/sql/union.go +++ b/pkg/sql/union.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" "github.com/cockroachdb/cockroach/pkg/sql/types" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // unionNode is a planNode whose rows are the result of one of three set diff --git a/pkg/sql/values_test.go b/pkg/sql/values_test.go index 96488ba92a6f..1dc63b79933a 100644 --- a/pkg/sql/values_test.go +++ b/pkg/sql/values_test.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sql/zone_config.go b/pkg/sql/zone_config.go index 5c379d400946..df1a25ad4e27 100644 --- a/pkg/sql/zone_config.go +++ b/pkg/sql/zone_config.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/pgwire/pgerror" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/sqlbase" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/sql/zone_config_test.go b/pkg/sql/zone_config_test.go index d81159cf522c..3fca8f77e693 100644 --- a/pkg/sql/zone_config_test.go +++ b/pkg/sql/zone_config_test.go @@ -27,8 +27,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/sqlmigrations/leasemanager/lease.go b/pkg/sqlmigrations/leasemanager/lease.go index b6428a375a6f..68e97b9aa7c6 100644 --- a/pkg/sqlmigrations/leasemanager/lease.go +++ b/pkg/sqlmigrations/leasemanager/lease.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // DefaultLeaseDuration is the duration a lease will be acquired for if no diff --git a/pkg/sqlmigrations/migrations_test.go b/pkg/sqlmigrations/migrations_test.go index bf352fcfefba..38b798206784 100644 --- a/pkg/sqlmigrations/migrations_test.go +++ b/pkg/sqlmigrations/migrations_test.go @@ -32,8 +32,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/storage/batch.go b/pkg/storage/batch.go index 9d93c19cb2a7..c4185b5a4850 100644 --- a/pkg/storage/batch.go +++ b/pkg/storage/batch.go @@ -15,8 +15,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" + "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble" - "github.com/pkg/errors" ) // BatchType represents the type of an entry in an encoded RocksDB batch. diff --git a/pkg/storage/batch_test.go b/pkg/storage/batch_test.go index a50bed71f696..7b53532c8a46 100644 --- a/pkg/storage/batch_test.go +++ b/pkg/storage/batch_test.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/randutil" "github.com/cockroachdb/cockroach/pkg/util/stop" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/storage/disk_map.go b/pkg/storage/disk_map.go index b840915715b5..2279d93e9ece 100644 --- a/pkg/storage/disk_map.go +++ b/pkg/storage/disk_map.go @@ -19,8 +19,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble" - "github.com/pkg/errors" ) // defaultBatchCapacityBytes is the default capacity for a diff --git a/pkg/storage/engine.go b/pkg/storage/engine.go index 8767c8df8b6b..eeee56507943 100644 --- a/pkg/storage/engine.go +++ b/pkg/storage/engine.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/protoutil" + "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble" - "github.com/pkg/errors" ) // DefaultStorageEngine represents the default storage engine to use. diff --git a/pkg/storage/engine_test.go b/pkg/storage/engine_test.go index 5a3ce0d259ed..fdceef4fa458 100644 --- a/pkg/storage/engine_test.go +++ b/pkg/storage/engine_test.go @@ -36,9 +36,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/protoutil" + "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble" "github.com/cockroachdb/pebble/vfs" - "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/storage/enginepb/decode.go b/pkg/storage/enginepb/decode.go index 32099cbc5c26..79c89dcd09e1 100644 --- a/pkg/storage/enginepb/decode.go +++ b/pkg/storage/enginepb/decode.go @@ -14,7 +14,7 @@ import ( "encoding/binary" "github.com/cockroachdb/cockroach/pkg/util/hlc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Helpers here are split out of storage/engine since that package also contains diff --git a/pkg/storage/error_test.go b/pkg/storage/error_test.go index 601d93e69d7d..71b1d1ac7f30 100644 --- a/pkg/storage/error_test.go +++ b/pkg/storage/error_test.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TestRocksDBErrorSafeMessage verifies that RocksDB errors have a chance of diff --git a/pkg/storage/mvcc_incremental_iterator.go b/pkg/storage/mvcc_incremental_iterator.go index 1f81f183e55b..cd0412f69c78 100644 --- a/pkg/storage/mvcc_incremental_iterator.go +++ b/pkg/storage/mvcc_incremental_iterator.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/protoutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // MVCCIncrementalIterator iterates over the diff of the key range diff --git a/pkg/storage/mvcc_incremental_iterator_test.go b/pkg/storage/mvcc_incremental_iterator_test.go index 01a56e2bf7b5..4589af06f770 100644 --- a/pkg/storage/mvcc_incremental_iterator_test.go +++ b/pkg/storage/mvcc_incremental_iterator_test.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" diff --git a/pkg/storage/rocksdb.go b/pkg/storage/rocksdb.go index 158e77a1f855..f5db2e4af4d3 100644 --- a/pkg/storage/rocksdb.go +++ b/pkg/storage/rocksdb.go @@ -39,8 +39,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" - "github.com/pkg/errors" ) // TODO(tamird): why does rocksdb not link jemalloc,snappy statically? diff --git a/pkg/storage/sst_iterator.go b/pkg/storage/sst_iterator.go index 8c0aa3205954..03ceaae9e71d 100644 --- a/pkg/storage/sst_iterator.go +++ b/pkg/storage/sst_iterator.go @@ -14,9 +14,9 @@ import ( "bytes" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble/sstable" "github.com/cockroachdb/pebble/vfs" - "github.com/pkg/errors" ) type sstIterator struct { diff --git a/pkg/storage/sst_writer.go b/pkg/storage/sst_writer.go index 17cd1dee17bf..5c604291cbd8 100644 --- a/pkg/storage/sst_writer.go +++ b/pkg/storage/sst_writer.go @@ -15,8 +15,8 @@ import ( "io" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble/sstable" - "github.com/pkg/errors" ) // SSTWriter writes SSTables. diff --git a/pkg/storage/temp_dir.go b/pkg/storage/temp_dir.go index 0f865a26df83..928d453530c8 100644 --- a/pkg/storage/temp_dir.go +++ b/pkg/storage/temp_dir.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/stop" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const lockFilename = `TEMP_DIR.LOCK` diff --git a/pkg/storage/testdata/mvcc_histories/empty_key b/pkg/storage/testdata/mvcc_histories/empty_key index 6234ffbcb037..20b6370b0687 100644 --- a/pkg/storage/testdata/mvcc_histories/empty_key +++ b/pkg/storage/testdata/mvcc_histories/empty_key @@ -2,14 +2,14 @@ run error get ts=0,1 k= ---- get: /Min -> -error: (*errors.fundamental:) attempted access to empty key +error: (*withstack.withStack:) attempted access to empty key run error put ts=0,1 k= v=a ---- >> at end: -error: (*errors.fundamental:) attempted access to empty key +error: (*withstack.withStack:) attempted access to empty key run ok scan ts=0,1 k= end=a @@ -21,7 +21,7 @@ run error scan ts=0,1 k=a end= ---- scan: "a"-/Min -> -error: (*errors.fundamental:) attempted access to empty key +error: (*withstack.withStack:) attempted access to empty key run error txn_begin t=A @@ -30,4 +30,4 @@ resolve_intent t=A k= >> at end: txn: "A" meta={id=00000000 key=/Min pri=0.00000000 epo=0 ts=0,0 min=0,0 seq=0} lock=true stat=PENDING rts=0,0 wto=false max=0,0 -error: (*errors.fundamental:) attempted access to empty key +error: (*withstack.withStack:) attempted access to empty key diff --git a/pkg/testutils/buildutil/build.go b/pkg/testutils/buildutil/build.go index 2e093d2fb6d6..036aba1470bc 100644 --- a/pkg/testutils/buildutil/build.go +++ b/pkg/testutils/buildutil/build.go @@ -17,7 +17,7 @@ import ( "strings" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func init() { diff --git a/pkg/testutils/jobutils/jobs_verification.go b/pkg/testutils/jobutils/jobs_verification.go index f4e8d50889a5..1c1c4f515a57 100644 --- a/pkg/testutils/jobutils/jobs_verification.go +++ b/pkg/testutils/jobutils/jobs_verification.go @@ -29,9 +29,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/protoutil" "github.com/cockroachdb/cockroach/pkg/util/retry" + "github.com/cockroachdb/errors" "github.com/kr/pretty" "github.com/lib/pq" - "github.com/pkg/errors" ) // WaitForJob waits for the specified job ID to terminate. diff --git a/pkg/testutils/lint/lint_test.go b/pkg/testutils/lint/lint_test.go index 98b0317f95f0..e302f94868c9 100644 --- a/pkg/testutils/lint/lint_test.go +++ b/pkg/testutils/lint/lint_test.go @@ -27,8 +27,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/sem/builtins" _ "github.com/cockroachdb/cockroach/pkg/testutils/buildutil" + "github.com/cockroachdb/errors" "github.com/ghemawat/stream" - "github.com/pkg/errors" "golang.org/x/tools/go/buildutil" ) @@ -1189,6 +1189,7 @@ func TestLint(t *testing.T) { "golang.org/x/sync/singleflight": "github.com/cockroachdb/cockroach/pkg/util/syncutil/singleflight", "syscall": "sysutil", "errors": "github.com/cockroachdb/errors", + "github.com/pkg/errors": "github.com/cockroachdb/errors", "github.com/cockroachdb/errors/assert": "github.com/cockroachdb/errors", "github.com/cockroachdb/errors/barriers": "github.com/cockroachdb/errors", "github.com/cockroachdb/errors/contexttags": "github.com/cockroachdb/errors", @@ -1253,6 +1254,7 @@ func TestLint(t *testing.T) { stream.GrepNot(`cockroach/pkg/cmd/`), stream.GrepNot(`cockroach/pkg/testutils/lint: log$`), stream.GrepNot(`cockroach/pkg/util/sysutil: syscall$`), + stream.GrepNot(`cockroach/pkg/util/log: github\.com/pkg/errors$`), stream.GrepNot(`cockroach/pkg/(base|security|util/(log|randutil|stop)): log$`), stream.GrepNot(`cockroach/pkg/(server/serverpb|ts/tspb): github\.com/golang/protobuf/proto$`), diff --git a/pkg/testutils/net.go b/pkg/testutils/net.go index 95c9a1c2746a..d730be1da49f 100644 --- a/pkg/testutils/net.go +++ b/pkg/testutils/net.go @@ -18,7 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // bufferSize is the size of the buffer used by PartitionableConn. Writes to a diff --git a/pkg/testutils/net_test.go b/pkg/testutils/net_test.go index 76c2c5f32231..d30eb97ed6b7 100644 --- a/pkg/testutils/net_test.go +++ b/pkg/testutils/net_test.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/grpcutil" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/netutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // RunEchoServer runs a network server that accepts one connection from ln and diff --git a/pkg/testutils/pgtest/pgtest.go b/pkg/testutils/pgtest/pgtest.go index 92a0758c6754..e178c494f289 100644 --- a/pkg/testutils/pgtest/pgtest.go +++ b/pkg/testutils/pgtest/pgtest.go @@ -17,8 +17,8 @@ import ( "reflect" "testing" + "github.com/cockroachdb/errors" "github.com/jackc/pgx/pgproto3" - "github.com/pkg/errors" ) // PGTest can be used to send and receive arbitrary pgwire messages on diff --git a/pkg/testutils/soon_test.go b/pkg/testutils/soon_test.go index 221df5c21a8f..a711412b2819 100644 --- a/pkg/testutils/soon_test.go +++ b/pkg/testutils/soon_test.go @@ -15,7 +15,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestSucceedsSoon(t *testing.T) { diff --git a/pkg/testutils/sqlutils/scrub.go b/pkg/testutils/sqlutils/scrub.go index d8f9c4eacee7..b25870022777 100644 --- a/pkg/testutils/sqlutils/scrub.go +++ b/pkg/testutils/sqlutils/scrub.go @@ -15,7 +15,7 @@ import ( "fmt" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ScrubResult is the go struct for the row results for an diff --git a/pkg/testutils/sqlutils/sql_runner.go b/pkg/testutils/sqlutils/sql_runner.go index b25a75708dad..ad62fe5098c7 100644 --- a/pkg/testutils/sqlutils/sql_runner.go +++ b/pkg/testutils/sqlutils/sql_runner.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/testutils" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // SQLRunner wraps a testing.TB and *gosql.DB connection and provides diff --git a/pkg/testutils/testcluster/testcluster.go b/pkg/testutils/testcluster/testcluster.go index 1cf1eca65c69..c178e15e9eee 100644 --- a/pkg/testutils/testcluster/testcluster.go +++ b/pkg/testutils/testcluster/testcluster.go @@ -36,7 +36,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TestCluster represents a set of TestServers. The hope is that it can be used diff --git a/pkg/testutils/trace.go b/pkg/testutils/trace.go index 68b143ecf655..90c2f78b0abc 100644 --- a/pkg/testutils/trace.go +++ b/pkg/testutils/trace.go @@ -15,7 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/tracing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // MakeAmbientCtx creates an AmbientContext with a Tracer in it. diff --git a/pkg/ts/catalog/catalog_generator.go b/pkg/ts/catalog/catalog_generator.go index 71321d213315..56b1f3b742e8 100644 --- a/pkg/ts/catalog/catalog_generator.go +++ b/pkg/ts/catalog/catalog_generator.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/ts/tspb" "github.com/cockroachdb/cockroach/pkg/util/metric" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" prometheusgo "github.com/prometheus/client_model/go" ) diff --git a/pkg/ts/db_test.go b/pkg/ts/db_test.go index ba69f8a03a34..1a6550c92985 100644 --- a/pkg/ts/db_test.go +++ b/pkg/ts/db_test.go @@ -36,8 +36,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/mon" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/tracing" + "github.com/cockroachdb/errors" "github.com/kr/pretty" - "github.com/pkg/errors" ) // testModelRunner is a model-based testing structure used to verify that time diff --git a/pkg/ts/keys.go b/pkg/ts/keys.go index 56b278458b19..bcacecc858b3 100644 --- a/pkg/ts/keys.go +++ b/pkg/ts/keys.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Time series keys are carefully constructed to usefully sort the data in the diff --git a/pkg/ts/query.go b/pkg/ts/query.go index 788a9f78fb7b..041f2213042c 100644 --- a/pkg/ts/query.go +++ b/pkg/ts/query.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/ts/tspb" "github.com/cockroachdb/cockroach/pkg/util/mon" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // timeSeriesSpan represents a queryed time span for a single time series. This diff --git a/pkg/ts/server_test.go b/pkg/ts/server_test.go index 72bb89bd6bfe..639182d5c9cb 100644 --- a/pkg/ts/server_test.go +++ b/pkg/ts/server_test.go @@ -29,9 +29,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/ts" "github.com/cockroachdb/cockroach/pkg/ts/tspb" "github.com/cockroachdb/cockroach/pkg/util/leaktest" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" "github.com/kr/pretty" - "github.com/pkg/errors" ) func TestServerQuery(t *testing.T) { diff --git a/pkg/ui/ui.go b/pkg/ui/ui.go index c46d33030a59..97e78c262f80 100644 --- a/pkg/ui/ui.go +++ b/pkg/ui/ui.go @@ -27,8 +27,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/build" "github.com/cockroachdb/cockroach/pkg/util/log" + "github.com/cockroachdb/errors" assetfs "github.com/elazarl/go-bindata-assetfs" - "github.com/pkg/errors" ) // Asset loads and returns the asset for the given name. It returns an error if diff --git a/pkg/util/binfetcher/binfetcher.go b/pkg/util/binfetcher/binfetcher.go index 8b0748678c30..cd96eab33606 100644 --- a/pkg/util/binfetcher/binfetcher.go +++ b/pkg/util/binfetcher/binfetcher.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/httputil" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Options are the options to Download(). diff --git a/pkg/util/binfetcher/extract.go b/pkg/util/binfetcher/extract.go index aefe2a1bc001..26d356f1f917 100644 --- a/pkg/util/binfetcher/extract.go +++ b/pkg/util/binfetcher/extract.go @@ -18,7 +18,7 @@ import ( "io/ioutil" "os" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func untar(r io.Reader, destFile *os.File) error { diff --git a/pkg/util/causer/causer_test.go b/pkg/util/causer/causer_test.go index 4978ef25dbfa..2c99414a202a 100644 --- a/pkg/util/causer/causer_test.go +++ b/pkg/util/causer/causer_test.go @@ -14,7 +14,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type fooErr struct { diff --git a/pkg/util/contextutil/context_test.go b/pkg/util/contextutil/context_test.go index 4cc982eb4151..802349402c4d 100644 --- a/pkg/util/contextutil/context_test.go +++ b/pkg/util/contextutil/context_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/util/encoding/decimal.go b/pkg/util/encoding/decimal.go index f94412c4c0cf..346017c04b22 100644 --- a/pkg/util/encoding/decimal.go +++ b/pkg/util/encoding/decimal.go @@ -22,7 +22,7 @@ import ( "unsafe" "github.com/cockroachdb/apd" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // EncodeDecimalAscending returns the resulting byte slice with the encoded decimal diff --git a/pkg/util/encoding/encoding_test.go b/pkg/util/encoding/encoding_test.go index 35250c3964cd..3bd09dda8d22 100644 --- a/pkg/util/encoding/encoding_test.go +++ b/pkg/util/encoding/encoding_test.go @@ -28,7 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timetz" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/util/uuid" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/util/encoding/float.go b/pkg/util/encoding/float.go index 9d2a7b76f6ef..7deb31cff94c 100644 --- a/pkg/util/encoding/float.go +++ b/pkg/util/encoding/float.go @@ -13,7 +13,7 @@ package encoding import ( "math" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // EncodeFloatAscending returns the resulting byte slice with the encoded float64 diff --git a/pkg/util/grpcutil/grpc_util_test.go b/pkg/util/grpcutil/grpc_util_test.go index 410d750023ac..7cbb192a8ed3 100644 --- a/pkg/util/grpcutil/grpc_util_test.go +++ b/pkg/util/grpcutil/grpc_util_test.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/grpcutil" "github.com/cockroachdb/cockroach/pkg/util/leaktest" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "google.golang.org/grpc" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/pkg/util/hash.go b/pkg/util/hash.go index f80d7397800f..27397b647ce7 100644 --- a/pkg/util/hash.go +++ b/pkg/util/hash.go @@ -13,7 +13,7 @@ package util import ( "hash/crc32" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // CRC32 computes the Castagnoli CRC32 of the given data. diff --git a/pkg/util/hlc/hlc.go b/pkg/util/hlc/hlc.go index f010aa60eacc..5bf40e0fa3f7 100644 --- a/pkg/util/hlc/hlc.go +++ b/pkg/util/hlc/hlc.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TODO(Tobias): Figure out if it would make sense to save some diff --git a/pkg/util/hlc/hlc_clock_device_stub.go b/pkg/util/hlc/hlc_clock_device_stub.go index f2f32391d168..652df34dce9b 100644 --- a/pkg/util/hlc/hlc_clock_device_stub.go +++ b/pkg/util/hlc/hlc_clock_device_stub.go @@ -15,7 +15,7 @@ package hlc import ( "context" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // ClockSource contains the handle of the clock device as well as the diff --git a/pkg/util/hlc/hlc_test.go b/pkg/util/hlc/hlc_test.go index c795267306b7..74a7ca7a432b 100644 --- a/pkg/util/hlc/hlc_test.go +++ b/pkg/util/hlc/hlc_test.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" ) diff --git a/pkg/util/hlc/timestamp.go b/pkg/util/hlc/timestamp.go index 52e34047e6de..9a00fafc91ea 100644 --- a/pkg/util/hlc/timestamp.go +++ b/pkg/util/hlc/timestamp.go @@ -19,7 +19,7 @@ import ( "unsafe" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Timestamp constant values. diff --git a/pkg/util/httputil/http.go b/pkg/util/httputil/http.go index cf3cd1f86e3d..fd02d3030b71 100644 --- a/pkg/util/httputil/http.go +++ b/pkg/util/httputil/http.go @@ -17,8 +17,8 @@ import ( "strconv" "github.com/cockroachdb/cockroach/pkg/util/protoutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/jsonpb" - "github.com/pkg/errors" ) const ( diff --git a/pkg/util/keysutil/keys.go b/pkg/util/keysutil/keys.go index e83a49986009..a590cb4e9e43 100644 --- a/pkg/util/keysutil/keys.go +++ b/pkg/util/keysutil/keys.go @@ -16,7 +16,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // PrettyScanner implements a partial right inverse to keys.PrettyPrint(): it diff --git a/pkg/util/log/crash_reporting.go b/pkg/util/log/crash_reporting.go index f0778ad0a17d..aea66191f13a 100644 --- a/pkg/util/log/crash_reporting.go +++ b/pkg/util/log/crash_reporting.go @@ -30,8 +30,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/stacktrace" "github.com/cockroachdb/cockroach/pkg/util/sysutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" raven "github.com/getsentry/raven-go" - "github.com/pkg/errors" + pkgErr "github.com/pkg/errors" ) // The call stack here is usually: @@ -579,7 +580,7 @@ func RegisterTagFn(key string, value func(context.Context) string) { // that information (i.e. if it is an errors.withStack). Returns "" otherwise. func ErrorSource(i interface{}) string { type stackTracer interface { - StackTrace() errors.StackTrace + StackTrace() pkgErr.StackTrace } if e, ok := i.(stackTracer); ok { tr := e.StackTrace() diff --git a/pkg/util/log/crash_reporting_test.go b/pkg/util/log/crash_reporting_test.go index 1455a93845b2..73fadf1bd829 100644 --- a/pkg/util/log/crash_reporting_test.go +++ b/pkg/util/log/crash_reporting_test.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Renumber lines so they're stable no matter what changes above. (We @@ -65,7 +65,7 @@ var safeErrorTestCases = func() []safeErrorTestCase { { // Same as last, but skipping through to the cause: panic(errors.Wrap(safeErr, "gibberish")). format: "", rs: []interface{}{errors.Wrap(runtimeErr, "unseen")}, - expErr: "?:0: crash_reporting_test.go:1035: caused by *errors.withMessage: caused by *runtime.TypeAssertionError: interface conversion: interface {} is nil, not int", + expErr: "?:0: crash_reporting_test.go:1035: caused by *errutil.withMessage: caused by *runtime.TypeAssertionError: interface conversion: interface {} is nil, not int", expStr: "", }, { @@ -89,7 +89,7 @@ var safeErrorTestCases = func() []safeErrorTestCase { format: "outer %+v", rs: []interface{}{ errors.Wrapf(context.Canceled, "this will unfortunately be lost: %d", Safe(6)), }, - expErr: "?:0: outer %+v | crash_reporting_test.go:1058: caused by *errors.withMessage: caused by *errors.errorString: context canceled", + expErr: "?:0: outer %+v | crash_reporting_test.go:1058: caused by *safedetails.withSafeDetails: caused by *errutil.withMessage: caused by *errors.errorString: context canceled", expStr: "", }, { @@ -102,17 +102,17 @@ var safeErrorTestCases = func() []safeErrorTestCase { // Verify that unknown sentinel errors print at least their type (regression test). // Also, that its Error() is never called (since it would panic). format: "%s", rs: []interface{}{errWrappedSentinel}, - expErr: "?:0: %s | crash_reporting_test.go:1015: caused by *errors.withMessage: caused by crash_reporting_test.go:1015: caused by *errors.withMessage: caused by struct { error }", + expErr: "?:0: %s | crash_reporting_test.go:1015: caused by *errutil.withMessage: caused by crash_reporting_test.go:1015: caused by *safedetails.withSafeDetails: caused by *errutil.withMessage: caused by struct { error }", expStr: "", }, { format: "", rs: []interface{}{errWrapped3}, - expErr: "?:0: crash_reporting_test.go:1014: caused by *errors.withMessage: caused by crash_reporting_test.go:1013: caused by *errors.withMessage: caused by crash_reporting_test.go:1012: caused by *errors.withMessage: caused by crash_reporting_test.go:1011", + expErr: "?:0: crash_reporting_test.go:1014: caused by *errutil.withMessage: caused by crash_reporting_test.go:1013: caused by *safedetails.withSafeDetails: caused by *errutil.withMessage: caused by crash_reporting_test.go:1012: caused by *errutil.withMessage: caused by crash_reporting_test.go:1011: caused by *safedetails.withSafeDetails: caused by *errors.errorString", expStr: "", }, { format: "", rs: []interface{}{&net.OpError{Op: "write", Net: "tcp", Source: &util.UnresolvedAddr{AddressField: "sensitive-source"}, Addr: &util.UnresolvedAddr{AddressField: "sensitive-addr"}, Err: errors.New("not safe")}}, - expErr: "?:0: *net.OpError: write tcp redacted->redacted: crash_reporting_test.go:1082", + expErr: "?:0: *net.OpError: write tcp redacted->redacted: crash_reporting_test.go:1082: caused by *errors.errorString", expStr: "", }, } diff --git a/pkg/util/log/file.go b/pkg/util/log/file.go index b67985dcd150..6f43af62e833 100644 --- a/pkg/util/log/file.go +++ b/pkg/util/log/file.go @@ -32,7 +32,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // LogFileMaxSize is the maximum size of a log file in bytes. diff --git a/pkg/util/log/test_log_scope.go b/pkg/util/log/test_log_scope.go index 8459d5c530ca..5618eb757230 100644 --- a/pkg/util/log/test_log_scope.go +++ b/pkg/util/log/test_log_scope.go @@ -18,7 +18,7 @@ import ( "runtime" "github.com/cockroachdb/cockroach/pkg/util/fileutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // TestLogScope represents the lifetime of a logging output. It diff --git a/pkg/util/metric/graphite_exporter.go b/pkg/util/metric/graphite_exporter.go index d000132868ef..73edc1467281 100644 --- a/pkg/util/metric/graphite_exporter.go +++ b/pkg/util/metric/graphite_exporter.go @@ -17,7 +17,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/prometheus/client_golang/prometheus/graphite" ) diff --git a/pkg/util/mon/bytes_usage.go b/pkg/util/mon/bytes_usage.go index 0ad5406809b6..91d22b1cd748 100644 --- a/pkg/util/mon/bytes_usage.go +++ b/pkg/util/mon/bytes_usage.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/metric" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // BoundAccount and BytesMonitor together form the mechanism by which diff --git a/pkg/util/protoutil/jsonpb_marshal.go b/pkg/util/protoutil/jsonpb_marshal.go index f32e956d752d..cd02994f756b 100644 --- a/pkg/util/protoutil/jsonpb_marshal.go +++ b/pkg/util/protoutil/jsonpb_marshal.go @@ -17,10 +17,10 @@ import ( "io" "reflect" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/jsonpb" "github.com/gogo/protobuf/proto" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/pkg/errors" ) var _ gwruntime.Marshaler = (*JSONPb)(nil) diff --git a/pkg/util/protoutil/marshaler.go b/pkg/util/protoutil/marshaler.go index 74a611112045..73af234a3436 100644 --- a/pkg/util/protoutil/marshaler.go +++ b/pkg/util/protoutil/marshaler.go @@ -14,9 +14,9 @@ import ( "io" "io/ioutil" + "github.com/cockroachdb/errors" "github.com/gogo/protobuf/proto" gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/pkg/errors" ) var _ gwruntime.Marshaler = (*ProtoPb)(nil) diff --git a/pkg/util/quotapool/intpool_test.go b/pkg/util/quotapool/intpool_test.go index b5d086a56c8f..06f665751f02 100644 --- a/pkg/util/quotapool/intpool_test.go +++ b/pkg/util/quotapool/intpool_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/quotapool" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/retry/retry.go b/pkg/util/retry/retry.go index 2fd2f7766be5..7d74ad28086d 100644 --- a/pkg/util/retry/retry.go +++ b/pkg/util/retry/retry.go @@ -17,7 +17,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Options provides reusable configuration of Retry objects. diff --git a/pkg/util/retry/retry_test.go b/pkg/util/retry/retry_test.go index 29b6e3206db1..a447c7623186 100644 --- a/pkg/util/retry/retry_test.go +++ b/pkg/util/retry/retry_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/search/search.go b/pkg/util/search/search.go index dd72d0a11801..2ba8d561b44d 100644 --- a/pkg/util/search/search.go +++ b/pkg/util/search/search.go @@ -10,7 +10,7 @@ package search -import "github.com/pkg/errors" +import "github.com/cockroachdb/errors" // A Predicate is a funcation that returns whether a given search value "passes" // or not. It assumes that that within the search domain of [min, max) provided diff --git a/pkg/util/stop/stopper_test.go b/pkg/util/stop/stopper_test.go index baf1e1ab88b5..a90b65ed17b2 100644 --- a/pkg/util/stop/stopper_test.go +++ b/pkg/util/stop/stopper_test.go @@ -26,7 +26,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/quotapool" "github.com/cockroachdb/cockroach/pkg/util/stop" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) diff --git a/pkg/util/strings.go b/pkg/util/strings.go index 42f3b8521d55..bb24d548fb5b 100644 --- a/pkg/util/strings.go +++ b/pkg/util/strings.go @@ -13,7 +13,7 @@ package util import ( "unicode/utf8" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // GetSingleRune decodes the string s as a single rune if possible. diff --git a/pkg/util/sysutil/large_file_linux.go b/pkg/util/sysutil/large_file_linux.go index b37c7d6f0be8..d189686465bf 100644 --- a/pkg/util/sysutil/large_file_linux.go +++ b/pkg/util/sysutil/large_file_linux.go @@ -15,7 +15,7 @@ package sysutil import ( "os" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sys/unix" ) diff --git a/pkg/util/sysutil/large_file_naive.go b/pkg/util/sysutil/large_file_naive.go index a05e75662c85..b526dcbefb51 100644 --- a/pkg/util/sysutil/large_file_naive.go +++ b/pkg/util/sysutil/large_file_naive.go @@ -15,7 +15,7 @@ package sysutil import ( "os" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // CreateLargeFile creates a large file at the given path with bytes size. On diff --git a/pkg/util/sysutil/large_file_test.go b/pkg/util/sysutil/large_file_test.go index 3cf0b0ff3ed6..683440d9b2d2 100644 --- a/pkg/util/sysutil/large_file_test.go +++ b/pkg/util/sysutil/large_file_test.go @@ -15,7 +15,7 @@ import ( "os" "testing" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) func TestLargeFile(t *testing.T) { diff --git a/pkg/util/timeutil/now_windows.go b/pkg/util/timeutil/now_windows.go index 8b5f0641a534..1f1aac378cca 100644 --- a/pkg/util/timeutil/now_windows.go +++ b/pkg/util/timeutil/now_windows.go @@ -13,7 +13,7 @@ package timeutil import ( "time" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sys/windows" ) diff --git a/pkg/util/tracing/tracer.go b/pkg/util/tracing/tracer.go index cb5dba7b57e5..7d2f5bdad5a4 100644 --- a/pkg/util/tracing/tracer.go +++ b/pkg/util/tracing/tracer.go @@ -25,9 +25,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/util/caller" "github.com/cockroachdb/cockroach/pkg/util/envutil" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" opentracing "github.com/opentracing/opentracing-go" - "github.com/pkg/errors" "golang.org/x/net/trace" ) diff --git a/pkg/util/tracing/tracer_span.go b/pkg/util/tracing/tracer_span.go index 1c07cfc080da..d07fe7a2d9ef 100644 --- a/pkg/util/tracing/tracer_span.go +++ b/pkg/util/tracing/tracer_span.go @@ -23,13 +23,13 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" "github.com/cockroachdb/cockroach/pkg/util/timeutil" + "github.com/cockroachdb/errors" "github.com/cockroachdb/logtags" proto "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" jaegerjson "github.com/jaegertracing/jaeger/model/json" opentracing "github.com/opentracing/opentracing-go" otlog "github.com/opentracing/opentracing-go/log" - "github.com/pkg/errors" "golang.org/x/net/trace" ) diff --git a/pkg/util/uint128/uint128.go b/pkg/util/uint128/uint128.go index 87a72fb5dd15..e54e24cac611 100644 --- a/pkg/util/uint128/uint128.go +++ b/pkg/util/uint128/uint128.go @@ -14,7 +14,7 @@ import ( "encoding/binary" "encoding/hex" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Uint128 is a big-endian 128 bit unsigned integer which wraps two uint64s. diff --git a/pkg/util/uuid/generator.go b/pkg/util/uuid/generator.go index f84c8da06f34..98018c1f326d 100644 --- a/pkg/util/uuid/generator.go +++ b/pkg/util/uuid/generator.go @@ -29,7 +29,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Difference in 100-nanosecond intervals between diff --git a/pkg/util/uuid/uuid.go b/pkg/util/uuid/uuid.go index 46612a909e18..e6a6aac0739e 100644 --- a/pkg/util/uuid/uuid.go +++ b/pkg/util/uuid/uuid.go @@ -24,7 +24,7 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/util/timeutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Size of a UUID in bytes. diff --git a/pkg/util/uuid/uuid_wrapper.go b/pkg/util/uuid/uuid_wrapper.go index d93d540a93cf..5ed95d694985 100644 --- a/pkg/util/uuid/uuid_wrapper.go +++ b/pkg/util/uuid/uuid_wrapper.go @@ -17,7 +17,7 @@ import ( "math/rand" "github.com/cockroachdb/cockroach/pkg/util/uint128" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Short returns the first eight characters of the output of String(). diff --git a/pkg/util/version/version.go b/pkg/util/version/version.go index 9703f8f3d1b7..cee0a24e8981 100644 --- a/pkg/util/version/version.go +++ b/pkg/util/version/version.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Version represents a semantic version; see diff --git a/pkg/workload/bank/bank.go b/pkg/workload/bank/bank.go index d501c089f79d..26b2db9f386e 100644 --- a/pkg/workload/bank/bank.go +++ b/pkg/workload/bank/bank.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/bulkingest/bulkingest.go b/pkg/workload/bulkingest/bulkingest.go index 1358c8ed34ee..3a27f4a471e6 100644 --- a/pkg/workload/bulkingest/bulkingest.go +++ b/pkg/workload/bulkingest/bulkingest.go @@ -59,7 +59,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/cli/check.go b/pkg/workload/cli/check.go index 1d9efb3500c8..f1c8ddc2cd21 100644 --- a/pkg/workload/cli/check.go +++ b/pkg/workload/cli/check.go @@ -16,7 +16,7 @@ import ( "strings" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/workload/cli/run.go b/pkg/workload/cli/run.go index 767a2d056842..701ca3225bfe 100644 --- a/pkg/workload/cli/run.go +++ b/pkg/workload/cli/run.go @@ -33,7 +33,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" "github.com/cockroachdb/cockroach/pkg/workload/workloadsql" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" "golang.org/x/time/rate" diff --git a/pkg/workload/csv.go b/pkg/workload/csv.go index e1809861d234..4c16472ca4de 100644 --- a/pkg/workload/csv.go +++ b/pkg/workload/csv.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" "github.com/cockroachdb/cockroach/pkg/util/encoding/csv" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/debug/tpcc_results.go b/pkg/workload/debug/tpcc_results.go index 8833dbd12a31..1ce96b04bd29 100644 --- a/pkg/workload/debug/tpcc_results.go +++ b/pkg/workload/debug/tpcc_results.go @@ -17,7 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/workload/histogram" "github.com/cockroachdb/cockroach/pkg/workload/tpcc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/cobra" ) diff --git a/pkg/workload/indexes/indexes.go b/pkg/workload/indexes/indexes.go index a8c87300ba01..b771b9eb3d07 100644 --- a/pkg/workload/indexes/indexes.go +++ b/pkg/workload/indexes/indexes.go @@ -23,7 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/interleavedpartitioned/interleavedpartitioned.go b/pkg/workload/interleavedpartitioned/interleavedpartitioned.go index ff8850998143..ad0bde3dff6a 100644 --- a/pkg/workload/interleavedpartitioned/interleavedpartitioned.go +++ b/pkg/workload/interleavedpartitioned/interleavedpartitioned.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/jsonload/json.go b/pkg/workload/jsonload/json.go index c00b703ade07..1c4e0d245e03 100644 --- a/pkg/workload/jsonload/json.go +++ b/pkg/workload/jsonload/json.go @@ -27,7 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/kv/kv.go b/pkg/workload/kv/kv.go index 306d6542a6a0..44aba0807651 100644 --- a/pkg/workload/kv/kv.go +++ b/pkg/workload/kv/kv.go @@ -25,7 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/ledger/ledger.go b/pkg/workload/ledger/ledger.go index 0b2b2340212d..3f8dc3a50a61 100644 --- a/pkg/workload/ledger/ledger.go +++ b/pkg/workload/ledger/ledger.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/ledger/worker.go b/pkg/workload/ledger/worker.go index 9a32be56e612..e7c9cdce2285 100644 --- a/pkg/workload/ledger/worker.go +++ b/pkg/workload/ledger/worker.go @@ -19,7 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) type worker struct { diff --git a/pkg/workload/movr/movr.go b/pkg/workload/movr/movr.go index c3e61b6d9913..1cb97f2c93be 100644 --- a/pkg/workload/movr/movr.go +++ b/pkg/workload/movr/movr.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/uuid" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/faker" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/querybench/query_bench.go b/pkg/workload/querybench/query_bench.go index ccc0bc74a94c..4592e397ec63 100644 --- a/pkg/workload/querybench/query_bench.go +++ b/pkg/workload/querybench/query_bench.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/querylog/querylog.go b/pkg/workload/querylog/querylog.go index 36018d665212..7880fe942096 100644 --- a/pkg/workload/querylog/querylog.go +++ b/pkg/workload/querylog/querylog.go @@ -34,9 +34,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" workloadrand "github.com/cockroachdb/cockroach/pkg/workload/rand" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" "github.com/lib/pq/oid" - "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/rand/rand.go b/pkg/workload/rand/rand.go index 02d32814ef21..bcce97f23893 100644 --- a/pkg/workload/rand/rand.go +++ b/pkg/workload/rand/rand.go @@ -27,9 +27,9 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" + "github.com/cockroachdb/errors" "github.com/lib/pq" "github.com/lib/pq/oid" - "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/sql_runner.go b/pkg/workload/sql_runner.go index c1c2b9fb6837..f2bae0c13f74 100644 --- a/pkg/workload/sql_runner.go +++ b/pkg/workload/sql_runner.go @@ -15,8 +15,8 @@ import ( "fmt" "strings" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" - "github.com/pkg/errors" ) // SQLRunner is a helper for issuing SQL statements; it supports multiple diff --git a/pkg/workload/tpcc/checks.go b/pkg/workload/tpcc/checks.go index 248f72b04ba5..696b22727575 100644 --- a/pkg/workload/tpcc/checks.go +++ b/pkg/workload/tpcc/checks.go @@ -13,7 +13,7 @@ package tpcc import ( gosql "database/sql" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) // Check is a tpcc consistency check. diff --git a/pkg/workload/tpcc/ddls.go b/pkg/workload/tpcc/ddls.go index bb538e0a1e30..f6a7383a5a1b 100644 --- a/pkg/workload/tpcc/ddls.go +++ b/pkg/workload/tpcc/ddls.go @@ -14,7 +14,7 @@ import ( gosql "database/sql" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/workload/tpcc/delivery.go b/pkg/workload/tpcc/delivery.go index 3de83db9be2a..21325b39b2f9 100644 --- a/pkg/workload/tpcc/delivery.go +++ b/pkg/workload/tpcc/delivery.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach-go/crdb" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/tpcc/new_order.go b/pkg/workload/tpcc/new_order.go index c120f9ecee9c..46f81d5a3de7 100644 --- a/pkg/workload/tpcc/new_order.go +++ b/pkg/workload/tpcc/new_order.go @@ -21,8 +21,8 @@ import ( "github.com/cockroachdb/cockroach-go/crdb" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/tpcc/order_status.go b/pkg/workload/tpcc/order_status.go index f53284800b79..e07574cad65b 100644 --- a/pkg/workload/tpcc/order_status.go +++ b/pkg/workload/tpcc/order_status.go @@ -19,8 +19,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/bufalloc" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" + "github.com/cockroachdb/errors" "github.com/jackc/pgx/pgtype" - "github.com/pkg/errors" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/tpcc/partition.go b/pkg/workload/tpcc/partition.go index 71812e2c08ee..82a5c8ca6575 100644 --- a/pkg/workload/tpcc/partition.go +++ b/pkg/workload/tpcc/partition.go @@ -15,7 +15,7 @@ import ( gosql "database/sql" "fmt" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/tpcc/payment.go b/pkg/workload/tpcc/payment.go index b1b4d01a67a9..e49c7dd8931a 100644 --- a/pkg/workload/tpcc/payment.go +++ b/pkg/workload/tpcc/payment.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/bufalloc" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/tpcc/result.go b/pkg/workload/tpcc/result.go index 590cb67b5892..6de52b57f852 100644 --- a/pkg/workload/tpcc/result.go +++ b/pkg/workload/tpcc/result.go @@ -15,8 +15,8 @@ import ( "time" "github.com/cockroachdb/cockroach/pkg/workload/histogram" + "github.com/cockroachdb/errors" "github.com/codahale/hdrhistogram" - "github.com/pkg/errors" ) // SpecWarehouseFactor is the default maximum per-warehouse newOrder diff --git a/pkg/workload/tpcc/tpcc.go b/pkg/workload/tpcc/tpcc.go index 15ab41a495f6..1f9438fda27f 100644 --- a/pkg/workload/tpcc/tpcc.go +++ b/pkg/workload/tpcc/tpcc.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" "github.com/cockroachdb/cockroach/pkg/workload/workloadimpl" + "github.com/cockroachdb/errors" "github.com/jackc/pgx" - "github.com/pkg/errors" "github.com/spf13/pflag" "golang.org/x/exp/rand" "golang.org/x/sync/errgroup" diff --git a/pkg/workload/tpcc/worker.go b/pkg/workload/tpcc/worker.go index ea1cbdef8417..97ee67f2edce 100644 --- a/pkg/workload/tpcc/worker.go +++ b/pkg/workload/tpcc/worker.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/exp/rand" ) diff --git a/pkg/workload/tpccchecks/checks_generator.go b/pkg/workload/tpccchecks/checks_generator.go index 22da48e2df9a..0e61ac2abc92 100644 --- a/pkg/workload/tpccchecks/checks_generator.go +++ b/pkg/workload/tpccchecks/checks_generator.go @@ -20,7 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" "github.com/cockroachdb/cockroach/pkg/workload/tpcc" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/tpcds/tpcds.go b/pkg/workload/tpcds/tpcds.go index a1a29add8322..0e048ac81098 100644 --- a/pkg/workload/tpcds/tpcds.go +++ b/pkg/workload/tpcds/tpcds.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/workload.go b/pkg/workload/workload.go index 0409f81ffacc..47f03c2f56b2 100644 --- a/pkg/workload/workload.go +++ b/pkg/workload/workload.go @@ -29,7 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/cockroach/pkg/util/bufalloc" "github.com/cockroachdb/cockroach/pkg/workload/histogram" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/workloadsql/dataload.go b/pkg/workload/workloadsql/dataload.go index 9d909cb617ed..8f0a5080e662 100644 --- a/pkg/workload/workloadsql/dataload.go +++ b/pkg/workload/workloadsql/dataload.go @@ -21,7 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/sync/errgroup" ) diff --git a/pkg/workload/workloadsql/workloadsql.go b/pkg/workload/workloadsql/workloadsql.go index 7d015f0c58ea..254fed10c54d 100644 --- a/pkg/workload/workloadsql/workloadsql.go +++ b/pkg/workload/workloadsql/workloadsql.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/version" "github.com/cockroachdb/cockroach/pkg/workload" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" "golang.org/x/time/rate" ) diff --git a/pkg/workload/ycsb/acknowledged_counter.go b/pkg/workload/ycsb/acknowledged_counter.go index e7272d7e8433..810cef050950 100644 --- a/pkg/workload/ycsb/acknowledged_counter.go +++ b/pkg/workload/ycsb/acknowledged_counter.go @@ -12,7 +12,7 @@ package ycsb import ( "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const ( diff --git a/pkg/workload/ycsb/ycsb.go b/pkg/workload/ycsb/ycsb.go index 8d9d6d6957b4..a53254f94d5a 100644 --- a/pkg/workload/ycsb/ycsb.go +++ b/pkg/workload/ycsb/ycsb.go @@ -28,8 +28,8 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/cockroachdb/cockroach/pkg/workload" "github.com/cockroachdb/cockroach/pkg/workload/histogram" + "github.com/cockroachdb/errors" "github.com/lib/pq" - "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/pkg/workload/ycsb/zipfgenerator.go b/pkg/workload/ycsb/zipfgenerator.go index 0020dc538a0e..055c74213c68 100644 --- a/pkg/workload/ycsb/zipfgenerator.go +++ b/pkg/workload/ycsb/zipfgenerator.go @@ -20,7 +20,7 @@ import ( "math/rand" "github.com/cockroachdb/cockroach/pkg/util/syncutil" - "github.com/pkg/errors" + "github.com/cockroachdb/errors" ) const (