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

Update node.proto to use time.Time instead of timestamp (#2482)

Browse Source
This commit is contained in:
Alexander Leitner 2019-07-08 14:24:42 -04:00 committed by GitHub
parent a554752ce0
commit 19ab9852f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/version/version.go
View File

@ -11,7 +11,6 @@ import (
"strings"
"time"
"github.com/golang/protobuf/ptypes"
"github.com/zeebo/errs"
"gopkg.in/spacemonkeygo/monkit.v2"
@ -115,14 +114,10 @@ func (v Info) Marshal() (data []byte, err error) {
// TODO: shouldn't we just use pb.NodeVersion everywhere? gogoproto will let
// us make it match Info.
func (v Info) Proto() (*pb.NodeVersion, error) {
pbts, err := ptypes.TimestampProto(v.Timestamp)
if err != nil {
return nil, err
}
return &pb.NodeVersion{
Version: v.Version.String(),
CommitHash: v.CommitHash,
Timestamp: pbts,
Timestamp: v.Timestamp,
Release: v.Release,
}, nil
}

3
pkg/overlay/benchmark_test.go
View File

@ -8,7 +8,6 @@ import (
"testing"
"time"
"github.com/golang/protobuf/ptypes"
"github.com/stretchr/testify/require"
"storj.io/storj/internal/testrand"
@ -84,7 +83,7 @@ func BenchmarkOverlay(b *testing.B) {
})
b.Run("UpdateNodeInfo", func(b *testing.B) {
now := ptypes.TimestampNow()
now := time.Now()
for i := 0; i < b.N; i++ {
id := all[i%len(all)]
_, err := overlaydb.UpdateNodeInfo(ctx, id, &pb.InfoResponse{

86
pkg/pb/node.pb.go
View File

@ -7,14 +7,16 @@ import (
fmt "fmt"
_ "github.com/gogo/protobuf/gogoproto"
proto "github.com/gogo/protobuf/proto"
timestamp "github.com/golang/protobuf/ptypes/timestamp"
_ "github.com/golang/protobuf/ptypes/timestamp"
math "math"
time "time"
)
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = fmt.Errorf
var _ = math.Inf
var _ = time.Kitchen
// This is a compile-time assertion to ensure that this generated file
// is compatible with the proto package it is being compiled against.
@ -369,7 +371,7 @@ func (m *NodeRestrictions) GetFreeDisk() int64 {
type NodeVersion struct {
Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"`
CommitHash string `protobuf:"bytes,2,opt,name=commit_hash,json=commitHash,proto3" json:"commit_hash,omitempty"`
Timestamp *timestamp.Timestamp `protobuf:"bytes,3,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"`
Release bool `protobuf:"varint,4,opt,name=release,proto3" json:"release,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
@ -414,11 +416,11 @@ func (m *NodeVersion) GetCommitHash() string {
return ""
}
func (m *NodeVersion) GetTimestamp() *timestamp.Timestamp {
func (m *NodeVersion) GetTimestamp() time.Time {
if m != nil {
return m.Timestamp
}
return nil
return time.Time{}
}
func (m *NodeVersion) GetRelease() bool {
@ -443,42 +445,42 @@ func init() {
func init() { proto.RegisterFile("node.proto", fileDescriptor_0c843d59d2d938e7) }
var fileDescriptor_0c843d59d2d938e7 = []byte{
// 577 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcb, 0x6e, 0x13, 0x31,
0x14, 0xed, 0x24, 0xd3, 0x24, 0x73, 0xf3, 0xd0, 0x60, 0x2a, 0x88, 0x8a, 0x44, 0x42, 0x24, 0xa4,
0xa8, 0x48, 0xa9, 0x28, 0x1b, 0x16, 0x6c, 0x92, 0xb6, 0x2a, 0x81, 0x90, 0x44, 0xce, 0xd0, 0x45,
0x37, 0x23, 0x27, 0x76, 0x13, 0xab, 0x93, 0xb1, 0x65, 0x7b, 0xa8, 0xf2, 0x2f, 0x7c, 0x10, 0xdf,
0xc0, 0xa2, 0x9f, 0x82, 0x90, 0xe7, 0xd1, 0xc7, 0x12, 0x89, 0xdd, 0x9c, 0x73, 0xcf, 0xb5, 0xcf,
0x9c, 0x7b, 0x0d, 0x10, 0x0b, 0xca, 0x06, 0x52, 0x09, 0x23, 0x90, 0x6b, 0xbf, 0x0f, 0x61, 0x2d,
0xd6, 0x22, 0x63, 0x0e, 0x3b, 0x6b, 0x21, 0xd6, 0x11, 0x3b, 0x4e, 0xd1, 0x32, 0xb9, 0x3e, 0x36,
0x7c, 0xcb, 0xb4, 0x21, 0x5b, 0x99, 0x09, 0x7a, 0x7f, 0x1c, 0x70, 0xa7, 0x82, 0x32, 0xf4, 0x1a,
0x4a, 0x9c, 0xb6, 0x9d, 0xae, 0xd3, 0x6f, 0x8c, 0x5a, 0xbf, 0xee, 0x3a, 0x7b, 0xbf, 0xef, 0x3a,
0x15, 0x5b, 0x19, 0x9f, 0xe1, 0x12, 0xa7, 0xe8, 0x1d, 0x54, 0x09, 0xa5, 0x8a, 0x69, 0xdd, 0x2e,
0x75, 0x9d, 0x7e, 0xfd, 0xe4, 0xd9, 0x20, 0xbd, 0xd9, 0x4a, 0x86, 0x59, 0x01, 0x17, 0x0a, 0xf4,
0x12, 0xaa, 0x11, 0xd1, 0x26, 0xe4, 0xb2, 0xdd, 0xea, 0x3a, 0x7d, 0x0f, 0x57, 0x2c, 0x1c, 0xcb,
0x2f, 0x6e, 0xad, 0xec, 0xb7, 0xb0, 0x6b, 0x76, 0x92, 0xe1, 0x86, 0x62, 0xda, 0x28, 0xbe, 0x32,
0x5c, 0xc4, 0x1a, 0x83, 0x62, 0x32, 0x31, 0xc4, 0x02, 0x5c, 0xdb, 0x32, 0x43, 0x28, 0x31, 0x04,
0x37, 0x22, 0x62, 0x58, 0xbc, 0xda, 0x85, 0x11, 0xd7, 0x06, 0x37, 0x49, 0x42, 0xb9, 0x09, 0x75,
0xb2, 0x5a, 0xd9, 0xeb, 0xf6, 0xb9, 0x0e, 0x13, 0x89, 0x5b, 0x89, 0xa4, 0xc4, 0xb0, 0x30, 0x97,
0xe2, 0x83, 0x1c, 0x3f, 0x15, 0x37, 0x73, 0x36, 0x91, 0x36, 0x02, 0x5c, 0xfd, 0xc1, 0x94, 0xe6,
0x22, 0xee, 0x5d, 0x41, 0xfd, 0xd1, 0x2f, 0xa0, 0xf7, 0xe0, 0x19, 0x45, 0x62, 0x2d, 0x85, 0x32,
0x69, 0x1a, 0xad, 0x93, 0xe7, 0x0f, 0x3f, 0x1a, 0x14, 0x25, 0xfc, 0xa0, 0x42, 0xed, 0xa7, 0xc9,
0x78, 0xf7, 0x31, 0xf4, 0x3e, 0x41, 0xc3, 0x76, 0xcd, 0x24, 0x53, 0xc4, 0x08, 0x85, 0x0e, 0x60,
0x9f, 0x6d, 0x09, 0x8f, 0xd2, 0x83, 0x3d, 0x9c, 0x01, 0xf4, 0x02, 0x2a, 0xb7, 0x24, 0x8a, 0x98,
0xc9, 0xdb, 0x73, 0xd4, 0xc3, 0x59, 0xf7, 0x29, 0x91, 0x64, 0xc5, 0xcd, 0x0e, 0xbd, 0x85, 0xd6,
0xb5, 0x62, 0x2c, 0x5c, 0x92, 0x98, 0xde, 0x72, 0x6a, 0x36, 0xe9, 0x31, 0x65, 0xdc, 0xb4, 0xec,
0xa8, 0x20, 0xd1, 0x2b, 0xf0, 0x52, 0x19, 0xe5, 0xfa, 0x26, 0x3d, 0xb1, 0x8c, 0x6b, 0x96, 0x38,
0xe3, 0xfa, 0xa6, 0x70, 0xf4, 0x2d, 0xcf, 0xf7, 0x1f, 0x1d, 0x5d, 0x82, 0x6f, 0xbb, 0xf1, 0xa3,
0xb9, 0xfd, 0x17, 0x57, 0x3f, 0x9d, 0x6c, 0x08, 0x97, 0xd9, 0x4c, 0x6c, 0xa2, 0xf9, 0x78, 0x72,
0x5f, 0x05, 0x44, 0x1d, 0xa8, 0xaf, 0xc4, 0x76, 0xcb, 0x4d, 0xb8, 0x21, 0x7a, 0x93, 0xdb, 0x83,
0x8c, 0xfa, 0x4c, 0xf4, 0x06, 0x7d, 0x04, 0xef, 0x7e, 0xc5, 0xdb, 0xe5, 0x74, 0x51, 0x0f, 0x07,
0xd9, 0x23, 0x18, 0x14, 0x8f, 0x60, 0x10, 0x14, 0x0a, 0xfc, 0x20, 0xb6, 0x97, 0x2a, 0x16, 0x31,
0xa2, 0x59, 0xdb, 0xed, 0x3a, 0xfd, 0x1a, 0x2e, 0xe0, 0xd1, 0x14, 0x6a, 0xe9, 0xf0, 0x77, 0x92,
0xa1, 0x3a, 0x54, 0xc7, 0xd3, 0xcb, 0xe1, 0x64, 0x7c, 0xe6, 0xef, 0xa1, 0x26, 0x78, 0x8b, 0x61,
0x70, 0x3e, 0x99, 0x8c, 0x83, 0x73, 0xdf, 0xb1, 0xb5, 0x45, 0x30, 0xc3, 0xc3, 0x8b, 0x73, 0xbf,
0x84, 0x00, 0x2a, 0xdf, 0xe7, 0x93, 0xf1, 0xf4, 0xab, 0x5f, 0xb6, 0xba, 0xd1, 0x6c, 0x16, 0x2c,
0x02, 0x3c, 0x9c, 0xfb, 0xee, 0xd1, 0x1b, 0x68, 0x3e, 0x59, 0x26, 0xe4, 0x43, 0x23, 0x38, 0x9d,
0x87, 0xc1, 0x64, 0x11, 0x5e, 0xe0, 0xf9, 0xa9, 0xbf, 0x37, 0x72, 0xaf, 0x4a, 0x72, 0xb9, 0xac,
0xa4, 0x8e, 0x3f, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xa6, 0x6e, 0x66, 0xe4, 0x03, 0x00,
0x00,
// 587 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6e, 0x1a, 0x3d,
0x14, 0xcd, 0xc0, 0x04, 0x98, 0xcb, 0x8f, 0xe6, 0xf3, 0x17, 0xb5, 0x28, 0x95, 0x0a, 0x45, 0xaa,
0x84, 0x52, 0x89, 0xa8, 0xe9, 0xb6, 0x1b, 0x48, 0xa2, 0x94, 0x96, 0x02, 0x32, 0xd3, 0x2c, 0xb2,
0x19, 0x19, 0xec, 0x80, 0x95, 0x61, 0x6c, 0xd9, 0x9e, 0x46, 0xbc, 0x45, 0x9f, 0xa2, 0xcf, 0xd2,
0x67, 0xe8, 0x22, 0x7d, 0x93, 0xaa, 0xf2, 0xfc, 0xe4, 0x67, 0x59, 0xa9, 0xbb, 0x39, 0xe7, 0x9e,
0x6b, 0x9f, 0x39, 0xf7, 0x1a, 0x20, 0x16, 0x94, 0x0d, 0xa4, 0x12, 0x46, 0x20, 0xd7, 0x7e, 0x1f,
0xc2, 0x5a, 0xac, 0x45, 0xc6, 0x1c, 0x76, 0xd6, 0x42, 0xac, 0x23, 0x76, 0x9c, 0xa2, 0x65, 0x72,
0x7d, 0x6c, 0xf8, 0x96, 0x69, 0x43, 0xb6, 0x32, 0x13, 0xf4, 0x7e, 0x3b, 0xe0, 0x4e, 0x05, 0x65,
0xe8, 0x25, 0x94, 0x38, 0x6d, 0x3b, 0x5d, 0xa7, 0xdf, 0x18, 0xb5, 0x7e, 0xdc, 0x75, 0xf6, 0x7e,
0xde, 0x75, 0x2a, 0xb6, 0x32, 0x3e, 0xc3, 0x25, 0x4e, 0xd1, 0x1b, 0xa8, 0x12, 0x4a, 0x15, 0xd3,
0xba, 0x5d, 0xea, 0x3a, 0xfd, 0xfa, 0xc9, 0x7f, 0x83, 0xf4, 0x66, 0x2b, 0x19, 0x66, 0x05, 0x5c,
0x28, 0xd0, 0x73, 0xa8, 0x46, 0x44, 0x9b, 0x90, 0xcb, 0x76, 0xab, 0xeb, 0xf4, 0x3d, 0x5c, 0xb1,
0x70, 0x2c, 0x3f, 0xba, 0xb5, 0xb2, 0xdf, 0xc2, 0xae, 0xd9, 0x49, 0x86, 0x1b, 0x8a, 0x69, 0xa3,
0xf8, 0xca, 0x70, 0x11, 0x6b, 0x0c, 0x8a, 0xc9, 0xc4, 0x10, 0x0b, 0x70, 0x6d, 0xcb, 0x0c, 0xa1,
0xc4, 0x10, 0xdc, 0x88, 0x88, 0x61, 0xf1, 0x6a, 0x17, 0x46, 0x5c, 0x1b, 0xdc, 0x24, 0x09, 0xe5,
0x26, 0xd4, 0xc9, 0x6a, 0x65, 0xaf, 0xdb, 0xe7, 0x3a, 0x4c, 0x24, 0x6e, 0x25, 0x92, 0x12, 0xc3,
0xc2, 0x5c, 0x8a, 0x0f, 0x72, 0xfc, 0x54, 0xdc, 0xcc, 0xd9, 0x44, 0xda, 0x08, 0x70, 0xf5, 0x2b,
0x53, 0x9a, 0x8b, 0xb8, 0x77, 0x05, 0xf5, 0x47, 0xbf, 0x80, 0xde, 0x82, 0x67, 0x14, 0x89, 0xb5,
0x14, 0xca, 0xa4, 0x69, 0xb4, 0x4e, 0xfe, 0x7f, 0xf8, 0xd1, 0xa0, 0x28, 0xe1, 0x07, 0x15, 0x6a,
0x3f, 0x4d, 0xc6, 0xbb, 0x8f, 0xa1, 0xf7, 0x1e, 0x1a, 0xb6, 0x6b, 0x26, 0x99, 0x22, 0x46, 0x28,
0x74, 0x00, 0xfb, 0x6c, 0x4b, 0x78, 0x94, 0x1e, 0xec, 0xe1, 0x0c, 0xa0, 0x67, 0x50, 0xb9, 0x25,
0x51, 0xc4, 0x4c, 0xde, 0x9e, 0xa3, 0x1e, 0xce, 0xba, 0x4f, 0x89, 0x24, 0x2b, 0x6e, 0x76, 0xe8,
0x35, 0xb4, 0xae, 0x15, 0x63, 0xe1, 0x92, 0xc4, 0xf4, 0x96, 0x53, 0xb3, 0x49, 0x8f, 0x29, 0xe3,
0xa6, 0x65, 0x47, 0x05, 0x89, 0x5e, 0x80, 0x97, 0xca, 0x28, 0xd7, 0x37, 0xe9, 0x89, 0x65, 0x5c,
0xb3, 0xc4, 0x19, 0xd7, 0x37, 0x85, 0xa3, 0xcf, 0x79, 0xbe, 0x7f, 0xe9, 0xe8, 0x12, 0x7c, 0xdb,
0x8d, 0x1f, 0xcd, 0xed, 0x9f, 0xb8, 0xfa, 0xee, 0x64, 0x43, 0xb8, 0xcc, 0x66, 0x62, 0x13, 0xcd,
0xc7, 0x93, 0xfb, 0x2a, 0x20, 0xea, 0x40, 0x7d, 0x25, 0xb6, 0x5b, 0x6e, 0xc2, 0x0d, 0xd1, 0x9b,
0xdc, 0x1e, 0x64, 0xd4, 0x07, 0xa2, 0x37, 0x68, 0x04, 0xde, 0xfd, 0x8a, 0xb7, 0xcb, 0xe9, 0xa2,
0x1e, 0x0e, 0xb2, 0x47, 0x30, 0x28, 0x1e, 0xc1, 0x20, 0x28, 0x14, 0xa3, 0x9a, 0xdd, 0xf4, 0x6f,
0xbf, 0x3a, 0x0e, 0x7e, 0x68, 0xb3, 0xd7, 0x2b, 0x16, 0x31, 0xa2, 0x59, 0xdb, 0xed, 0x3a, 0xfd,
0x1a, 0x2e, 0xe0, 0xd1, 0x14, 0x6a, 0xe9, 0x1a, 0xec, 0x24, 0x43, 0x75, 0xa8, 0x8e, 0xa7, 0x97,
0xc3, 0xc9, 0xf8, 0xcc, 0xdf, 0x43, 0x4d, 0xf0, 0x16, 0xc3, 0xe0, 0x7c, 0x32, 0x19, 0x07, 0xe7,
0xbe, 0x63, 0x6b, 0x8b, 0x60, 0x86, 0x87, 0x17, 0xe7, 0x7e, 0x09, 0x01, 0x54, 0xbe, 0xcc, 0x27,
0xe3, 0xe9, 0x27, 0xbf, 0x6c, 0x75, 0xa3, 0xd9, 0x2c, 0x58, 0x04, 0x78, 0x38, 0xf7, 0xdd, 0xa3,
0x57, 0xd0, 0x7c, 0xb2, 0x56, 0xc8, 0x87, 0x46, 0x70, 0x3a, 0x0f, 0x83, 0xc9, 0x22, 0xbc, 0xc0,
0xf3, 0x53, 0x7f, 0x6f, 0xe4, 0x5e, 0x95, 0xe4, 0x72, 0x59, 0x49, 0xbd, 0xbf, 0xfb, 0x13, 0x00,
0x00, 0xff, 0xff, 0x44, 0x0c, 0xb7, 0x9a, 0xee, 0x03, 0x00, 0x00,
}

2
pkg/pb/node.proto
View File

@ -68,6 +68,6 @@ message NodeRestrictions {
message NodeVersion {
string version = 1; // must be semver formatted
string commit_hash = 2;
google.protobuf.Timestamp timestamp = 3;
google.protobuf.Timestamp timestamp = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
bool release = 4;
}

12
proto.lock
View File

@ -2435,7 +2435,17 @@
{
"id": 3,
"name": "timestamp",
"type": "google.protobuf.Timestamp"
"type": "google.protobuf.Timestamp",
"options": [
{
"name": "(gogoproto.stdtime)",
"value": "true"
},
{
"name": "(gogoproto.nullable)",
"value": "false"
}
]
},
{
"id": 4,

18
satellite/satellitedb/overlaycache.go
View File

@ -9,11 +9,10 @@ import (
"strings"
"time"
"github.com/golang/protobuf/ptypes"
"github.com/lib/pq"
sqlite3 "github.com/mattn/go-sqlite3"
"github.com/mattn/go-sqlite3"
"github.com/zeebo/errs"
monkit "gopkg.in/spacemonkeygo/monkit.v2"
"gopkg.in/spacemonkeygo/monkit.v2"
"storj.io/storj/internal/version"
"storj.io/storj/pkg/overlay"
@ -734,15 +733,11 @@ func (cache *overlaycache) UpdateNodeInfo(ctx context.Context, nodeID storj.Node
if err != nil {
return nil, errs.New("unable to convert version to semVer")
}
pbts, err := ptypes.Timestamp(nodeInfo.GetVersion().GetTimestamp())
if err != nil {
return nil, errs.New("unable to convert version timestamp")
}
updateFields.Major = dbx.Node_Major(semVer.Major)
updateFields.Minor = dbx.Node_Minor(semVer.Minor)
updateFields.Patch = dbx.Node_Patch(semVer.Patch)
updateFields.Hash = dbx.Node_Hash(nodeInfo.GetVersion().GetCommitHash())
updateFields.Timestamp = dbx.Node_Timestamp(pbts)
updateFields.Timestamp = dbx.Node_Timestamp(nodeInfo.GetVersion().Timestamp)
updateFields.Release = dbx.Node_Release(nodeInfo.GetVersion().GetRelease())
}
}
@ -853,11 +848,6 @@ func convertDBNode(ctx context.Context, info *dbx.Node) (_ *overlay.NodeDossier,
Patch: info.Patch,
}
pbts, err := ptypes.TimestampProto(info.Timestamp)
if err != nil {
return nil, err
}
node := &overlay.NodeDossier{
Node: pb.Node{
Id: id,
@ -880,7 +870,7 @@ func convertDBNode(ctx context.Context, info *dbx.Node) (_ *overlay.NodeDossier,
Version: pb.NodeVersion{
Version: ver.String(),
CommitHash: info.Hash,
Timestamp: pbts,
Timestamp: info.Timestamp,
Release: info.Release,
},
Contained: info.Contained,