roachpb,storage: remove DeprecatedVerifyChecksum request

DeprecatedVerifyChecksum request was removed prior to September 2016. It is not sent by a CockroachDB 2.0 cluster, so it's safe to remove in 2.1.
cockroachdb · Jun 26, 2018 · 0e94a78 · 0e94a78
1 parent a9e3a44
commit 0e94a78
Show file tree

Hide file tree

Showing 9 changed files with 769 additions and 1,294 deletions.
diff --git a/pkg/roachpb/api.go b/pkg/roachpb/api.go
@@ -568,9 +568,6 @@ func (*LeaseInfoRequest) Method() Method { return LeaseInfo }
 // Method implements the Request interface.
 func (*ComputeChecksumRequest) Method() Method { return ComputeChecksum }
 
-// Method implements the Request interface.
-func (*DeprecatedVerifyChecksumRequest) Method() Method { return DeprecatedVerifyChecksum }
-
 // Method implements the Request interface.
 func (*WriteBatchRequest) Method() Method { return WriteBatch }
 
@@ -781,12 +778,6 @@ func (ccr *ComputeChecksumRequest) ShallowCopy() Request {
 	return &shallowCopy
 }
 
-// ShallowCopy implements the Request interface.
-func (dvcr *DeprecatedVerifyChecksumRequest) ShallowCopy() Request {
-	shallowCopy := *dvcr
-	return &shallowCopy
-}
-
 // ShallowCopy implements the Request interface.
 func (r *WriteBatchRequest) ShallowCopy() Request {
 	shallowCopy := *r
@@ -1081,15 +1072,14 @@ func (*TransferLeaseRequest) flags() int {
 	// lease holder.
 	return isWrite | isAlone | skipLeaseCheck
 }
-func (*RecomputeStatsRequest) flags() int           { return isWrite | isAlone }
-func (*ComputeChecksumRequest) flags() int          { return isWrite | isRange }
-func (*DeprecatedVerifyChecksumRequest) flags() int { return isWrite }
-func (*CheckConsistencyRequest) flags() int         { return isAdmin | isRange }
-func (*WriteBatchRequest) flags() int               { return isWrite | isRange }
-func (*ExportRequest) flags() int                   { return isRead | isRange | updatesReadTSCache }
-func (*ImportRequest) flags() int                   { return isAdmin | isAlone }
-func (*AdminScatterRequest) flags() int             { return isAdmin | isAlone | isRange }
-func (*AddSSTableRequest) flags() int               { return isWrite | isAlone | isRange }
+func (*RecomputeStatsRequest) flags() int   { return isWrite | isAlone }
+func (*ComputeChecksumRequest) flags() int  { return isWrite | isRange }
+func (*CheckConsistencyRequest) flags() int { return isAdmin | isRange }
+func (*WriteBatchRequest) flags() int       { return isWrite | isRange }
+func (*ExportRequest) flags() int           { return isRead | isRange | updatesReadTSCache }
+func (*ImportRequest) flags() int           { return isAdmin | isAlone }
+func (*AdminScatterRequest) flags() int     { return isAdmin | isAlone | isRange }
+func (*AddSSTableRequest) flags() int       { return isWrite | isAlone | isRange }
 
 // RefreshRequest and RefreshRangeRequest both list
 // updates(Read)TSCache, though they actually update the read or write

diff --git a/pkg/roachpb/api.pb.go b/pkg/roachpb/api.pb.go
diff --git a/pkg/roachpb/api.proto b/pkg/roachpb/api.proto
@@ -971,16 +971,6 @@ message ComputeChecksumResponse {
   ResponseHeader header = 1 [(gogoproto.nullable) = false, (gogoproto.embed) = true];
 }
 
-message DeprecatedVerifyChecksumRequest {
-  option (gogoproto.equal) = true;
-
-  RequestHeader header = 1 [(gogoproto.nullable) = false, (gogoproto.embed) = true];
-}
-
-message DeprecatedVerifyChecksumResponse {
-  ResponseHeader header = 1 [(gogoproto.nullable) = false, (gogoproto.embed) = true];
-}
-
 enum ExportStorageProvider {
   Unknown = 0;
   LocalFile = 1;
@@ -1231,11 +1221,6 @@ message RefreshRangeResponse {
 // A RequestUnion contains exactly one of the requests.
 // The values added here must match those in ResponseUnion.
 //
-// WARNING: Do not remove fields from RequestUnion. Instead, remove
-// all non-header fields from the request message and prepend its
-// name with "Deprecated". See DeprecatedVerifyChecksumRequest for an
-// example.
-//
 // Be cautious about deprecating fields as doing so can lead to inconsistencies
 // between replicas.
 message RequestUnion {
@@ -1266,7 +1251,7 @@ message RequestUnion {
   RequestLeaseRequest request_lease = 20;
   ReverseScanRequest reverse_scan = 21;
   ComputeChecksumRequest compute_checksum = 22;
-  DeprecatedVerifyChecksumRequest deprecated_verify_checksum = 23;
+  reserved 23;
   CheckConsistencyRequest check_consistency = 24;
   NoopRequest noop = 25;
   InitPutRequest init_put = 26;
@@ -1287,11 +1272,6 @@ message RequestUnion {
 
 // A ResponseUnion contains exactly one of the responses.
 // The values added here must match those in RequestUnion.
-//
-// WARNING: Do not remove fields from ResponseUnion. Instead, remove
-// all non-header fields from the response message and prepend its
-// name with "Deprecated". See DeprecatedVerifyChecksumResponse for an
-// example.
 message ResponseUnion {
   option (gogoproto.onlyone) = true;
 
@@ -1320,7 +1300,7 @@ message ResponseUnion {
   RequestLeaseResponse request_lease = 20;
   ReverseScanResponse reverse_scan = 21;
   ComputeChecksumResponse compute_checksum = 22;
-  DeprecatedVerifyChecksumResponse deprecated_verify_checksum = 23;
+  reserved 23;
   CheckConsistencyResponse check_consistency = 24;
   NoopResponse noop = 25;
   InitPutResponse init_put = 26;

diff --git a/pkg/roachpb/api_test.go b/pkg/roachpb/api_test.go
@@ -15,7 +15,6 @@
 package roachpb
 
 import (
-	"encoding/hex"
 	"reflect"
 	"testing"
 )
@@ -113,35 +112,3 @@ func TestMustSetInner(t *testing.T) {
 		t.Fatalf("unexpected response union: %+v", res)
 	}
 }
-
-func TestDeprecatedVerifyChecksumRequest(t *testing.T) {
-	t.Skip("TODO(nvanbenschoten): fix")
-	// hexData was generated using the following code snippet. The batch contains
-	// a VerifyChecksumRequest which is no longer part of RequestUnion.
-	//
-	// var ba BatchRequest
-	// ba.Add(&VerifyChecksumRequest{})
-	// var v Value
-	// if err := v.SetProto(&ba); err != nil {
-	// 	t.Fatal(err)
-	// }
-	// fmt.Printf("%s\n", hex.EncodeToString(v.RawBytes))
-
-	hexData := `00000000030a1f0a0408001000120608001000180018002100000000000000003000400048001219ba01160a0010001a1000000000000000000000000000000000`
-	data, err := hex.DecodeString(hexData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	v := Value{RawBytes: data}
-	var ba BatchRequest
-	if err := v.GetProto(&ba); err != nil {
-		t.Fatal(err)
-	}
-	// This previously failed with a nil-pointer conversion error in
-	// BatchRequest.GetArg() because of the removal of
-	// RequestUnion.VerifyChecksum. We've now re-added that member as
-	// RequestUnion.DeprecatedVerifyChecksum.
-	if ba.IsLeaseRequest() {
-		t.Fatal("unexpected success")
-	}
-}