Skip to content

Commit 1c16c90

Browse files
committed
fix(proto): use full range of MetadataRequest
Even though most of these are identical, we may as well match up correctly. Signed-off-by: Dominic Evans <[email protected]>
1 parent e1d59f1 commit 1c16c90

File tree

2 files changed

+30
-22
lines changed

2 files changed

+30
-22
lines changed

metadata_request.go

+17-11
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ func NewMetadataRequest(version KafkaVersion, topics []string) *MetadataRequest
1717
m.Version = 6
1818
} else if version.IsAtLeast(V1_0_0_0) {
1919
m.Version = 5
20+
} else if version.IsAtLeast(V0_11_0_0) {
21+
m.Version = 4
22+
} else if version.IsAtLeast(V0_10_1_0) {
23+
m.Version = 2
2024
} else if version.IsAtLeast(V0_10_0_0) {
2125
m.Version = 1
2226
}
@@ -94,19 +98,21 @@ func (r *MetadataRequest) isValidVersion() bool {
9498

9599
func (r *MetadataRequest) requiredVersion() KafkaVersion {
96100
switch r.Version {
97-
case 1:
98-
return V0_10_0_0
99-
case 2:
100-
return V0_10_1_0
101-
case 3, 4:
102-
return V0_11_0_0
103-
case 5:
104-
return V1_0_0_0
105-
case 6:
106-
return V2_0_0_0
107101
case 7:
108102
return V2_1_0_0
103+
case 6:
104+
return V2_0_0_0
105+
case 5:
106+
return V1_0_0_0
107+
case 3, 4:
108+
return V0_11_0_0
109+
case 2:
110+
return V0_10_1_0
111+
case 1:
112+
return V0_10_0_0
113+
case 0:
114+
return V0_8_2_0
109115
default:
110-
return MinVersion
116+
return V2_1_0_0
111117
}
112118
}

metadata_response.go

+13-11
Original file line numberDiff line numberDiff line change
@@ -281,20 +281,22 @@ func (r *MetadataResponse) isValidVersion() bool {
281281

282282
func (r *MetadataResponse) requiredVersion() KafkaVersion {
283283
switch r.Version {
284-
case 1:
285-
return V0_10_0_0
286-
case 2:
287-
return V0_10_1_0
288-
case 3, 4:
289-
return V0_11_0_0
290-
case 5:
291-
return V1_0_0_0
292-
case 6:
293-
return V2_0_0_0
294284
case 7:
295285
return V2_1_0_0
286+
case 6:
287+
return V2_0_0_0
288+
case 5:
289+
return V1_0_0_0
290+
case 3, 4:
291+
return V0_11_0_0
292+
case 2:
293+
return V0_10_1_0
294+
case 1:
295+
return V0_10_0_0
296+
case 0:
297+
return V0_8_2_0
296298
default:
297-
return MinVersion
299+
return V2_1_0_0
298300
}
299301
}
300302

0 commit comments

Comments
 (0)