Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachpb: remove RangeDescriptor.deprecated_generation_comparable #85118

Merged
merged 1 commit into from
Jul 27, 2022
Merged

roachpb: remove RangeDescriptor.deprecated_generation_comparable #85118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions pkg/kv/kvserver/loqrecovery/recovery_env_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,14 +267,13 @@ func buildReplicaDescriptorFromTestData(
replica.Generation = roachpb.RangeGeneration(maxReplicaID)
}
desc := roachpb.RangeDescriptor{
RangeID: replica.RangeID,
StartKey: startKey,
EndKey: endKey,
InternalReplicas: replicas,
NextReplicaID: maxReplicaID + 1,
Generation: replica.Generation,
DeprecatedGenerationComparable: nil,
StickyBit: nil,
RangeID: replica.RangeID,
StartKey: startKey,
EndKey: endKey,
InternalReplicas: replicas,
NextReplicaID: maxReplicaID + 1,
Generation: replica.Generation,
StickyBit: nil,
}
lease := roachpb.Lease{
Start: clock.Now().Add(5*time.Minute.Nanoseconds(), 0).UnsafeToClockTimestamp(),
Expand Down
8 changes: 2 additions & 6 deletions pkg/roachpb/metadata.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,12 +265,6 @@ message RangeDescriptor {
// replica applying the merge is.
optional int64 generation = 6 [(gogoproto.nullable) = false, (gogoproto.casttype) = "RangeGeneration"];

// This field is not used any more, but we need to maintain it in 20.2 because
// 20.1 nodes need descriptors to round-trip through 20.2 nodes and compare
// Equal() when they come back. 20.2 nodes know to ignore this field when
// comparing, so the field can be removed in 21.1.
erikgrinaker marked this conversation as resolved.
Show resolved Hide resolved
optional bool deprecated_generation_comparable = 8;

// The presence of the sticky_bit indicates that the range should not be
// automatically merged by the merge queue with the range to its left. It is
// set during a split operation and unset during an unsplit operation. Note
Expand All @@ -287,6 +281,8 @@ message RangeDescriptor {
// queue is enabled. With sticky_bit, users can manually split ranges without
// disabling the merge queue.
optional util.hlc.Timestamp sticky_bit = 7;

reserved 8;
pav-kv marked this conversation as resolved.
Show resolved Hide resolved
}

// Percentiles contains a handful of hard-coded percentiles meant to summarize
Expand Down