[task scheduler] Add BuildbucketBuildID to job page, fix search
Change-Id: I9a553cfb9d9d552fa217c46cab751ad39efe6184
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/371968
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/task_scheduler/go/rpc/rpc.go b/task_scheduler/go/rpc/rpc.go
index 2653715..0cc49d3 100644
--- a/task_scheduler/go/rpc/rpc.go
+++ b/task_scheduler/go/rpc/rpc.go
@@ -5,6 +5,7 @@
fmt "fmt"
http "net/http"
"sort"
+ "strconv"
"time"
twirp "github.com/twitchtv/twirp"
@@ -187,7 +188,11 @@
}
params := &db.JobSearchParams{}
if req.HasBuildbucketBuildId {
- params.BuildbucketBuildID = intPtr(req.BuildbucketBuildId)
+ bbID, err := strconv.ParseInt(req.BuildbucketBuildId, 10, 64)
+ if err != nil {
+ return nil, err
+ }
+ params.BuildbucketBuildID = intPtr(bbID)
}
if req.HasIsForce {
params.IsForce = boolPtr(req.IsForce)
@@ -562,9 +567,11 @@
Tasks: ts,
})
}
+ bbID := fmt.Sprintf("%d", job.BuildbucketBuildId)
+ bbKey := fmt.Sprintf("%d", job.BuildbucketLeaseKey)
return &Job{
- BuildbucketBuildId: job.BuildbucketBuildId,
- BuildbucketLeaseKey: job.BuildbucketLeaseKey,
+ BuildbucketBuildId: bbID,
+ BuildbucketLeaseKey: bbKey,
CreatedAt: timestamppb.New(job.Created),
DbModifiedAt: timestamppb.New(job.DbModified),
Dependencies: deps,
diff --git a/task_scheduler/go/rpc/rpc.pb.go b/task_scheduler/go/rpc/rpc.pb.go
index e7efcfc..014e4a0 100644
--- a/task_scheduler/go/rpc/rpc.pb.go
+++ b/task_scheduler/go/rpc/rpc.pb.go
@@ -506,7 +506,7 @@
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- BuildbucketBuildId int64 `protobuf:"varint,1,opt,name=buildbucket_build_id,json=buildbucketBuildId,proto3" json:"buildbucket_build_id,omitempty"`
+ BuildbucketBuildId string `protobuf:"bytes,1,opt,name=buildbucket_build_id,json=buildbucketBuildId,proto3" json:"buildbucket_build_id,omitempty"`
HasBuildbucketBuildId bool `protobuf:"varint,2,opt,name=has_buildbucket_build_id,json=hasBuildbucketBuildId,proto3" json:"has_buildbucket_build_id,omitempty"`
IsForce bool `protobuf:"varint,3,opt,name=is_force,json=isForce,proto3" json:"is_force,omitempty"`
HasIsForce bool `protobuf:"varint,4,opt,name=has_is_force,json=hasIsForce,proto3" json:"has_is_force,omitempty"`
@@ -560,11 +560,11 @@
return file_rpc_proto_rawDescGZIP(), []int{7}
}
-func (x *SearchJobsRequest) GetBuildbucketBuildId() int64 {
+func (x *SearchJobsRequest) GetBuildbucketBuildId() string {
if x != nil {
return x.BuildbucketBuildId
}
- return 0
+ return ""
}
func (x *SearchJobsRequest) GetHasBuildbucketBuildId() bool {
@@ -2171,10 +2171,10 @@
// buildbucket_build_id is the ID of the Buildbucket build with which this
// Job is associated, if one exists.
- BuildbucketBuildId int64 `protobuf:"varint,1,opt,name=buildbucket_build_id,json=buildbucketBuildId,proto3" json:"buildbucket_build_id,omitempty"`
+ BuildbucketBuildId string `protobuf:"bytes,1,opt,name=buildbucket_build_id,json=buildbucketBuildId,proto3" json:"buildbucket_build_id,omitempty"`
// buildbucket_lease_key is the lease key for running a Buildbucket build.
// TODO(borenet): Maybe this doesn't belong in the DB.
- BuildbucketLeaseKey int64 `protobuf:"varint,2,opt,name=buildbucket_lease_key,json=buildbucketLeaseKey,proto3" json:"buildbucket_lease_key,omitempty"`
+ BuildbucketLeaseKey string `protobuf:"bytes,2,opt,name=buildbucket_lease_key,json=buildbucketLeaseKey,proto3" json:"buildbucket_lease_key,omitempty"`
// created_at is the creation timestamp. This property should never change
// for a given Job instance.
CreatedAt *timestamp.Timestamp `protobuf:"bytes,3,opt,name=created_at,json=createdAt,proto3" json:"created_at,omitempty"`
@@ -2250,18 +2250,18 @@
return file_rpc_proto_rawDescGZIP(), []int{28}
}
-func (x *Job) GetBuildbucketBuildId() int64 {
+func (x *Job) GetBuildbucketBuildId() string {
if x != nil {
return x.BuildbucketBuildId
}
- return 0
+ return ""
}
-func (x *Job) GetBuildbucketLeaseKey() int64 {
+func (x *Job) GetBuildbucketLeaseKey() string {
if x != nil {
return x.BuildbucketLeaseKey
}
- return 0
+ return ""
}
func (x *Job) GetCreatedAt() *timestamp.Timestamp {
@@ -2465,7 +2465,7 @@
0x62, 0x52, 0x03, 0x6a, 0x6f, 0x62, 0x22, 0xda, 0x05, 0x0a, 0x11, 0x53, 0x65, 0x61, 0x72, 0x63,
0x68, 0x4a, 0x6f, 0x62, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x14,
0x62, 0x75, 0x69, 0x6c, 0x64, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x5f, 0x62, 0x75, 0x69, 0x6c,
- 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x12, 0x62, 0x75, 0x69, 0x6c,
+ 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x62, 0x75, 0x69, 0x6c,
0x64, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x49, 0x64, 0x12, 0x37,
0x0a, 0x18, 0x68, 0x61, 0x73, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x62, 0x75, 0x63, 0x6b, 0x65,
0x74, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
@@ -2720,11 +2720,11 @@
0x64, 0x5f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x02, 0x52, 0x0f, 0x75, 0x70, 0x6c, 0x6f, 0x61,
0x64, 0x4f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x53, 0x22, 0x84, 0x06, 0x0a, 0x03, 0x4a,
0x6f, 0x62, 0x12, 0x30, 0x0a, 0x14, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x62, 0x75, 0x63, 0x6b, 0x65,
- 0x74, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+ 0x74, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x12, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x69,
0x6c, 0x64, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x15, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x62, 0x75, 0x63,
0x6b, 0x65, 0x74, 0x5f, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x03, 0x52, 0x13, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74,
+ 0x01, 0x28, 0x09, 0x52, 0x13, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x62, 0x75, 0x63, 0x6b, 0x65, 0x74,
0x4c, 0x65, 0x61, 0x73, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x39, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61,
0x74, 0x65, 0x64, 0x5f, 0x61, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54,
diff --git a/task_scheduler/go/rpc/rpc.proto b/task_scheduler/go/rpc/rpc.proto
index d38e2e3..1d4358a 100644
--- a/task_scheduler/go/rpc/rpc.proto
+++ b/task_scheduler/go/rpc/rpc.proto
@@ -76,7 +76,7 @@
// SearchJobsRequest is a request to SearchJobs.
message SearchJobsRequest {
- int64 buildbucket_build_id = 1;
+ string buildbucket_build_id = 1;
bool has_buildbucket_build_id = 2;
bool is_force = 3;
bool has_is_force = 4;
@@ -381,11 +381,11 @@
message Job {
// buildbucket_build_id is the ID of the Buildbucket build with which this
// Job is associated, if one exists.
- int64 buildbucket_build_id = 1;
+ string buildbucket_build_id = 1;
// buildbucket_lease_key is the lease key for running a Buildbucket build.
// TODO(borenet): Maybe this doesn't belong in the DB.
- int64 buildbucket_lease_key = 2;
+ string buildbucket_lease_key = 2;
// created_at is the creation timestamp. This property should never change
// for a given Job instance.
diff --git a/task_scheduler/go/rpc/rpc.twirp.go b/task_scheduler/go/rpc/rpc.twirp.go
index b4567e4..f9a1203 100644
--- a/task_scheduler/go/rpc/rpc.twirp.go
+++ b/task_scheduler/go/rpc/rpc.twirp.go
@@ -3259,133 +3259,133 @@
}
var twirpFileDescriptor0 = []byte{
- // 2046 bytes of a gzipped FileDescriptorProto
+ // 2043 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x72, 0x1b, 0xc7,
0x11, 0x36, 0xfe, 0x81, 0x06, 0xf1, 0xc3, 0xa1, 0x24, 0x42, 0x70, 0x49, 0xa2, 0x57, 0x8e, 0x44,
- 0x4b, 0x0a, 0x98, 0xa2, 0x4b, 0x72, 0x14, 0xc7, 0x49, 0x40, 0x8a, 0x16, 0x49, 0x49, 0x24, 0xb3,
- 0xa0, 0xaa, 0x52, 0x4e, 0x95, 0xb7, 0x16, 0xd8, 0x21, 0xb1, 0x24, 0x80, 0xdd, 0xec, 0x0c, 0x68,
- 0xf3, 0x94, 0xaa, 0x54, 0xaa, 0x92, 0x6b, 0x2e, 0x79, 0x85, 0xbc, 0x44, 0x9e, 0x24, 0xc7, 0x9c,
- 0x72, 0xcb, 0x2b, 0xb8, 0xa6, 0x67, 0x76, 0x39, 0x00, 0x76, 0x01, 0x51, 0x3a, 0xe8, 0xb6, 0xd3,
- 0xfd, 0x75, 0xcf, 0x4c, 0x4f, 0x7f, 0x3d, 0xbd, 0x03, 0xa5, 0xc0, 0xef, 0xb5, 0xfc, 0xc0, 0xe3,
- 0x1e, 0x21, 0xdc, 0x66, 0xe7, 0x16, 0xeb, 0xf5, 0xa9, 0x33, 0x1e, 0xd0, 0xa0, 0x15, 0xf8, 0xbd,
- 0xe6, 0xbd, 0x53, 0xcf, 0x3b, 0x1d, 0xd0, 0x0d, 0x44, 0x74, 0xc7, 0x27, 0x1b, 0xdc, 0x1d, 0x52,
- 0xc6, 0xed, 0xa1, 0x2f, 0x8d, 0x8c, 0x5d, 0x80, 0xe3, 0xc0, 0x3d, 0x3d, 0xa5, 0xc1, 0xbe, 0xd7,
- 0x25, 0xb7, 0xa1, 0x78, 0xe6, 0x75, 0xad, 0x91, 0x3d, 0xa4, 0x8d, 0xd4, 0x5a, 0x6a, 0xbd, 0x64,
- 0x16, 0xce, 0xbc, 0xee, 0x81, 0x3d, 0xa4, 0xe4, 0x1e, 0x94, 0x7b, 0xde, 0x70, 0xe8, 0x72, 0xab,
- 0x6f, 0xb3, 0x7e, 0x23, 0x8d, 0x5a, 0x90, 0xa2, 0x5d, 0x9b, 0xf5, 0x8d, 0x5d, 0x20, 0x57, 0x9e,
- 0x98, 0x49, 0xff, 0x34, 0xa6, 0x8c, 0x93, 0x4d, 0xc8, 0x9e, 0x79, 0x5d, 0xd6, 0x48, 0xad, 0x65,
- 0xd6, 0xcb, 0x9b, 0x77, 0x5b, 0xb3, 0x6b, 0x6c, 0x5d, 0x59, 0x99, 0x88, 0x35, 0x5a, 0xb0, 0x32,
- 0xe1, 0x89, 0xf9, 0xde, 0x88, 0x51, 0xb2, 0x0a, 0x62, 0x31, 0x96, 0xeb, 0x48, 0x6f, 0x25, 0x33,
- 0x7f, 0xe6, 0x75, 0xf7, 0x1c, 0x66, 0xdc, 0x83, 0xca, 0x4b, 0xca, 0x85, 0xbd, 0x9a, 0xb4, 0x0a,
- 0x69, 0xd7, 0x51, 0x1b, 0x48, 0xbb, 0x8e, 0xf1, 0x35, 0x54, 0x43, 0x80, 0xf2, 0xf5, 0x05, 0x64,
- 0xce, 0xbc, 0x2e, 0x42, 0xca, 0x9b, 0xab, 0x71, 0xab, 0x12, 0x68, 0x81, 0x31, 0x0c, 0xa8, 0x6f,
- 0xdb, 0xa3, 0x1e, 0x1d, 0xcc, 0x99, 0xe0, 0x37, 0xb0, 0xac, 0x61, 0xae, 0x3f, 0xc7, 0x7f, 0x72,
- 0xb0, 0xdc, 0xa1, 0x76, 0xd0, 0xeb, 0xeb, 0xb1, 0xfb, 0x05, 0xdc, 0xe8, 0x8e, 0xdd, 0x81, 0xd3,
- 0x1d, 0xf7, 0xce, 0x29, 0xb7, 0xf0, 0xdb, 0x52, 0xf3, 0x66, 0x4c, 0xa2, 0xe9, 0xb6, 0xc4, 0xe7,
- 0x9e, 0x43, 0xbe, 0x82, 0x46, 0xdf, 0x66, 0x56, 0xac, 0x95, 0x38, 0xb1, 0xa2, 0x79, 0xb3, 0x6f,
- 0xb3, 0xad, 0x59, 0xc3, 0xdb, 0x50, 0x74, 0x99, 0x75, 0xe2, 0x05, 0x3d, 0xda, 0xc8, 0x20, 0xb0,
- 0xe0, 0xb2, 0x6f, 0xc5, 0x90, 0xac, 0xc1, 0x92, 0xf0, 0x19, 0xa9, 0xb3, 0xa8, 0x86, 0xbe, 0xcd,
- 0xf6, 0x14, 0xe2, 0x06, 0xe4, 0x5c, 0xc6, 0xc6, 0xb4, 0x91, 0xc3, 0x80, 0xc8, 0x01, 0xf9, 0x14,
- 0x4a, 0xd2, 0x4e, 0x68, 0xf2, 0x68, 0x54, 0x44, 0x23, 0xa1, 0x24, 0x90, 0xc5, 0x24, 0x2b, 0xa0,
- 0x05, 0x7e, 0x8b, 0x35, 0x08, 0x03, 0x94, 0x17, 0xe5, 0x1a, 0xfa, 0x36, 0xc3, 0xe4, 0x6b, 0x42,
- 0xd1, 0xb7, 0x79, 0xaf, 0xcf, 0x28, 0x6f, 0x94, 0xd0, 0x24, 0x1a, 0x93, 0xcf, 0xe4, 0xfa, 0x22,
- 0x3d, 0xa0, 0x69, 0xb9, 0x6f, 0xb3, 0xa3, 0x10, 0x42, 0x20, 0x1b, 0x50, 0xdf, 0x6b, 0x94, 0xe5,
- 0x6c, 0xe2, 0x3b, 0x9c, 0x0d, 0xe5, 0x4b, 0xd1, 0x6c, 0xa6, 0x50, 0x35, 0xa1, 0x18, 0xd0, 0x0b,
- 0x97, 0xb9, 0xde, 0xa8, 0x51, 0x91, 0xb3, 0x85, 0xe3, 0x70, 0xb6, 0x48, 0x5f, 0x8d, 0x66, 0x33,
- 0x43, 0xc8, 0x53, 0xc8, 0x33, 0x6e, 0xf3, 0x31, 0x6b, 0xd4, 0xd6, 0x52, 0xeb, 0xd5, 0xcd, 0x3b,
- 0x09, 0x47, 0xdf, 0x41, 0x90, 0xa9, 0xc0, 0xe4, 0x0e, 0x88, 0x98, 0x5a, 0xca, 0xb4, 0x8e, 0x7e,
- 0x45, 0x04, 0x25, 0x8c, 0x3c, 0x07, 0x10, 0xdc, 0x15, 0xfa, 0x80, 0x37, 0x96, 0x31, 0xa9, 0x9a,
- 0x2d, 0x49, 0xef, 0x56, 0x48, 0xef, 0xd6, 0x71, 0x48, 0x6f, 0xb3, 0x24, 0xd0, 0x1d, 0x01, 0x26,
- 0x9f, 0x43, 0x55, 0x78, 0xd6, 0xcc, 0x09, 0x7a, 0x17, 0x3b, 0x39, 0x8e, 0x50, 0x4f, 0xa1, 0x88,
- 0x08, 0x3a, 0x72, 0x1a, 0x2b, 0x0b, 0xdd, 0x17, 0x04, 0x76, 0x67, 0xe4, 0x84, 0xe9, 0x11, 0x99,
- 0xde, 0x88, 0xd2, 0xe3, 0x58, 0x22, 0x8c, 0x36, 0x10, 0x3d, 0xb7, 0x15, 0x3b, 0x1e, 0x4f, 0x14,
- 0x86, 0x44, 0x7a, 0xc8, 0x8a, 0xb0, 0x83, 0x04, 0x3e, 0xb6, 0xd9, 0x79, 0x02, 0x03, 0xc9, 0x7d,
- 0xa8, 0xb8, 0xa3, 0xde, 0x60, 0xec, 0xe0, 0x16, 0x39, 0x53, 0xe9, 0xbe, 0xa4, 0x84, 0x22, 0x88,
- 0xcc, 0xf8, 0x2d, 0xd4, 0x22, 0x37, 0x6a, 0x19, 0x4f, 0x20, 0x2b, 0x66, 0x56, 0x2c, 0x6d, 0xc4,
- 0xd6, 0x27, 0x81, 0x47, 0x94, 0xf1, 0xff, 0x6c, 0xb8, 0x17, 0x21, 0x8c, 0x88, 0xda, 0x80, 0x82,
- 0xcd, 0x39, 0x1d, 0xfa, 0x1c, 0xfd, 0xe4, 0xcc, 0x70, 0x28, 0xaa, 0xa6, 0x88, 0x4e, 0xa8, 0x4d,
- 0x47, 0xc1, 0x69, 0x2b, 0x40, 0xc4, 0x9d, 0x4c, 0x22, 0x77, 0xb2, 0x09, 0xdc, 0xc9, 0x25, 0x70,
- 0x27, 0x9f, 0xcc, 0x9d, 0xc2, 0x02, 0xee, 0x14, 0x93, 0xb9, 0x53, 0x4a, 0xe0, 0x0e, 0x24, 0x73,
- 0xa7, 0xbc, 0x80, 0x3b, 0x4b, 0xb3, 0xdc, 0x79, 0x16, 0x71, 0xa7, 0x82, 0xdc, 0xb9, 0x9b, 0x74,
- 0x20, 0x73, 0xc9, 0x53, 0x9d, 0x4f, 0x9e, 0xda, 0x87, 0x91, 0xa7, 0xbe, 0x80, 0x3c, 0xcb, 0xef,
- 0x4f, 0x1e, 0x32, 0x43, 0x9e, 0x1d, 0x58, 0x99, 0x48, 0x38, 0x95, 0xb6, 0x2d, 0xc8, 0x89, 0xc0,
- 0x84, 0xf4, 0x49, 0xce, 0x5b, 0x09, 0x33, 0x6e, 0xc3, 0xea, 0x4b, 0xca, 0x3b, 0xe7, 0xae, 0x8f,
- 0xd2, 0xf1, 0x80, 0x86, 0xc9, 0x6b, 0xfc, 0x2b, 0x05, 0x4b, 0xba, 0x42, 0x9c, 0xae, 0xed, 0x38,
- 0xd4, 0xb1, 0xba, 0x97, 0x61, 0x13, 0x80, 0xe3, 0xad, 0x4b, 0xf2, 0x04, 0x54, 0x93, 0xe1, 0xd3,
- 0x9e, 0xc8, 0x1a, 0x4e, 0x83, 0x91, 0xa0, 0x9a, 0xb8, 0x8d, 0xeb, 0x42, 0xd3, 0xf1, 0x69, 0xef,
- 0x48, 0xc9, 0x05, 0x2d, 0x64, 0x7f, 0xc0, 0x1a, 0x19, 0x84, 0x84, 0x43, 0xb2, 0x06, 0x65, 0x87,
- 0xb2, 0x5e, 0xe0, 0xfa, 0x5c, 0x24, 0x42, 0x16, 0x67, 0xd1, 0x45, 0x71, 0x49, 0x6e, 0x98, 0xd0,
- 0x98, 0xdd, 0x84, 0x0a, 0xc8, 0x33, 0xc8, 0x05, 0x42, 0xa0, 0x02, 0xb2, 0x16, 0x17, 0x10, 0xdd,
- 0xd2, 0x94, 0x70, 0xe3, 0x9f, 0x29, 0xb8, 0xd5, 0x76, 0x9c, 0x09, 0x95, 0x62, 0xf5, 0xc7, 0xdd,
- 0xec, 0xef, 0x61, 0x75, 0x66, 0x5d, 0x1f, 0xb8, 0xd7, 0xc7, 0x70, 0xfb, 0x05, 0x1d, 0x50, 0x4e,
- 0xe3, 0x76, 0x3b, 0xdd, 0xd2, 0x1c, 0x43, 0x33, 0x0e, 0xfc, 0x81, 0x4b, 0xf8, 0x5f, 0x0a, 0x4a,
- 0xa2, 0x4e, 0x08, 0x5e, 0x52, 0xf2, 0x1c, 0x72, 0x58, 0x7a, 0x54, 0xf5, 0xbd, 0x1f, 0xe7, 0x25,
- 0x42, 0xb7, 0xb0, 0x24, 0x99, 0xd2, 0x22, 0x2a, 0x4b, 0x69, 0xad, 0x2c, 0xe9, 0xb5, 0x27, 0x33,
- 0x59, 0x7b, 0x9a, 0x3e, 0xe4, 0xd0, 0xfe, 0xaa, 0xe0, 0xa6, 0xf4, 0x82, 0x7b, 0x07, 0x00, 0xfd,
- 0x5a, 0x9a, 0xd3, 0x12, 0x4a, 0xc2, 0xaa, 0x16, 0xd5, 0xc8, 0xcc, 0x54, 0x0d, 0xbd, 0x05, 0x79,
- 0x46, 0x83, 0x0b, 0x1a, 0xa8, 0x93, 0x55, 0x23, 0xe3, 0xcf, 0x50, 0x10, 0xbb, 0x7f, 0x45, 0x2f,
- 0xc9, 0xaf, 0x01, 0x84, 0x5f, 0x2c, 0x4f, 0x54, 0x6d, 0xf6, 0xce, 0xdc, 0xcd, 0x9a, 0xa5, 0x20,
- 0x8a, 0x52, 0x98, 0x1d, 0x69, 0xad, 0xde, 0x1b, 0x50, 0xc1, 0x6e, 0xcc, 0xb1, 0x64, 0x4b, 0xac,
- 0x56, 0x55, 0x96, 0xc2, 0x7d, 0xd1, 0x17, 0x1b, 0xff, 0xcd, 0x43, 0x56, 0xac, 0x60, 0xce, 0xf5,
- 0xa4, 0x25, 0x6d, 0x7a, 0x32, 0x69, 0x9f, 0x03, 0xf4, 0x02, 0x6a, 0x73, 0xea, 0x58, 0xb6, 0xdc,
- 0xf3, 0x82, 0x8a, 0xa9, 0xd0, 0x6d, 0x4e, 0x7e, 0x07, 0x55, 0xa7, 0x6b, 0x0d, 0x3d, 0xc7, 0x3d,
- 0x71, 0xa5, 0x79, 0x76, 0xa1, 0xf9, 0x92, 0xd3, 0x7d, 0xa3, 0x0c, 0xda, 0x9c, 0x7c, 0x0d, 0xe5,
- 0x13, 0x77, 0xe4, 0xb2, 0xbe, 0x34, 0xcf, 0x2d, 0x34, 0x87, 0x10, 0xde, 0x0e, 0x13, 0x39, 0x1f,
- 0x75, 0x06, 0x0f, 0xa1, 0xe6, 0x32, 0x6f, 0x80, 0x5b, 0xf1, 0xc6, 0xdc, 0x1f, 0x87, 0xd7, 0x60,
- 0x35, 0x14, 0x1f, 0xa2, 0x54, 0xc4, 0x19, 0x3b, 0x92, 0x22, 0x46, 0x02, 0xbf, 0xc5, 0x95, 0x35,
- 0xb4, 0x7f, 0x0c, 0xef, 0x6f, 0x86, 0xb7, 0x60, 0xce, 0x2c, 0x0f, 0xed, 0x1f, 0xd5, 0x05, 0xce,
- 0xc8, 0x03, 0xa8, 0xf9, 0x76, 0x40, 0x47, 0xdc, 0xc2, 0x03, 0x15, 0xbf, 0x27, 0x80, 0x1e, 0x2a,
- 0x52, 0x2c, 0x8e, 0x60, 0xcf, 0x61, 0x64, 0x17, 0xc0, 0x0f, 0x3c, 0x9f, 0x06, 0xdc, 0xa5, 0xac,
- 0x51, 0x46, 0xde, 0xac, 0x27, 0xd5, 0xed, 0xd6, 0x51, 0x04, 0xdd, 0x19, 0xf1, 0xe0, 0xd2, 0xd4,
- 0x6c, 0x45, 0x81, 0x0e, 0x28, 0x0f, 0x2e, 0x2d, 0xef, 0x04, 0xef, 0xd0, 0x92, 0x59, 0xc0, 0xf1,
- 0xe1, 0x89, 0x38, 0x36, 0xbc, 0xa4, 0x64, 0xe0, 0x2a, 0x8b, 0x8f, 0x4d, 0xa1, 0xdb, 0x5c, 0xbb,
- 0x7a, 0xab, 0xd7, 0xba, 0x7a, 0x1f, 0x40, 0x8d, 0xfd, 0x60, 0x07, 0x43, 0x77, 0x74, 0x6a, 0x75,
- 0x3d, 0x2e, 0x92, 0xb1, 0x86, 0x8b, 0xaa, 0x84, 0xe2, 0x2d, 0x8f, 0xef, 0x39, 0x64, 0x1d, 0xea,
- 0x11, 0x4e, 0x45, 0x0a, 0xaf, 0xd2, 0x92, 0x59, 0x0d, 0xe5, 0x32, 0x54, 0xe4, 0x19, 0x14, 0x11,
- 0x70, 0x4e, 0x2f, 0xd5, 0x65, 0xfa, 0x69, 0xd2, 0x5a, 0x5e, 0xd1, 0x4b, 0xb3, 0xc0, 0x15, 0xcd,
- 0xbe, 0x84, 0x9c, 0xec, 0xfd, 0x48, 0x32, 0xc3, 0xc2, 0x0d, 0x30, 0x53, 0x62, 0x9b, 0xdf, 0x40,
- 0x6d, 0x2a, 0xd6, 0xa4, 0x0e, 0x19, 0x31, 0xb5, 0x2c, 0x10, 0xe2, 0x53, 0x14, 0x8d, 0x0b, 0x7b,
- 0x30, 0x0e, 0x39, 0x28, 0x07, 0xbf, 0x4a, 0xff, 0x32, 0x65, 0xec, 0x43, 0x5d, 0xb8, 0x7c, 0x41,
- 0x7d, 0x3a, 0x72, 0xe8, 0xa8, 0x27, 0xce, 0x87, 0x68, 0x3d, 0x65, 0x49, 0x76, 0x8e, 0xc4, 0x80,
- 0x25, 0x47, 0xc3, 0x28, 0xba, 0x4d, 0xc8, 0x8c, 0x7f, 0xa7, 0xa0, 0x8c, 0xeb, 0x1b, 0x0f, 0x87,
- 0x76, 0x70, 0x39, 0xd3, 0xe3, 0x6a, 0x3c, 0x4e, 0x4f, 0xf2, 0x78, 0x3a, 0x4d, 0x33, 0xb3, 0x69,
- 0x7a, 0x75, 0xbc, 0xd9, 0x6b, 0x1d, 0x6f, 0xdc, 0xb1, 0xe5, 0xe2, 0x8e, 0xcd, 0xf8, 0x0e, 0x2a,
- 0x57, 0xab, 0x57, 0x71, 0xd0, 0x5e, 0x12, 0x64, 0xe1, 0x7a, 0x1a, 0x36, 0x2e, 0x69, 0x24, 0xc0,
- 0xbd, 0xc4, 0x55, 0xc8, 0x18, 0x84, 0xfd, 0xcb, 0x1b, 0xa8, 0x62, 0x98, 0xdd, 0x21, 0x1d, 0x89,
- 0x7a, 0xce, 0x44, 0x8b, 0x8c, 0xa6, 0xda, 0x0c, 0x98, 0x35, 0xd8, 0xf3, 0xde, 0x05, 0x70, 0x22,
- 0xa8, 0x8a, 0xb5, 0x26, 0x31, 0xfe, 0x91, 0x82, 0x52, 0x94, 0x09, 0x62, 0x8b, 0xdc, 0xe3, 0xf6,
- 0xc0, 0xf2, 0x2e, 0x68, 0xd0, 0xa7, 0xb6, 0x63, 0x31, 0xf4, 0x98, 0x36, 0xab, 0x28, 0x3f, 0x54,
- 0xe2, 0x0e, 0x69, 0xc1, 0x8a, 0xe3, 0xfd, 0x30, 0x1a, 0x78, 0xb6, 0xa3, 0x83, 0xd3, 0x08, 0x5e,
- 0x0e, 0x55, 0x57, 0xf8, 0x47, 0xb0, 0x3c, 0xf6, 0xa7, 0xd1, 0x19, 0x44, 0xd7, 0xa4, 0x22, 0xc2,
- 0x1a, 0x7f, 0xcd, 0x43, 0x66, 0xdf, 0xeb, 0xbe, 0xc7, 0x5f, 0xff, 0x26, 0xdc, 0xd4, 0x2d, 0x06,
- 0xd4, 0x66, 0x14, 0xc9, 0x93, 0x46, 0x93, 0x15, 0x4d, 0xf9, 0x5a, 0xe8, 0x04, 0x57, 0x3e, 0x6a,
- 0x7d, 0xdf, 0x9d, 0x22, 0x43, 0x0e, 0x73, 0xe1, 0xf3, 0xa4, 0x5c, 0xd0, 0xc9, 0x35, 0x49, 0x99,
- 0xe9, 0x9b, 0x22, 0xff, 0x1e, 0x37, 0x45, 0x21, 0xe2, 0x97, 0xfe, 0x08, 0x52, 0x9c, 0x7c, 0x04,
- 0x09, 0x53, 0xb9, 0xa4, 0xa5, 0xb2, 0x68, 0x0a, 0x02, 0xd7, 0x0b, 0x5c, 0x7e, 0x89, 0x7f, 0x41,
- 0x69, 0x33, 0x1a, 0x4f, 0xdd, 0xf8, 0xe5, 0x6b, 0xde, 0xf8, 0xdf, 0xc0, 0x52, 0x20, 0xdb, 0x32,
- 0xb9, 0xad, 0xa5, 0x85, 0xdb, 0x2a, 0x47, 0xf8, 0x36, 0xd7, 0x1e, 0x20, 0x2a, 0xd7, 0x79, 0x80,
- 0xf8, 0x2a, 0xa4, 0x66, 0x15, 0x8f, 0xe3, 0xb3, 0xf9, 0xd4, 0x14, 0x67, 0x21, 0xf1, 0xe4, 0x15,
- 0xd4, 0x10, 0xaa, 0x51, 0xae, 0x86, 0x2e, 0x8c, 0xc4, 0x13, 0x8d, 0x90, 0x66, 0x95, 0x4f, 0x8c,
- 0x1f, 0xfd, 0x3d, 0x05, 0x70, 0x55, 0x86, 0xc8, 0x2a, 0xac, 0x1c, 0xb7, 0x3b, 0xaf, 0xac, 0xce,
- 0x71, 0xfb, 0xf8, 0x6d, 0xc7, 0x3a, 0xda, 0x39, 0x78, 0xb1, 0x77, 0xf0, 0xb2, 0xfe, 0xc9, 0xb4,
- 0xc2, 0x7c, 0x7b, 0x70, 0x20, 0x14, 0xa9, 0x69, 0x45, 0xe7, 0xed, 0xf6, 0xf6, 0x4e, 0xa7, 0x53,
- 0x4f, 0x4f, 0x2b, 0xbe, 0x6d, 0xef, 0xbd, 0x7e, 0x6b, 0xee, 0xd4, 0x33, 0xe4, 0x16, 0x10, 0x5d,
- 0xf1, 0x66, 0xaf, 0xb3, 0xdb, 0x3e, 0xaa, 0x67, 0x1f, 0xfd, 0x2d, 0x05, 0xa5, 0x28, 0x4c, 0xa4,
- 0x09, 0xb7, 0xf6, 0x0f, 0xb7, 0x42, 0xd0, 0xde, 0x81, 0x75, 0x64, 0x1e, 0xbe, 0x34, 0x85, 0xeb,
- 0x4f, 0x84, 0x07, 0x4d, 0x17, 0x4e, 0x99, 0x9a, 0x92, 0x87, 0x33, 0xa6, 0xc9, 0x4d, 0x58, 0xd6,
- 0xe4, 0x6a, 0xc2, 0x8c, 0x58, 0xa1, 0x26, 0xde, 0x6e, 0x1f, 0x6c, 0xef, 0xbc, 0xde, 0x79, 0x51,
- 0xcf, 0x6e, 0xfe, 0xa5, 0x00, 0x37, 0x30, 0x28, 0x61, 0x24, 0x3b, 0x34, 0xb8, 0x70, 0x7b, 0x94,
- 0x7c, 0x0f, 0x65, 0xed, 0xa9, 0x94, 0x3c, 0x98, 0xff, 0xbe, 0x1a, 0xfe, 0xf3, 0x35, 0x1f, 0x2e,
- 0xc4, 0xa9, 0x3e, 0xff, 0x10, 0xf2, 0xf2, 0xe5, 0x94, 0xc4, 0xa6, 0xc3, 0xc4, 0xb3, 0x6b, 0xd3,
- 0x98, 0x07, 0x51, 0x0e, 0xff, 0x00, 0xa5, 0xe8, 0xa5, 0x94, 0xc4, 0x32, 0x7e, 0xfa, 0xb1, 0xb5,
- 0xf9, 0xb3, 0x05, 0x28, 0xe5, 0xf9, 0x8f, 0x00, 0x57, 0xcf, 0x4c, 0x24, 0xd6, 0x68, 0xe6, 0x89,
- 0xb5, 0xf9, 0x60, 0x11, 0x4c, 0x39, 0x37, 0xa1, 0xa0, 0x5e, 0x8e, 0x48, 0xd2, 0x2e, 0xb5, 0xd7,
- 0xa9, 0xe6, 0xfd, 0xb9, 0x18, 0xe5, 0xf3, 0x7b, 0x28, 0x6b, 0xbf, 0xf6, 0x64, 0xce, 0x52, 0xf4,
- 0xc7, 0xa6, 0xf8, 0xb3, 0x8b, 0x7b, 0x23, 0x18, 0x42, 0x7d, 0xfa, 0x77, 0x99, 0x3c, 0x4e, 0x58,
- 0x58, 0xdc, 0xcb, 0x40, 0xf3, 0xc9, 0xbb, 0x81, 0xd5, 0x74, 0x67, 0x50, 0x9b, 0xfa, 0x61, 0x25,
- 0x8f, 0xe2, 0x1c, 0xc4, 0xff, 0x6d, 0x37, 0x1f, 0xbf, 0x13, 0x56, 0xcd, 0xc5, 0x80, 0xcc, 0xfe,
- 0x9c, 0x92, 0x9f, 0xc7, 0xb9, 0x48, 0xfc, 0xe3, 0x6d, 0xb6, 0xde, 0x15, 0x2e, 0x27, 0xdd, 0xfa,
- 0xe2, 0xbb, 0x87, 0xa7, 0x5e, 0x8b, 0x9d, 0xbb, 0x76, 0xcb, 0x0b, 0x4e, 0x37, 0xdc, 0xd1, 0x49,
- 0x60, 0x6f, 0x4c, 0xba, 0xd8, 0x38, 0xf5, 0x36, 0x02, 0xbf, 0xd7, 0xcd, 0x63, 0x89, 0xfe, 0xf2,
- 0xa7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0x7f, 0x83, 0x98, 0x9e, 0x19, 0x00, 0x00,
+ 0x4b, 0x0a, 0x98, 0xa2, 0x4b, 0x72, 0x14, 0xc7, 0x49, 0x40, 0x0a, 0x16, 0x41, 0x49, 0x24, 0xb3,
+ 0x80, 0xaa, 0x52, 0x4e, 0x95, 0xb7, 0x16, 0xd8, 0x21, 0xb1, 0x24, 0x80, 0xdd, 0xec, 0x0c, 0x68,
+ 0xe3, 0x94, 0xaa, 0x54, 0xaa, 0x92, 0x6b, 0x2e, 0x79, 0x85, 0xbc, 0x44, 0x9e, 0x24, 0xc7, 0x9c,
+ 0x72, 0xcb, 0x2b, 0xb8, 0xe6, 0x6f, 0x39, 0x00, 0x76, 0x01, 0x51, 0x3a, 0xe8, 0xb6, 0xd3, 0xfd,
+ 0x75, 0xcf, 0x4c, 0x4f, 0x7f, 0x3d, 0xbd, 0x03, 0x85, 0xc0, 0xef, 0x37, 0xfc, 0xc0, 0xa3, 0x1e,
+ 0x42, 0xd4, 0x26, 0x17, 0x16, 0xe9, 0x0f, 0xb0, 0x33, 0x19, 0xe2, 0xa0, 0x11, 0xf8, 0xfd, 0xfa,
+ 0xbd, 0x33, 0xcf, 0x3b, 0x1b, 0xe2, 0x1d, 0x8e, 0xe8, 0x4d, 0x4e, 0x77, 0xa8, 0x3b, 0xc2, 0x84,
+ 0xda, 0x23, 0x5f, 0x18, 0x19, 0x07, 0x00, 0xdd, 0xc0, 0x3d, 0x3b, 0xc3, 0xc1, 0xa1, 0xd7, 0x43,
+ 0xb7, 0x21, 0x7f, 0xee, 0xf5, 0xac, 0xb1, 0x3d, 0xc2, 0xb5, 0xc4, 0x56, 0x62, 0xbb, 0x60, 0xe6,
+ 0xce, 0xbd, 0xde, 0x91, 0x3d, 0xc2, 0xe8, 0x1e, 0x14, 0xfb, 0xde, 0x68, 0xe4, 0x52, 0x6b, 0x60,
+ 0x93, 0x41, 0x2d, 0xc9, 0xb5, 0x20, 0x44, 0x07, 0x36, 0x19, 0x18, 0x07, 0x80, 0xae, 0x3c, 0x11,
+ 0x13, 0xff, 0x69, 0x82, 0x09, 0x45, 0xbb, 0x90, 0x3e, 0xf7, 0x7a, 0xa4, 0x96, 0xd8, 0x4a, 0x6d,
+ 0x17, 0x77, 0xef, 0x36, 0x16, 0xd7, 0xd8, 0xb8, 0xb2, 0x32, 0x39, 0xd6, 0x68, 0xc0, 0xc6, 0x8c,
+ 0x27, 0xe2, 0x7b, 0x63, 0x82, 0xd1, 0x26, 0xb0, 0xc5, 0x58, 0xae, 0x23, 0xbc, 0x15, 0xcc, 0xec,
+ 0xb9, 0xd7, 0x6b, 0x3b, 0xc4, 0xb8, 0x07, 0xa5, 0x97, 0x98, 0x32, 0x7b, 0x39, 0x69, 0x19, 0x92,
+ 0xae, 0x23, 0x37, 0x90, 0x74, 0x1d, 0xe3, 0x6b, 0x28, 0x2b, 0x80, 0xf4, 0xf5, 0x05, 0xa4, 0xce,
+ 0xbd, 0x1e, 0x87, 0x14, 0x77, 0x37, 0xa3, 0x56, 0xc5, 0xd0, 0x0c, 0x63, 0x18, 0x50, 0xdd, 0xb7,
+ 0xc7, 0x7d, 0x3c, 0x5c, 0x32, 0xc1, 0x6f, 0x60, 0x5d, 0xc3, 0x5c, 0x7f, 0x8e, 0xff, 0x64, 0x60,
+ 0xbd, 0x83, 0xed, 0xa0, 0x3f, 0xd0, 0x63, 0xf7, 0x0b, 0xb8, 0xd1, 0x9b, 0xb8, 0x43, 0xa7, 0x37,
+ 0xe9, 0x5f, 0x60, 0x6a, 0xf1, 0x6f, 0x2b, 0x9c, 0x17, 0x69, 0xba, 0x3d, 0xf6, 0xd9, 0x76, 0xd0,
+ 0x57, 0x50, 0x1b, 0xd8, 0xc4, 0x8a, 0xb4, 0x62, 0x27, 0x96, 0x37, 0x6f, 0x0e, 0x6c, 0xb2, 0xb7,
+ 0x68, 0x78, 0x1b, 0xf2, 0x2e, 0xb1, 0x4e, 0xbd, 0xa0, 0x8f, 0x6b, 0x29, 0x0e, 0xcc, 0xb9, 0xe4,
+ 0x5b, 0x36, 0x44, 0x5b, 0xb0, 0xc6, 0x7c, 0x86, 0xea, 0x34, 0x57, 0xc3, 0xc0, 0x26, 0x6d, 0x89,
+ 0xb8, 0x01, 0x19, 0x97, 0x90, 0x09, 0xae, 0x65, 0xf8, 0xc2, 0xc4, 0x00, 0x7d, 0x0a, 0x05, 0x61,
+ 0xc7, 0x34, 0x59, 0x6e, 0x94, 0xe7, 0x46, 0x4c, 0x89, 0x20, 0xcd, 0x93, 0x2c, 0xc7, 0x2d, 0xf8,
+ 0x37, 0x5b, 0x03, 0x33, 0xe0, 0xf2, 0xbc, 0x58, 0xc3, 0xc0, 0x26, 0x3c, 0xf9, 0xea, 0x90, 0xf7,
+ 0x6d, 0xda, 0x1f, 0x10, 0x4c, 0x6b, 0x05, 0x6e, 0x12, 0x8e, 0xd1, 0x67, 0x62, 0x7d, 0xa1, 0x1e,
+ 0xb8, 0x69, 0x71, 0x60, 0x93, 0x13, 0x05, 0x41, 0x90, 0x0e, 0xb0, 0xef, 0xd5, 0x8a, 0x62, 0x36,
+ 0xf6, 0xad, 0x66, 0xe3, 0xf2, 0xb5, 0x70, 0x36, 0x93, 0xa9, 0xea, 0x90, 0x0f, 0xf0, 0xa5, 0x4b,
+ 0x5c, 0x6f, 0x5c, 0x2b, 0x89, 0xd9, 0xd4, 0x58, 0xcd, 0x16, 0xea, 0xcb, 0xe1, 0x6c, 0xa6, 0x82,
+ 0x3c, 0x85, 0x2c, 0xa1, 0x36, 0x9d, 0x90, 0x5a, 0x65, 0x2b, 0xb1, 0x5d, 0xde, 0xbd, 0x13, 0x73,
+ 0xf4, 0x1d, 0x0e, 0x32, 0x25, 0x18, 0xdd, 0x01, 0x16, 0x53, 0x4b, 0x9a, 0x56, 0xb9, 0x5f, 0x16,
+ 0x41, 0x01, 0x43, 0xcf, 0x01, 0x18, 0x77, 0x99, 0x3e, 0xa0, 0xb5, 0x75, 0x9e, 0x54, 0xf5, 0x86,
+ 0xa0, 0x77, 0x43, 0xd1, 0xbb, 0xd1, 0x55, 0xf4, 0x36, 0x0b, 0x0c, 0xdd, 0x61, 0x60, 0xf4, 0x39,
+ 0x94, 0x99, 0x67, 0xcd, 0x1c, 0x71, 0xef, 0x6c, 0x27, 0xdd, 0x10, 0xf5, 0x14, 0xf2, 0x1c, 0x81,
+ 0xc7, 0x4e, 0x6d, 0x63, 0xa5, 0xfb, 0x1c, 0xc3, 0xb6, 0xc6, 0x8e, 0x4a, 0x8f, 0xd0, 0xf4, 0x46,
+ 0x98, 0x1e, 0x5d, 0x81, 0x30, 0x9a, 0x80, 0xf4, 0xdc, 0x96, 0xec, 0x78, 0x3c, 0x53, 0x18, 0x62,
+ 0xe9, 0x21, 0x2a, 0x42, 0x8b, 0x13, 0xb8, 0x6b, 0x93, 0x8b, 0x18, 0x06, 0xa2, 0xfb, 0x50, 0x72,
+ 0xc7, 0xfd, 0xe1, 0xc4, 0xe1, 0x5b, 0xa4, 0x44, 0xa6, 0xfb, 0x9a, 0x14, 0xb2, 0x20, 0x12, 0xe3,
+ 0xb7, 0x50, 0x09, 0xdd, 0xc8, 0x65, 0x3c, 0x81, 0x34, 0x9b, 0x59, 0xb2, 0xb4, 0x16, 0x59, 0x9f,
+ 0x18, 0x9e, 0xa3, 0x8c, 0xff, 0xa7, 0xd5, 0x5e, 0x98, 0x30, 0x24, 0x6a, 0x0d, 0x72, 0x36, 0xa5,
+ 0x78, 0xe4, 0x53, 0xee, 0x27, 0x63, 0xaa, 0x21, 0xab, 0x9a, 0x2c, 0x3a, 0x4a, 0x9b, 0x0c, 0x83,
+ 0xd3, 0x94, 0x80, 0x90, 0x3b, 0xa9, 0x58, 0xee, 0xa4, 0x63, 0xb8, 0x93, 0x89, 0xe1, 0x4e, 0x36,
+ 0x9e, 0x3b, 0xb9, 0x15, 0xdc, 0xc9, 0xc7, 0x73, 0xa7, 0x10, 0xc3, 0x1d, 0x88, 0xe7, 0x4e, 0x71,
+ 0x05, 0x77, 0xd6, 0x16, 0xb9, 0xf3, 0x2c, 0xe4, 0x4e, 0x89, 0x73, 0xe7, 0x6e, 0xdc, 0x81, 0x2c,
+ 0x25, 0x4f, 0x79, 0x39, 0x79, 0x2a, 0x1f, 0x46, 0x9e, 0xea, 0x0a, 0xf2, 0xac, 0xbf, 0x3f, 0x79,
+ 0xd0, 0x02, 0x79, 0x5a, 0xb0, 0x31, 0x93, 0x70, 0x32, 0x6d, 0x1b, 0x90, 0x61, 0x81, 0x51, 0xf4,
+ 0x89, 0xcf, 0x5b, 0x01, 0x33, 0x6e, 0xc3, 0xe6, 0x4b, 0x4c, 0x3b, 0x17, 0xae, 0xcf, 0xa5, 0x93,
+ 0x21, 0x56, 0xc9, 0x6b, 0xfc, 0x2b, 0x01, 0x6b, 0xba, 0x82, 0x9d, 0xae, 0xed, 0x38, 0xd8, 0xb1,
+ 0x7a, 0x53, 0xd5, 0x04, 0xf0, 0xf1, 0xde, 0x14, 0x3d, 0x01, 0xd9, 0x64, 0xf8, 0xb8, 0xcf, 0xb2,
+ 0x86, 0xe2, 0x60, 0xcc, 0xa8, 0xc6, 0x6e, 0xe3, 0x2a, 0xd3, 0x74, 0x7c, 0xdc, 0x3f, 0x91, 0x72,
+ 0x46, 0x0b, 0xd1, 0x1f, 0x90, 0x5a, 0x8a, 0x43, 0xd4, 0x10, 0x6d, 0x41, 0xd1, 0xc1, 0xa4, 0x1f,
+ 0xb8, 0x3e, 0x65, 0x89, 0x90, 0xe6, 0xb3, 0xe8, 0xa2, 0xa8, 0x24, 0x37, 0x4c, 0xa8, 0x2d, 0x6e,
+ 0x42, 0x06, 0xe4, 0x19, 0x64, 0x02, 0x26, 0x90, 0x01, 0xd9, 0x8a, 0x0a, 0x88, 0x6e, 0x69, 0x0a,
+ 0xb8, 0xf1, 0xcf, 0x04, 0xdc, 0x6a, 0x3a, 0xce, 0x8c, 0x4a, 0xb2, 0xfa, 0xe3, 0x6e, 0xf6, 0xf7,
+ 0xb0, 0xb9, 0xb0, 0xae, 0x0f, 0xdc, 0xeb, 0x63, 0xb8, 0xfd, 0x02, 0x0f, 0x31, 0xc5, 0x51, 0xbb,
+ 0x9d, 0x6f, 0x69, 0xba, 0x50, 0x8f, 0x02, 0x7f, 0xe0, 0x12, 0xfe, 0x97, 0x80, 0x02, 0xab, 0x13,
+ 0x8c, 0x97, 0x18, 0x3d, 0x87, 0x0c, 0x2f, 0x3d, 0xb2, 0xfa, 0xde, 0x8f, 0xf2, 0x12, 0xa2, 0x1b,
+ 0xbc, 0x24, 0x99, 0xc2, 0x22, 0x2c, 0x4b, 0x49, 0xad, 0x2c, 0xe9, 0xb5, 0x27, 0x35, 0x5b, 0x7b,
+ 0xea, 0x3e, 0x64, 0xb8, 0xfd, 0x55, 0xc1, 0x4d, 0xe8, 0x05, 0xf7, 0x0e, 0x00, 0xf7, 0x6b, 0x69,
+ 0x4e, 0x0b, 0x5c, 0xa2, 0xaa, 0x5a, 0x58, 0x23, 0x53, 0x73, 0x35, 0xf4, 0x16, 0x64, 0x09, 0x0e,
+ 0x2e, 0x71, 0x20, 0x4f, 0x56, 0x8e, 0x8c, 0x3f, 0x43, 0x8e, 0xed, 0xfe, 0x15, 0x9e, 0xa2, 0x5f,
+ 0x03, 0x30, 0xbf, 0xbc, 0x3c, 0x61, 0xb9, 0xd9, 0x3b, 0x4b, 0x37, 0x6b, 0x16, 0x82, 0x30, 0x4a,
+ 0x2a, 0x3b, 0x92, 0x5a, 0xbd, 0x37, 0xa0, 0xc4, 0xbb, 0x31, 0xc7, 0x12, 0x2d, 0xb1, 0x5c, 0x55,
+ 0x51, 0x08, 0x0f, 0x59, 0x5f, 0x6c, 0xfc, 0x37, 0x0b, 0x69, 0xb6, 0x82, 0x25, 0xd7, 0x93, 0x96,
+ 0xb4, 0xc9, 0xd9, 0xa4, 0x7d, 0x0e, 0xd0, 0x0f, 0xb0, 0x4d, 0xb1, 0x63, 0xd9, 0x62, 0xcf, 0x2b,
+ 0x2a, 0xa6, 0x44, 0x37, 0x29, 0xfa, 0x1d, 0x94, 0x9d, 0x9e, 0x35, 0xf2, 0x1c, 0xf7, 0xd4, 0x15,
+ 0xe6, 0xe9, 0x95, 0xe6, 0x6b, 0x4e, 0xef, 0x8d, 0x34, 0x68, 0x52, 0xf4, 0x35, 0x14, 0x4f, 0xdd,
+ 0xb1, 0x4b, 0x06, 0xc2, 0x3c, 0xb3, 0xd2, 0x1c, 0x14, 0xbc, 0xa9, 0x12, 0x39, 0x1b, 0x76, 0x06,
+ 0x0f, 0xa1, 0xe2, 0x12, 0x6f, 0xc8, 0xb7, 0xe2, 0x4d, 0xa8, 0x3f, 0x51, 0xd7, 0x60, 0x59, 0x89,
+ 0x8f, 0xb9, 0x94, 0xc5, 0x99, 0x77, 0x24, 0x79, 0x1e, 0x09, 0xfe, 0xcd, 0xae, 0xac, 0x91, 0xfd,
+ 0xa3, 0xba, 0xbf, 0x09, 0xbf, 0x05, 0x33, 0x66, 0x71, 0x64, 0xff, 0x28, 0x2f, 0x70, 0x82, 0x1e,
+ 0x40, 0xc5, 0xb7, 0x03, 0x3c, 0xa6, 0x16, 0x3f, 0x50, 0xf6, 0x7b, 0x02, 0xdc, 0x43, 0x49, 0x88,
+ 0xd9, 0x11, 0xb4, 0x1d, 0x82, 0x0e, 0x00, 0xfc, 0xc0, 0xf3, 0x71, 0x40, 0x5d, 0x4c, 0x6a, 0x45,
+ 0xce, 0x9b, 0xed, 0xb8, 0xba, 0xdd, 0x38, 0x09, 0xa1, 0xad, 0x31, 0x0d, 0xa6, 0xa6, 0x66, 0xcb,
+ 0x0a, 0x74, 0x80, 0x69, 0x30, 0xb5, 0xbc, 0x53, 0x7e, 0x87, 0x16, 0xcc, 0x1c, 0x1f, 0x1f, 0x9f,
+ 0xb2, 0x63, 0xe3, 0x97, 0x94, 0x08, 0x5c, 0x69, 0xf5, 0xb1, 0x49, 0x74, 0x93, 0x6a, 0x57, 0x6f,
+ 0xf9, 0x5a, 0x57, 0xef, 0x03, 0xa8, 0x90, 0x1f, 0xec, 0x60, 0xe4, 0x8e, 0xcf, 0xac, 0x9e, 0x47,
+ 0x59, 0x32, 0x56, 0xf8, 0xa2, 0x4a, 0x4a, 0xbc, 0xe7, 0xd1, 0xb6, 0x83, 0xb6, 0xa1, 0x1a, 0xe2,
+ 0x64, 0xa4, 0xf8, 0x55, 0x5a, 0x30, 0xcb, 0x4a, 0x2e, 0x42, 0x85, 0x9e, 0x41, 0x9e, 0x03, 0x2e,
+ 0xf0, 0x54, 0x5e, 0xa6, 0x9f, 0xc6, 0xad, 0xe5, 0x15, 0x9e, 0x9a, 0x39, 0x2a, 0x69, 0xf6, 0x25,
+ 0x64, 0x44, 0xef, 0x87, 0xe2, 0x19, 0xa6, 0x36, 0x40, 0x4c, 0x81, 0xad, 0x7f, 0x03, 0x95, 0xb9,
+ 0x58, 0xa3, 0x2a, 0xa4, 0xd8, 0xd4, 0xa2, 0x40, 0xb0, 0x4f, 0x56, 0x34, 0x2e, 0xed, 0xe1, 0x44,
+ 0x71, 0x50, 0x0c, 0x7e, 0x95, 0xfc, 0x65, 0xc2, 0x38, 0x84, 0x2a, 0x73, 0xf9, 0x02, 0xfb, 0x78,
+ 0xec, 0xe0, 0x71, 0x9f, 0x9d, 0x0f, 0xd2, 0x7a, 0xca, 0x82, 0xe8, 0x1c, 0x91, 0x01, 0x6b, 0x8e,
+ 0x86, 0x91, 0x74, 0x9b, 0x91, 0x19, 0xff, 0x4e, 0x40, 0x91, 0xaf, 0x6f, 0x32, 0x1a, 0xd9, 0xc1,
+ 0x74, 0xa1, 0xc7, 0xd5, 0x78, 0x9c, 0x9c, 0xe5, 0xf1, 0x7c, 0x9a, 0xa6, 0x16, 0xd3, 0xf4, 0xea,
+ 0x78, 0xd3, 0xd7, 0x3a, 0xde, 0xa8, 0x63, 0xcb, 0x44, 0x1d, 0x9b, 0xf1, 0x1d, 0x94, 0xae, 0x56,
+ 0x2f, 0xe3, 0xa0, 0xbd, 0x24, 0x88, 0xc2, 0xf5, 0x54, 0x35, 0x2e, 0x49, 0x4e, 0x80, 0x7b, 0xb1,
+ 0xab, 0x10, 0x31, 0x50, 0xfd, 0xcb, 0x1b, 0x28, 0xf3, 0x30, 0xbb, 0x23, 0x3c, 0x66, 0xf5, 0x9c,
+ 0xb0, 0x16, 0x99, 0x9b, 0x6a, 0x33, 0xf0, 0xac, 0xe1, 0x3d, 0xef, 0x5d, 0x00, 0x27, 0x84, 0xca,
+ 0x58, 0x6b, 0x12, 0xe3, 0x1f, 0x09, 0x28, 0x84, 0x99, 0xc0, 0xb6, 0x48, 0x3d, 0x6a, 0x0f, 0x2d,
+ 0xef, 0x12, 0x07, 0x03, 0x6c, 0x3b, 0x16, 0xe1, 0x1e, 0x93, 0x66, 0x99, 0xcb, 0x8f, 0xa5, 0xb8,
+ 0x83, 0x1a, 0xb0, 0xe1, 0x78, 0x3f, 0x8c, 0x87, 0x9e, 0xed, 0xe8, 0xe0, 0x24, 0x07, 0xaf, 0x2b,
+ 0xd5, 0x15, 0xfe, 0x11, 0xac, 0x4f, 0xfc, 0x79, 0x74, 0x8a, 0xa3, 0x2b, 0x42, 0x11, 0x62, 0x8d,
+ 0xbf, 0x66, 0x21, 0x75, 0xe8, 0xf5, 0xde, 0xe3, 0xaf, 0x7f, 0x17, 0x6e, 0xea, 0x16, 0x43, 0x6c,
+ 0x13, 0xcc, 0xc9, 0x23, 0xb2, 0x75, 0x43, 0x53, 0xbe, 0x66, 0x3a, 0xc6, 0x95, 0x8f, 0x5a, 0xdf,
+ 0x0f, 0xe6, 0xc8, 0x90, 0xe1, 0xb9, 0xf0, 0x79, 0x5c, 0x2e, 0xe8, 0xe4, 0x9a, 0xa5, 0xcc, 0xfc,
+ 0x4d, 0x91, 0x7d, 0x8f, 0x9b, 0x22, 0x17, 0xf2, 0x4b, 0x7f, 0x04, 0xc9, 0xcf, 0x3e, 0x82, 0xa8,
+ 0x54, 0x2e, 0x68, 0xa9, 0xcc, 0x9a, 0x82, 0xc0, 0xf5, 0x02, 0x97, 0x4e, 0xf9, 0x5f, 0x50, 0xd2,
+ 0x0c, 0xc7, 0x73, 0x37, 0x7e, 0xf1, 0x9a, 0x37, 0xfe, 0x37, 0xb0, 0x16, 0x88, 0xb6, 0x4c, 0x6c,
+ 0x6b, 0x6d, 0xe5, 0xb6, 0x8a, 0x21, 0xbe, 0x49, 0xb5, 0x07, 0x88, 0xd2, 0x75, 0x1e, 0x20, 0xbe,
+ 0x52, 0xd4, 0x2c, 0xf3, 0xe3, 0xf8, 0x6c, 0x39, 0x35, 0xd9, 0x59, 0x08, 0x3c, 0x7a, 0x05, 0x15,
+ 0x0e, 0xd5, 0x28, 0x57, 0xe1, 0x2e, 0x8c, 0xd8, 0x13, 0x0d, 0x91, 0x66, 0x99, 0xce, 0x8c, 0x1f,
+ 0xfd, 0x3d, 0x01, 0x70, 0x55, 0x86, 0xd0, 0x26, 0x6c, 0x74, 0x9b, 0x9d, 0x57, 0x56, 0xa7, 0xdb,
+ 0xec, 0xbe, 0xed, 0x58, 0x27, 0xad, 0xa3, 0x17, 0xed, 0xa3, 0x97, 0xd5, 0x4f, 0xe6, 0x15, 0xe6,
+ 0xdb, 0xa3, 0x23, 0xa6, 0x48, 0xcc, 0x2b, 0x3a, 0x6f, 0xf7, 0xf7, 0x5b, 0x9d, 0x4e, 0x35, 0x39,
+ 0xaf, 0xf8, 0xb6, 0xd9, 0x7e, 0xfd, 0xd6, 0x6c, 0x55, 0x53, 0xe8, 0x16, 0x20, 0x5d, 0xf1, 0xa6,
+ 0xdd, 0x39, 0x68, 0x9e, 0x54, 0xd3, 0x8f, 0xfe, 0x96, 0x80, 0x42, 0x18, 0x26, 0x54, 0x87, 0x5b,
+ 0x87, 0xc7, 0x7b, 0x0a, 0xd4, 0x3e, 0xb2, 0x4e, 0xcc, 0xe3, 0x97, 0x26, 0x73, 0xfd, 0x09, 0xf3,
+ 0xa0, 0xe9, 0xd4, 0x94, 0x89, 0x39, 0xb9, 0x9a, 0x31, 0x89, 0x6e, 0xc2, 0xba, 0x26, 0x97, 0x13,
+ 0xa6, 0xd8, 0x0a, 0x35, 0xf1, 0x7e, 0xf3, 0x68, 0xbf, 0xf5, 0xba, 0xf5, 0xa2, 0x9a, 0xde, 0xfd,
+ 0x4b, 0x0e, 0x6e, 0xf0, 0xa0, 0xa8, 0x48, 0x76, 0x70, 0x70, 0xe9, 0xf6, 0x31, 0xfa, 0x1e, 0x8a,
+ 0xda, 0x53, 0x29, 0x7a, 0xb0, 0xfc, 0x7d, 0x55, 0xfd, 0xf3, 0xd5, 0x1f, 0xae, 0xc4, 0xc9, 0x3e,
+ 0xff, 0x18, 0xb2, 0xe2, 0xe5, 0x14, 0x45, 0xa6, 0xc3, 0xcc, 0xb3, 0x6b, 0xdd, 0x58, 0x06, 0x91,
+ 0x0e, 0xff, 0x00, 0x85, 0xf0, 0xa5, 0x14, 0x45, 0x32, 0x7e, 0xfe, 0xb1, 0xb5, 0xfe, 0xb3, 0x15,
+ 0x28, 0xe9, 0xf9, 0x8f, 0x00, 0x57, 0xcf, 0x4c, 0x28, 0xd2, 0x68, 0xe1, 0x89, 0xb5, 0xfe, 0x60,
+ 0x15, 0x4c, 0x3a, 0x37, 0x21, 0x27, 0x5f, 0x8e, 0x50, 0xdc, 0x2e, 0xb5, 0xd7, 0xa9, 0xfa, 0xfd,
+ 0xa5, 0x18, 0xe9, 0xf3, 0x7b, 0x28, 0x6a, 0xbf, 0xf6, 0x68, 0xc9, 0x52, 0xf4, 0xc7, 0xa6, 0xe8,
+ 0xb3, 0x8b, 0x7a, 0x23, 0x18, 0x41, 0x75, 0xfe, 0x77, 0x19, 0x3d, 0x8e, 0x59, 0x58, 0xd4, 0xcb,
+ 0x40, 0xfd, 0xc9, 0xbb, 0x81, 0xe5, 0x74, 0xe7, 0x50, 0x99, 0xfb, 0x61, 0x45, 0x8f, 0xa2, 0x1c,
+ 0x44, 0xff, 0x6d, 0xd7, 0x1f, 0xbf, 0x13, 0x56, 0xce, 0x45, 0x00, 0x2d, 0xfe, 0x9c, 0xa2, 0x9f,
+ 0x47, 0xb9, 0x88, 0xfd, 0xe3, 0xad, 0x37, 0xde, 0x15, 0x2e, 0x26, 0xdd, 0xfb, 0xe2, 0xbb, 0x87,
+ 0x67, 0x5e, 0x83, 0x5c, 0xb8, 0x76, 0xc3, 0x0b, 0xce, 0x76, 0xdc, 0xf1, 0x69, 0x60, 0xef, 0xcc,
+ 0xba, 0xd8, 0x39, 0xf3, 0x76, 0x02, 0xbf, 0xdf, 0xcb, 0xf2, 0x12, 0xfd, 0xe5, 0x4f, 0x01, 0x00,
+ 0x00, 0xff, 0xff, 0xea, 0x45, 0x87, 0x19, 0x9e, 0x19, 0x00, 0x00,
}
diff --git a/task_scheduler/go/rpc/rpc_test.go b/task_scheduler/go/rpc/rpc_test.go
index 68c78bc..2881ff9 100644
--- a/task_scheduler/go/rpc/rpc_test.go
+++ b/task_scheduler/go/rpc/rpc_test.go
@@ -664,8 +664,8 @@
require.NoError(t, err)
assertdeep.Copy(t, &Job{
- BuildbucketBuildId: 12345,
- BuildbucketLeaseKey: 67890,
+ BuildbucketBuildId: "12345",
+ BuildbucketLeaseKey: "67890",
CreatedAt: timestamppb.New(time.Unix(1600181000, 0)),
DbModifiedAt: timestamppb.New(time.Unix(1600182000, 0)),
Dependencies: []*TaskDependencies{
diff --git a/task_scheduler/modules/job-search-sk/job-search-sk.ts b/task_scheduler/modules/job-search-sk/job-search-sk.ts
index 781e477..a1ab11c 100644
--- a/task_scheduler/modules/job-search-sk/job-search-sk.ts
+++ b/task_scheduler/modules/job-search-sk/job-search-sk.ts
@@ -318,9 +318,7 @@
private search() {
const req = {
- buildbucketBuildId: parseInt(
- this.searchTerms.get('buildbucketBuildId')?.value || '0'
- ),
+ buildbucketBuildId: this.searchTerms.get('buildbucketBuildId')?.value || '',
hasBuildbucketBuildId: !!this.searchTerms.get('buildbucketBuildId'),
isForce: this.searchTerms.get('isForce')?.value === 'true',
hasIsForce: !!this.searchTerms.get('isForce'),
diff --git a/task_scheduler/modules/job-sk/job-sk.ts b/task_scheduler/modules/job-sk/job-sk.ts
index aba12de..7d4771e 100644
--- a/task_scheduler/modules/job-sk/job-sk.ts
+++ b/task_scheduler/modules/job-sk/job-sk.ts
@@ -189,6 +189,13 @@
</tr>
`
: html``}
+ ${ele.job!.buildbucketBuildId ? html`
+ <tr>
+ <td>Buildbucket Build ID</td>
+ <td>${ele.job!.buildbucketBuildId}</td>
+ <td></td>
+ </tr>
+ `: html``}
<tr>
<td>Manually forced</td>
<td>${ele.job!.isForce ? 'true' : 'false'}</td>
diff --git a/task_scheduler/modules/rpc-mock/fake-data.ts b/task_scheduler/modules/rpc-mock/fake-data.ts
index 3bff50e..5688573 100644
--- a/task_scheduler/modules/rpc-mock/fake-data.ts
+++ b/task_scheduler/modules/rpc-mock/fake-data.ts
@@ -166,8 +166,8 @@
// job1 represents real task data.
export const job1: Job = {
- buildbucketBuildId: 8921090193851453000,
- buildbucketLeaseKey: 0,
+ buildbucketBuildId: "8855126827389415264",
+ buildbucketLeaseKey: "",
createdAt: new Date('2019-02-19T13:20:52.277737Z').toString(),
dbModifiedAt: new Date('2019-02-19T13:33:14.64704Z').toString(),
dependencies: [
@@ -275,8 +275,8 @@
// job2 is fake data but is more visually interesting.
export const job2: Job = {
- buildbucketBuildId: 8921090193851453000,
- buildbucketLeaseKey: 0,
+ buildbucketBuildId: "8855126827389415264",
+ buildbucketLeaseKey: "",
createdAt: new Date('2019-10-10T13:56:44.572122663Z').toUTCString(),
dbModifiedAt: new Date('2019-10-10T19:56:44.572122663Z').toUTCString(),
dependencies: [
diff --git a/task_scheduler/modules/rpc/rpc.ts b/task_scheduler/modules/rpc/rpc.ts
index 77912a1..4dd8dbd 100644
--- a/task_scheduler/modules/rpc/rpc.ts
+++ b/task_scheduler/modules/rpc/rpc.ts
@@ -118,7 +118,7 @@
};
export interface SearchJobsRequest {
- buildbucketBuildId: number;
+ buildbucketBuildId: string;
hasBuildbucketBuildId: boolean;
isForce: boolean;
hasIsForce: boolean;
@@ -141,7 +141,7 @@
}
interface SearchJobsRequestJSON {
- buildbucket_build_id?: number;
+ buildbucket_build_id?: string;
has_buildbucket_build_id?: boolean;
is_force?: boolean;
has_is_force?: boolean;
@@ -662,8 +662,8 @@
};
export interface Job {
- buildbucketBuildId: number;
- buildbucketLeaseKey: number;
+ buildbucketBuildId: string;
+ buildbucketLeaseKey: string;
createdAt?: string;
dbModifiedAt?: string;
dependencies?: TaskDependencies[];
@@ -680,8 +680,8 @@
}
interface JobJSON {
- buildbucket_build_id?: number;
- buildbucket_lease_key?: number;
+ buildbucket_build_id?: string;
+ buildbucket_lease_key?: string;
created_at?: string;
db_modified_at?: string;
dependencies?: TaskDependenciesJSON[];
@@ -699,8 +699,8 @@
const JSONToJob = (m: JobJSON): Job => {
return {
- buildbucketBuildId: m.buildbucket_build_id || 0,
- buildbucketLeaseKey: m.buildbucket_lease_key || 0,
+ buildbucketBuildId: m.buildbucket_build_id || "",
+ buildbucketLeaseKey: m.buildbucket_lease_key || "",
createdAt: m.created_at,
dbModifiedAt: m.db_modified_at,
dependencies: m.dependencies && m.dependencies.map(JSONToTaskDependencies),
