From a23777f401c8585e1afa2ae0418f1925022a36d9 Mon Sep 17 00:00:00 2001
From: Josephine Lee <josephine@cockroachlabs.com>
Date: Wed, 4 May 2022 16:53:38 -0400
Subject: [PATCH 1/2] ui: Fix the custom time picker reverting to the
 previously selected time

This commit fixes a bug introduced by
https://github.com/cockroachdb/cockroach/pull/80660; where if a user selects a
different time in the custom time selection, the component may revert to the
currently select time.

Release note: None
---
 .../cluster-ui/src/dateRange/dateRange.tsx    | 21 +++++++++++++++----
 .../workspaces/cluster-ui/src/util/hooks.ts   | 19 +++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 pkg/ui/workspaces/cluster-ui/src/util/hooks.ts

diff --git a/pkg/ui/workspaces/cluster-ui/src/dateRange/dateRange.tsx b/pkg/ui/workspaces/cluster-ui/src/dateRange/dateRange.tsx
index 56e0b30c90ee..cb34e60af800 100644
--- a/pkg/ui/workspaces/cluster-ui/src/dateRange/dateRange.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/dateRange/dateRange.tsx
@@ -17,6 +17,7 @@ import { Button } from "src/button";
 import { Text, TextTypes } from "src/text";
 
 import styles from "./dateRange.module.scss";
+import { usePrevious } from "../util/hooks";
 
 const cx = classNames.bind(styles);
 
@@ -51,14 +52,26 @@ export function DateRangeMenu({
     startInit || moment.utc(),
   );
   const [endMoment, setEndMoment] = useState<Moment>(endInit || moment.utc());
+  const prevStartInit = usePrevious(startInit);
+  const prevEndInit = usePrevious(endInit);
 
   useEffect(() => {
-    setStartMoment(startInit);
-  }, [startInit]);
+    // .unix() is needed compare the actual time value instead of referential equality of the Moment object.
+    // Otherwise, triggering `setStartMoment` unnecessarily can cause a bug where the selection jumps back to the
+    // currently selected time while the user is in the middle of making a different selection.
+    if (startInit?.unix() != prevStartInit?.unix()) {
+      setStartMoment(startInit);
+    }
+  }, [startInit, prevStartInit]);
 
   useEffect(() => {
-    setEndMoment(endInit);
-  }, [endInit]);
+    // .unix() is needed compare the actual time value instead of referential equality of the Moment object.
+    // Otherwise, triggering `setEndMoment` unnecessarily can cause a bug where the selection jumps back to the
+    // currently selected time while the user is in the middle of making a different selection.
+    if (endInit?.unix() != prevEndInit?.unix()) {
+      setEndMoment(endInit);
+    }
+  }, [endInit, prevEndInit]);
 
   const onChangeStart = (m?: Moment) => {
     m && setStartMoment(m);
diff --git a/pkg/ui/workspaces/cluster-ui/src/util/hooks.ts b/pkg/ui/workspaces/cluster-ui/src/util/hooks.ts
new file mode 100644
index 000000000000..d5ecf35f4c51
--- /dev/null
+++ b/pkg/ui/workspaces/cluster-ui/src/util/hooks.ts
@@ -0,0 +1,19 @@
+// Copyright 2022 The Cockroach Authors.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+import { useEffect, useRef } from "react";
+
+export const usePrevious = <T>(value: T): T | undefined => {
+  const ref = useRef<T>();
+  useEffect(() => {
+    ref.current = value;
+  });
+  return ref.current;
+};

From d1879ebd6349ea90f0c6d2355d1d437772be34bb Mon Sep 17 00:00:00 2001
From: Ricky Stewart <ricky@cockroachlabs.com>
Date: Thu, 5 May 2022 10:47:45 -0500
Subject: [PATCH 2/2] *: remove unused proto imports

Release note: None
---
 pkg/blobs/blobspb/BUILD.bazel                               | 2 --
 pkg/blobs/blobspb/blobs.proto                               | 2 --
 pkg/ccl/baseccl/BUILD.bazel                                 | 2 --
 pkg/ccl/baseccl/encryption_options.proto                    | 2 --
 pkg/ccl/storageccl/engineccl/enginepbccl/BUILD.bazel        | 2 --
 pkg/ccl/storageccl/engineccl/enginepbccl/key_registry.proto | 2 --
 pkg/ccl/storageccl/engineccl/enginepbccl/stats.proto        | 1 -
 pkg/jobs/jobspb/schedule.proto                              | 1 -
 pkg/kv/kvserver/closedts/ctpb/BUILD.bazel                   | 2 --
 pkg/kv/kvserver/closedts/ctpb/service.proto                 | 1 -
 pkg/kv/kvserver/concurrency/poison/policy.proto             | 2 --
 pkg/kv/kvserver/protectedts/ptpb/BUILD.bazel                | 2 --
 pkg/kv/kvserver/protectedts/ptpb/protectedts.proto          | 1 -
 pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel           | 2 --
 pkg/kv/kvserver/protectedts/ptstorage/storage.proto         | 1 -
 pkg/kv/kvserver/storage_services.proto                      | 1 -
 pkg/server/serverpb/BUILD.bazel                             | 5 +----
 pkg/server/serverpb/status.proto                            | 3 ---
 pkg/sql/catalog/descpb/encoded_datum.proto                  | 2 --
 pkg/sql/execinfrapb/BUILD.bazel                             | 5 +----
 pkg/sql/execinfrapb/data.proto                              | 5 -----
 pkg/sql/execinfrapb/processors_bulk_io.proto                | 2 --
 pkg/sql/rowenc/rowencpb/BUILD.bazel                         | 2 --
 pkg/sql/rowenc/rowencpb/index_encoding.proto                | 2 --
 pkg/sql/sessiondatapb/session_revival_token.proto           | 1 -
 pkg/storage/enginepb/file_registry.proto                    | 2 --
 26 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/pkg/blobs/blobspb/BUILD.bazel b/pkg/blobs/blobspb/BUILD.bazel
index 129471aee0a5..eeac31cf93a0 100644
--- a/pkg/blobs/blobspb/BUILD.bazel
+++ b/pkg/blobs/blobspb/BUILD.bazel
@@ -7,7 +7,6 @@ proto_library(
     srcs = ["blobs.proto"],
     strip_import_prefix = "/pkg",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto:gogo_proto"],
 )
 
 go_proto_library(
@@ -16,7 +15,6 @@ go_proto_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/blobs/blobspb",
     proto = ":blobspb_proto",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto"],
 )
 
 go_library(
diff --git a/pkg/blobs/blobspb/blobs.proto b/pkg/blobs/blobspb/blobs.proto
index eba08c484cd1..6e11656a9738 100644
--- a/pkg/blobs/blobspb/blobs.proto
+++ b/pkg/blobs/blobspb/blobs.proto
@@ -12,8 +12,6 @@ syntax = "proto3";
 package cockroach.blobs;
 option go_package = "blobspb";
 
-import "gogoproto/gogo.proto";
-
 // GetRequest is used to read a file from a remote node.
 // It's path is specified by `filename`, which can either
 // be a relative path from the base of external IO dir, or
diff --git a/pkg/ccl/baseccl/BUILD.bazel b/pkg/ccl/baseccl/BUILD.bazel
index 9722bd3f3652..aa3f0504f999 100644
--- a/pkg/ccl/baseccl/BUILD.bazel
+++ b/pkg/ccl/baseccl/BUILD.bazel
@@ -30,7 +30,6 @@ proto_library(
     srcs = ["encryption_options.proto"],
     strip_import_prefix = "/pkg",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto:gogo_proto"],
 )
 
 go_proto_library(
@@ -39,5 +38,4 @@ go_proto_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/ccl/baseccl",
     proto = ":baseccl_proto",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto"],
 )
diff --git a/pkg/ccl/baseccl/encryption_options.proto b/pkg/ccl/baseccl/encryption_options.proto
index 67af79e8a012..0a218c381774 100644
--- a/pkg/ccl/baseccl/encryption_options.proto
+++ b/pkg/ccl/baseccl/encryption_options.proto
@@ -10,8 +10,6 @@ syntax = "proto3";
 package cockroach.ccl.baseccl;
 option go_package = "baseccl";
 
-import "gogoproto/gogo.proto";
-
 enum EncryptionKeySource {
   // Plain key files.
   KeyFiles = 0;
diff --git a/pkg/ccl/storageccl/engineccl/enginepbccl/BUILD.bazel b/pkg/ccl/storageccl/engineccl/enginepbccl/BUILD.bazel
index 0382e4694922..a26c22cb94f2 100644
--- a/pkg/ccl/storageccl/engineccl/enginepbccl/BUILD.bazel
+++ b/pkg/ccl/storageccl/engineccl/enginepbccl/BUILD.bazel
@@ -10,7 +10,6 @@ proto_library(
     ],
     strip_import_prefix = "/pkg",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto:gogo_proto"],
 )
 
 go_proto_library(
@@ -19,7 +18,6 @@ go_proto_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl/enginepbccl",
     proto = ":enginepbccl_proto",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto"],
 )
 
 go_library(
diff --git a/pkg/ccl/storageccl/engineccl/enginepbccl/key_registry.proto b/pkg/ccl/storageccl/engineccl/enginepbccl/key_registry.proto
index cbc6764e768e..fc0456ada07b 100644
--- a/pkg/ccl/storageccl/engineccl/enginepbccl/key_registry.proto
+++ b/pkg/ccl/storageccl/engineccl/enginepbccl/key_registry.proto
@@ -10,8 +10,6 @@ syntax = "proto3";
 package cockroach.ccl.storageccl.engineccl.enginepbccl;
 option go_package = "enginepbccl";
 
-import "gogoproto/gogo.proto";
-
 enum EncryptionType {
   // No encryption.
   Plaintext = 0;
diff --git a/pkg/ccl/storageccl/engineccl/enginepbccl/stats.proto b/pkg/ccl/storageccl/engineccl/enginepbccl/stats.proto
index f171882b80ea..9be018658049 100644
--- a/pkg/ccl/storageccl/engineccl/enginepbccl/stats.proto
+++ b/pkg/ccl/storageccl/engineccl/enginepbccl/stats.proto
@@ -10,7 +10,6 @@ syntax = "proto3";
 package cockroach.ccl.storageccl.engineccl.enginepbccl;
 option go_package = "enginepbccl";
 
-import "gogoproto/gogo.proto";
 import "ccl/storageccl/engineccl/enginepbccl/key_registry.proto";
 
 // EncryptionStatus contains encryption-related information.
diff --git a/pkg/jobs/jobspb/schedule.proto b/pkg/jobs/jobspb/schedule.proto
index 076cb42e98ba..54d2ab919cf7 100644
--- a/pkg/jobs/jobspb/schedule.proto
+++ b/pkg/jobs/jobspb/schedule.proto
@@ -12,7 +12,6 @@ syntax = "proto3";
 package cockroach.jobs.jobspb;
 option go_package = "jobspb";
 
-import "gogoproto/gogo.proto";
 import "google/protobuf/any.proto";
 
 // ScheduleDetails describes how to schedule and execute the job.
diff --git a/pkg/kv/kvserver/closedts/ctpb/BUILD.bazel b/pkg/kv/kvserver/closedts/ctpb/BUILD.bazel
index 36dc48937d49..df2afb2ed7f8 100644
--- a/pkg/kv/kvserver/closedts/ctpb/BUILD.bazel
+++ b/pkg/kv/kvserver/closedts/ctpb/BUILD.bazel
@@ -23,7 +23,6 @@ proto_library(
         "//pkg/roachpb:roachpb_proto",
         "//pkg/util/hlc:hlc_proto",
         "@com_github_gogo_protobuf//gogoproto:gogo_proto",
-        "@go_googleapis//google/api:annotations_proto",
     ],
 )
 
@@ -37,6 +36,5 @@ go_proto_library(
         "//pkg/roachpb",
         "//pkg/util/hlc",
         "@com_github_gogo_protobuf//gogoproto",
-        "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
     ],
 )
diff --git a/pkg/kv/kvserver/closedts/ctpb/service.proto b/pkg/kv/kvserver/closedts/ctpb/service.proto
index 7dcc66cfd5b1..643de91f2821 100644
--- a/pkg/kv/kvserver/closedts/ctpb/service.proto
+++ b/pkg/kv/kvserver/closedts/ctpb/service.proto
@@ -16,7 +16,6 @@ import "roachpb/data.proto";
 import "util/hlc/timestamp.proto";
 
 import "gogoproto/gogo.proto";
-import "google/api/annotations.proto";
 
 // Update contains information about (the advancement of) closed timestamps for
 // ranges with leases on the sender node. Updates are of two types: snapshots
diff --git a/pkg/kv/kvserver/concurrency/poison/policy.proto b/pkg/kv/kvserver/concurrency/poison/policy.proto
index 5f3371cbf281..acf2a718c55f 100644
--- a/pkg/kv/kvserver/concurrency/poison/policy.proto
+++ b/pkg/kv/kvserver/concurrency/poison/policy.proto
@@ -12,8 +12,6 @@ syntax = "proto3";
 package cockroach.kv.kvserver.concurrency.poison;
 option go_package = "poison";
 
-import "gogoproto/gogo.proto";
-
 // Policy determines how a request will react to encountering a poisoned
 // latch. A poisoned latch is a latch for which the holder is unable to make
 // progress. That is, waiters of this latch should not expect to be able to
diff --git a/pkg/kv/kvserver/protectedts/ptpb/BUILD.bazel b/pkg/kv/kvserver/protectedts/ptpb/BUILD.bazel
index 689c8507fd2e..e5b06be5d0c1 100644
--- a/pkg/kv/kvserver/protectedts/ptpb/BUILD.bazel
+++ b/pkg/kv/kvserver/protectedts/ptpb/BUILD.bazel
@@ -11,7 +11,6 @@ proto_library(
         "//pkg/roachpb:roachpb_proto",
         "//pkg/util/hlc:hlc_proto",
         "@com_github_gogo_protobuf//gogoproto:gogo_proto",
-        "@go_googleapis//google/api:annotations_proto",
     ],
 )
 
@@ -27,7 +26,6 @@ go_proto_library(
         "//pkg/util/hlc",
         "//pkg/util/uuid",  # keep
         "@com_github_gogo_protobuf//gogoproto",
-        "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
     ],
 )
 
diff --git a/pkg/kv/kvserver/protectedts/ptpb/protectedts.proto b/pkg/kv/kvserver/protectedts/ptpb/protectedts.proto
index 68c7e5edd713..52bf13359e8c 100644
--- a/pkg/kv/kvserver/protectedts/ptpb/protectedts.proto
+++ b/pkg/kv/kvserver/protectedts/ptpb/protectedts.proto
@@ -14,7 +14,6 @@ package cockroach.protectedts;
 option go_package = "ptpb";
 
 import "gogoproto/gogo.proto";
-import "google/api/annotations.proto";
 import "roachpb/data.proto";
 import "util/hlc/timestamp.proto";
 
diff --git a/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel b/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel
index 2dfff9bf14a0..e576dac64e5f 100644
--- a/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel
+++ b/pkg/kv/kvserver/protectedts/ptstorage/BUILD.bazel
@@ -88,7 +88,6 @@ proto_library(
     deps = [
         "//pkg/roachpb:roachpb_proto",
         "@com_github_gogo_protobuf//gogoproto:gogo_proto",
-        "@go_googleapis//google/api:annotations_proto",
     ],
 )
 
@@ -101,6 +100,5 @@ go_proto_library(
     deps = [
         "//pkg/roachpb",
         "@com_github_gogo_protobuf//gogoproto",
-        "@org_golang_google_genproto//googleapis/api/annotations:go_default_library",
     ],
 )
diff --git a/pkg/kv/kvserver/protectedts/ptstorage/storage.proto b/pkg/kv/kvserver/protectedts/ptstorage/storage.proto
index 20e78c804f1a..eef1c7e432bc 100644
--- a/pkg/kv/kvserver/protectedts/ptstorage/storage.proto
+++ b/pkg/kv/kvserver/protectedts/ptstorage/storage.proto
@@ -13,7 +13,6 @@ package cockroach.protectedts;
 option go_package = "ptstorage";
 
 import "gogoproto/gogo.proto";
-import "google/api/annotations.proto";
 import "roachpb/data.proto";
 
 // Spans is the format of the message encoded in the spans column of a the
diff --git a/pkg/kv/kvserver/storage_services.proto b/pkg/kv/kvserver/storage_services.proto
index b124c63f485f..46c2ffd63cda 100644
--- a/pkg/kv/kvserver/storage_services.proto
+++ b/pkg/kv/kvserver/storage_services.proto
@@ -14,7 +14,6 @@ option go_package = "kvserver";
 
 import "kv/kvserver/kvserverpb/raft.proto";
 import "kv/kvserver/api.proto";
-import "gogoproto/gogo.proto";
 
 service MultiRaft {
     rpc RaftMessageBatch (stream cockroach.kv.kvserver.kvserverpb.RaftMessageRequestBatch) returns (stream cockroach.kv.kvserver.kvserverpb.RaftMessageResponse) {}
diff --git a/pkg/server/serverpb/BUILD.bazel b/pkg/server/serverpb/BUILD.bazel
index d5373c78f6a0..e840aa790c7c 100644
--- a/pkg/server/serverpb/BUILD.bazel
+++ b/pkg/server/serverpb/BUILD.bazel
@@ -28,11 +28,9 @@ proto_library(
         "//pkg/server/diagnostics/diagnosticspb:diagnosticspb_proto",
         "//pkg/server/status/statuspb:statuspb_proto",
         "//pkg/sql/contentionpb:contentionpb_proto",
-        "//pkg/sql/execinfrapb:execinfrapb_proto",
         "//pkg/storage/enginepb:enginepb_proto",
         "//pkg/ts/catalog:catalog_proto",
         "//pkg/util:util_proto",
-        "//pkg/util/hlc:hlc_proto",
         "//pkg/util/log/logpb:logpb_proto",
         "//pkg/util/metric:metric_proto",
         "//pkg/util/tracing/tracingpb:tracingpb_proto",
@@ -67,12 +65,11 @@ go_proto_library(
         "//pkg/server/status/statuspb",
         "//pkg/sql/catalog/descpb",  # keep
         "//pkg/sql/contentionpb",
-        "//pkg/sql/execinfrapb",
+        "//pkg/sql/execinfrapb",  # keep
         "//pkg/sql/pgwire/pgwirecancel",  # keep
         "//pkg/storage/enginepb",
         "//pkg/ts/catalog",
         "//pkg/util",
-        "//pkg/util/hlc",
         "//pkg/util/log/logpb",
         "//pkg/util/metric",
         "//pkg/util/tracing/tracingpb",
diff --git a/pkg/server/serverpb/status.proto b/pkg/server/serverpb/status.proto
index f6c5ab35c2d2..180868b3df19 100644
--- a/pkg/server/serverpb/status.proto
+++ b/pkg/server/serverpb/status.proto
@@ -23,7 +23,6 @@ import "server/diagnostics/diagnosticspb/diagnostics.proto";
 import "server/serverpb/index_recommendations.proto";
 import "server/status/statuspb/status.proto";
 import "sql/contentionpb/contention.proto";
-import "sql/execinfrapb/api.proto";
 import "storage/enginepb/engine.proto";
 import "storage/enginepb/mvcc.proto";
 import "storage/enginepb/rocksdb.proto";
@@ -32,8 +31,6 @@ import "kv/kvserver/kvserverpb/state.proto";
 import "kv/kvserver/liveness/livenesspb/liveness.proto";
 import "util/log/logpb/log.proto";
 import "util/unresolved_addr.proto";
-import "util/hlc/timestamp.proto";
-import "util/tracing/tracingpb/recorded_span.proto";
 import "util/tracing/tracingpb/tracing.proto";
 
 import "etcd/raft/v3/raftpb/raft.proto";
diff --git a/pkg/sql/catalog/descpb/encoded_datum.proto b/pkg/sql/catalog/descpb/encoded_datum.proto
index 5243dd24b3a2..6fe6dcc64f57 100644
--- a/pkg/sql/catalog/descpb/encoded_datum.proto
+++ b/pkg/sql/catalog/descpb/encoded_datum.proto
@@ -15,8 +15,6 @@ syntax = "proto2";
 package cockroach.sql.sqlbase;
 option go_package = "descpb";
 
-import "gogoproto/gogo.proto";
-
 // DatumEncoding identifies the encoding used for an EncDatum.
 enum DatumEncoding {
     // Indicates that the datum is encoded using the order-preserving encoding
diff --git a/pkg/sql/execinfrapb/BUILD.bazel b/pkg/sql/execinfrapb/BUILD.bazel
index 408d5c4f3e22..9afd80d69b7b 100644
--- a/pkg/sql/execinfrapb/BUILD.bazel
+++ b/pkg/sql/execinfrapb/BUILD.bazel
@@ -108,10 +108,8 @@ proto_library(
     deps = [
         "//pkg/jobs/jobspb:jobspb_proto",
         "//pkg/roachpb:roachpb_proto",
-        "//pkg/sql/catalog/catpb:catpb_proto",
         "//pkg/sql/catalog/descpb:descpb_proto",
         "//pkg/sql/inverted:inverted_proto",
-        "//pkg/sql/pgwire/pgerror:pgerror_proto",
         "//pkg/sql/sessiondatapb:sessiondatapb_proto",
         "//pkg/sql/types:types_proto",
         "//pkg/util/hlc:hlc_proto",
@@ -133,10 +131,9 @@ go_proto_library(
     deps = [
         "//pkg/jobs/jobspb",
         "//pkg/roachpb",
-        "//pkg/sql/catalog/catpb",
+        "//pkg/sql/catalog/catpb",  # keep
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/inverted",
-        "//pkg/sql/pgwire/pgerror",
         "//pkg/sql/sessiondatapb",
         "//pkg/sql/types",
         "//pkg/util/hlc",
diff --git a/pkg/sql/execinfrapb/data.proto b/pkg/sql/execinfrapb/data.proto
index f6152df3b15a..94be1536a3da 100644
--- a/pkg/sql/execinfrapb/data.proto
+++ b/pkg/sql/execinfrapb/data.proto
@@ -19,20 +19,15 @@ syntax = "proto2";
 package cockroach.sql.distsqlrun;
 option go_package = "execinfrapb";
 
-import "jobs/jobspb/jobs.proto";
 import "roachpb/api.proto";
 import "roachpb/data.proto";
-import "roachpb/errors.proto";
 import "errorspb/errors.proto";
-import "sql/pgwire/pgerror/errors.proto";
-import "sql/catalog/descpb/structured.proto";
 import "sql/catalog/descpb/encoded_datum.proto";
 import "sql/types/types.proto";
 import "util/tracing/tracingpb/recorded_span.proto";
 import "gogoproto/gogo.proto";
 import "util/hlc/timestamp.proto";
 import "google/protobuf/any.proto";
-import "google/protobuf/timestamp.proto";
 
 // Error is a generic representation including a string message.
 message Error {
diff --git a/pkg/sql/execinfrapb/processors_bulk_io.proto b/pkg/sql/execinfrapb/processors_bulk_io.proto
index 0d1d2efe43ea..3b8c71f386e5 100644
--- a/pkg/sql/execinfrapb/processors_bulk_io.proto
+++ b/pkg/sql/execinfrapb/processors_bulk_io.proto
@@ -21,9 +21,7 @@ option go_package = "execinfrapb";
 
 import "jobs/jobspb/jobs.proto";
 import "roachpb/io-formats.proto";
-import "sql/catalog/catpb/catalog.proto";
 import "sql/catalog/descpb/structured.proto";
-import "sql/execinfrapb/processors_base.proto";
 import "util/hlc/timestamp.proto";
 import "gogoproto/gogo.proto";
 import "roachpb/data.proto";
diff --git a/pkg/sql/rowenc/rowencpb/BUILD.bazel b/pkg/sql/rowenc/rowencpb/BUILD.bazel
index eda648d3d69c..ba1302ca96fa 100644
--- a/pkg/sql/rowenc/rowencpb/BUILD.bazel
+++ b/pkg/sql/rowenc/rowencpb/BUILD.bazel
@@ -7,7 +7,6 @@ proto_library(
     srcs = ["index_encoding.proto"],
     strip_import_prefix = "/pkg",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto:gogo_proto"],
 )
 
 go_proto_library(
@@ -16,7 +15,6 @@ go_proto_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/rowenc/rowencpb",
     proto = ":rowencpb_proto",
     visibility = ["//visibility:public"],
-    deps = ["@com_github_gogo_protobuf//gogoproto"],
 )
 
 go_library(
diff --git a/pkg/sql/rowenc/rowencpb/index_encoding.proto b/pkg/sql/rowenc/rowencpb/index_encoding.proto
index 25ba4f79f7d0..aec6232caed7 100644
--- a/pkg/sql/rowenc/rowencpb/index_encoding.proto
+++ b/pkg/sql/rowenc/rowencpb/index_encoding.proto
@@ -12,8 +12,6 @@ syntax = "proto3";
 package cockroach.rowenc;
 option go_package = "rowencpb";
 
-import "gogoproto/gogo.proto";
-
 // Wrapper for the bytes of the value of an index that also contains bit for
 // whether or not the value was deleted. A wrapper of arbitrary index values
 // with the additional delete bit was chosen over a separate index encoding type
diff --git a/pkg/sql/sessiondatapb/session_revival_token.proto b/pkg/sql/sessiondatapb/session_revival_token.proto
index 44e7448b390c..b3839d52b1ab 100644
--- a/pkg/sql/sessiondatapb/session_revival_token.proto
+++ b/pkg/sql/sessiondatapb/session_revival_token.proto
@@ -12,7 +12,6 @@ syntax = "proto3";
 package cockroach.sql.sessiondatapb;
 option go_package = "sessiondatapb";
 
-import "gogoproto/gogo.proto";
 import "google/protobuf/timestamp.proto";
 
 // SessionRevivalToken is an opaque piece of data that can be used to
diff --git a/pkg/storage/enginepb/file_registry.proto b/pkg/storage/enginepb/file_registry.proto
index 2f57054f3d87..4bea8188da5d 100644
--- a/pkg/storage/enginepb/file_registry.proto
+++ b/pkg/storage/enginepb/file_registry.proto
@@ -12,8 +12,6 @@ syntax = "proto3";
 package cockroach.storage.enginepb;
 option go_package = "enginepb";
 
-import "gogoproto/gogo.proto";
-
 // RegistryVersion defines the version of a registry. Newly added versions
 // should be larger than all currently and previously existing versions.
 enum RegistryVersion {