roachpb: change ReplicaDescriptor.Type to nullable

Release note: None
cockroachdb · Jun 29, 2019 · 5968fa5 · 5968fa5
1 parent 06f85cd
commit 5968fa5
Show file tree

Hide file tree

Showing 10 changed files with 190 additions and 148 deletions.
diff --git a/c-deps/libroach/protos/roachpb/metadata.pb.cc b/c-deps/libroach/protos/roachpb/metadata.pb.cc
diff --git a/c-deps/libroach/protos/roachpb/metadata.pb.h b/c-deps/libroach/protos/roachpb/metadata.pb.h
diff --git a/pkg/roachpb/metadata.go b/pkg/roachpb/metadata.go
@@ -266,7 +266,7 @@ func (r ReplicaDescriptor) String() string {
 	} else {
 		fmt.Fprintf(&buf, "%d", r.ReplicaID)
 	}
-	if r.Type == ReplicaType_LEARNER {
+	if r.GetType() == ReplicaType_LEARNER {
 		buf.WriteString("LEARNER")
 	}
 	return buf.String()
@@ -286,6 +286,14 @@ func (r ReplicaDescriptor) Validate() error {
 	return nil
 }
 
+// GetType returns the type of this ReplicaDescriptor.
+func (r ReplicaDescriptor) GetType() ReplicaType {
+	if r.Type == nil {
+		return ReplicaType_VOTER
+	}
+	return *r.Type
+}
+
 // PercentilesFromData derives percentiles from a slice of data points.
 // Sorts the input data if it isn't already sorted.
 func PercentilesFromData(data []float64) Percentiles {