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

Jump to bottom

Automatically construct a broker from the ConsumerMetadataResponse #413

Merged
merged 2 commits into from
Apr 10, 2015
Merged

Automatically construct a broker from the ConsumerMetadataResponse #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0438f2
Automatically construct a broker from the ConsumerMetadataResponse
eapache Apr 10, 2015
5d12edf
Add a test
eapache Apr 10, 2015
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
26 changes: 18 additions & 8 deletions consumer_metadata_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
package sarama

import (
"net"
"strconv"
)

type ConsumerMetadataResponse struct {
Err KError
CoordinatorID int32
CoordinatorHost string
CoordinatorPort int32
Coordinator *Broker
CoordinatorID int32 // deprecated: use Coordinator.ID()
CoordinatorHost string // deprecated: use Coordinator.Addr()
CoordinatorPort int32 // deprecated: use Coordinator.Addr()
}

func (r *ConsumerMetadataResponse) decode(pd packetDecoder) (err error) {
Expand All @@ -14,20 +20,24 @@ func (r *ConsumerMetadataResponse) decode(pd packetDecoder) (err error) {
}
r.Err = KError(tmp)

r.CoordinatorID, err = pd.getInt32()
if err != nil {
r.Coordinator = new(Broker)
if err := r.Coordinator.decode(pd); err != nil {
return err
}

r.CoordinatorHost, err = pd.getString()
// this can all go away in 2.0, but we have to fill in deprecated fields to maintain
// backwards compatibility
host, portstr, err := net.SplitHostPort(r.Coordinator.Addr())
if err != nil {
return err
}

r.CoordinatorPort, err = pd.getInt32()
port, err := strconv.ParseInt(portstr, 10, 32)
if err != nil {
return err
}
r.CoordinatorID = r.Coordinator.ID()
r.CoordinatorHost = host
r.CoordinatorPort = int32(port)

return nil
}
8 changes: 8 additions & 0 deletions consumer_metadata_response_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,12 @@ func TestConsumerMetadataResponseSuccess(t *testing.T) {
if response.CoordinatorPort != 0xCCDD {
t.Error("Decoding produced incorrect coordinator port.")
}

if response.Coordinator.ID() != 0xAB {
t.Error("Decoding produced incorrect coordinator ID.")
}

if response.Coordinator.Addr() != "foo:52445" {
t.Error("Decoding produced incorrect coordinator address.")
}
}