JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

satellite/satellitedb: fix selecting a nullable string

Browse Source 
Change-Id: I59e645966e09da586512c69101691b47055c1e5a
This commit is contained in:
Egon Elbre 2020-04-03 21:22:24 +03:00
parent 0c8c11b251
commit 9200efc61f
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
satellite/satellitedb/overlaycache.go
View File

@ -202,10 +202,14 @@ func (cache *overlaycache) queryNodes(ctx context.Context, excludedNodes []storj
var node overlay.SelectedNode
node.Address = &pb.NodeAddress{Transport: pb.NodeTransport_TCP_TLS_GRPC}
err = rows.Scan(&node.LastNet, &node.ID, &node.Address.Address, &node.LastIPPort)
var lastIPPort sql.NullString
err = rows.Scan(&node.LastNet, &node.ID, &node.Address.Address, &lastIPPort)
if err != nil {
return nil, err
}
if lastIPPort.Valid {
node.LastIPPort = lastIPPort.String
}
nodes = append(nodes, &node)
}
@ -259,10 +263,14 @@ func (cache *overlaycache) queryNodesDistinct(ctx context.Context, excludedIDs [
var node overlay.SelectedNode
node.Address = &pb.NodeAddress{Transport: pb.NodeTransport_TCP_TLS_GRPC}
err = rows.Scan(&node.LastNet, &node.ID, &node.Address.Address, &node.LastIPPort)
var lastIPPort sql.NullString
err = rows.Scan(&node.LastNet, &node.ID, &node.Address.Address, &lastIPPort)
if err != nil {
return nil, err
}
if lastIPPort.Valid {
node.LastIPPort = lastIPPort.String
}
nodes = append(nodes, &node)
}
@ -311,10 +319,15 @@ func (cache *overlaycache) GetOnlineNodesForGetDelete(ctx context.Context, nodeI
var node overlay.SelectedNode
node.Address = &pb.NodeAddress{Transport: pb.NodeTransport_TCP_TLS_GRPC}
err = rows.Scan(&node.LastNet, &node.ID, &node.Address.Address, &node.LastIPPort)
var lastIPPort sql.NullString
err = rows.Scan(&node.LastNet, &node.ID, &node.Address.Address, &lastIPPort)
if err != nil {
return nil, err
}
if lastIPPort.Valid {
node.LastIPPort = lastIPPort.String
}
nodes[node.ID] = &node
}