Skip to content

Commit

Permalink
UnresolvedAddress.string_field -> address_field
Browse files Browse the repository at this point in the history
The field name of this structure was changed by cockroachdb#1976, but it has since been
decided that "address" is a more accurate name than "string".
  • Loading branch information
Matt Tracy committed Aug 6, 2015
1 parent 72fee5c commit 4e32c31
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 135 deletions.
2 changes: 1 addition & 1 deletion rpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (c *Client) internalConn() *internalConn {

// connect attempts a single connection attempt. On success, updates `c.conn`.
func (c *Client) connect() error {
conn, err := TLSDialHTTP(c.addr.NetworkField, c.addr.StringField, c.tlsConfig)
conn, err := TLSDialHTTP(c.addr.NetworkField, c.addr.AddressField, c.tlsConfig)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions server/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,12 @@ func TestNodeJoin(t *testing.T) {
if err := util.IsTrueWithin(func() bool {
if val, err := node1.ctx.Gossip.GetInfo(node2Key); err != nil {
return false
} else if addr2 := val.(*proto.NodeDescriptor).Address.StringField; addr2 != server2.Addr().String() {
} else if addr2 := val.(*proto.NodeDescriptor).Address.AddressField; addr2 != server2.Addr().String() {
t.Errorf("addr2 gossip %s doesn't match addr2 address %s", addr2, server2.Addr().String())
}
if val, err := node2.ctx.Gossip.GetInfo(node1Key); err != nil {
return false
} else if addr1 := val.(*proto.NodeDescriptor).Address.StringField; addr1 != server1.Addr().String() {
} else if addr1 := val.(*proto.NodeDescriptor).Address.AddressField; addr1 != server1.Addr().String() {
t.Errorf("addr1 gossip %s doesn't match addr1 address %s", addr1, server1.Addr().String())
}
return true
Expand Down
2 changes: 1 addition & 1 deletion server/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func TestStatusJson(t *testing.T) {
"nodeID": 1,
"address": {
"network": "%s",
"string": "%s"
"address": "%s"
},
"buildInfo": {
"goVersion": "%s",
Expand Down
136 changes: 68 additions & 68 deletions storage/engine/rocksdb/cockroach/util/unresolved_addr.pb.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4e32c31

Please sign in to comment.