From 4847ae89da52a553cce909de868102bfdffc70c9 Mon Sep 17 00:00:00 2001 From: Chandra Thumuluru Date: Fri, 20 Mar 2026 19:37:43 +0000 Subject: [PATCH] wip --- DEPS.bzl | 9 ++++----- build/bazelutil/distdir_files.bzl | 1 - go.mod | 3 ++- go.sum | 4 ++-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 7b6d51620b28..cdb5b61ae4e5 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -11080,11 +11080,10 @@ def go_deps(): name = "io_storj_drpc", build_file_proto_mode = "disable_global", importpath = "storj.io/drpc", - sha256 = "6a75337af2e66ae56f1e94d7fce68bcd11cef843148425aea049969e921c9e94", - strip_prefix = "github.com/cockroachdb/drpc@v0.0.0-20260310153551-4b35ab889392", - urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20260310153551-4b35ab889392.zip", - ], + replace = "github.com/cthumuluru-crdb/drpc", + # TODO: mirror this repo (to fix, run `./dev generate bazel --mirror`) + sum = "h1:dW0W82mWyqtGeDLNeNYqPZs/urSvPS6Pde418jRWRNc=", + version = "v0.0.0-20260321074147-566d726882df", ) go_repository( name = "org_bazil_fuse", diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index f755cbbbeb4e..c4de363c7680 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -349,7 +349,6 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlfmt/com_github_cockroachdb_crlfmt-v0.0.0-20221214225007-b2fc5c302548.zip": "fedc01bdd6d964da0425d5eaac8efadc951e78e13f102292cc0774197f09ab63", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20251122031428-fe658a2dbda1.zip": "fa361e52b072ce18ac1d103e2556851906477361b5fe688745d29b1efabff3cb", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/datadriven/com_github_cockroachdb_datadriven-v1.0.3-0.20251123150250-ddff6747b112.zip": "6c1ae8a9550d3a92f85d7371e5c0caf922dc0ff1425e299359814b6a9a587f14", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20260310153551-4b35ab889392.zip": "6a75337af2e66ae56f1e94d7fce68bcd11cef843148425aea049969e921c9e94", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/errors/com_github_cockroachdb_errors-v1.12.1-0.20251010171200-64801262cd6f.zip": "4df66cc44791d4290071696abf179dc6df7b94b4cb5d29a20f39c6bf522c60ee", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gogoproto/com_github_cockroachdb_gogoproto-v1.3.3-0.20241216150617-2358cdb156a1.zip": "bf052c9a7f9e23fb3ec7e9f3b7201cfc264c18ed6da0d662952d276dbc339003", diff --git a/go.mod b/go.mod index 075051ab1320..21ecf9b1967f 100644 --- a/go.mod +++ b/go.mod @@ -561,7 +561,8 @@ replace github.com/docker/docker => github.com/moby/moby v25.0.14+incompatible replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.3.3-0.20241216150617-2358cdb156a1 -replace storj.io/drpc => github.com/cockroachdb/drpc v0.0.0-20260310153551-4b35ab889392 +// replace storj.io/drpc => github.com/cockroachdb/drpc v0.0.0-20260310153551-4b35ab889392 +replace storj.io/drpc => github.com/cthumuluru-crdb/drpc v0.0.0-20260321074147-566d726882df // Note: This forked dependency adds a commit that opens up some // private APIs to enable us to make some perf improvements to diff --git a/go.sum b/go.sum index 3a65bce9700b..f4870a2bc2b6 100644 --- a/go.sum +++ b/go.sum @@ -571,8 +571,6 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/datadriven v1.0.3-0.20251123150250-ddff6747b112 h1:T1++5Vt0/4/IWZ1mHmUYl7fhQnz50QhNWIY+ITvLLIM= github.com/cockroachdb/datadriven v1.0.3-0.20251123150250-ddff6747b112/go.mod h1:jsaKMvD3RBCATk1/jbUZM8C9idWBJME9+VRZ5+Liq1g= -github.com/cockroachdb/drpc v0.0.0-20260310153551-4b35ab889392 h1:kPHrXR4FLm4W0iSwzdrRlwvI7CguvJ7h0BKuGCFrY8E= -github.com/cockroachdb/drpc v0.0.0-20260310153551-4b35ab889392/go.mod h1:jeOpcnHh3/TvQ7K2kYXyLUMOMoMpuxp5vtdmtNPVW+8= github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f h1:lUmJxzb2/ukuRIvKTaNkvuj5LwlX4u/KxnI3zmx1SSw= github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f/go.mod h1:SvzfYNNBshAVbZ8wzNc/UPK3w1vf0dKDUP41ucAIf7g= github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 h1:YqzBA7tf8Gv8Oz0BbBsPenqkyjiohS7EUIwi7p1QJCU= @@ -730,6 +728,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= +github.com/cthumuluru-crdb/drpc v0.0.0-20260321074147-566d726882df h1:dW0W82mWyqtGeDLNeNYqPZs/urSvPS6Pde418jRWRNc= +github.com/cthumuluru-crdb/drpc v0.0.0-20260321074147-566d726882df/go.mod h1:23nQUjIxaHsLrJ/5HUQAIroBLFy5BSswxBgZ9ZZHhRE= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=