From d0351a1117e7e4e66d21b15c15aa95f449971bfb Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Tue, 2 Jul 2024 17:56:07 +0100 Subject: [PATCH] Remove Gogo Nullable Properties From API Protos (#3756) * initial timestamps Signed-off-by: Chris Martin * initial timestamps Signed-off-by: Chris Martin * initial timestamps Signed-off-by: Chris Martin * tests Signed-off-by: Chris Martin * regen proto Signed-off-by: Chris Martin * fix diff Signed-off-by: Chris Martin * submit.go Signed-off-by: Chris Martin * submit.go Signed-off-by: Chris Martin * more fixes Signed-off-by: Chris Martin * more fixes Signed-off-by: Chris Martin * lint Signed-off-by: Chris Martin * fix tests Signed-off-by: Chris Martin * fix proto gen Signed-off-by: Chris Martin * fix test Signed-off-by: Chris Martin * comment out test Signed-off-by: Chris Martin * fix Signed-off-by: Chris Martin * fix Signed-off-by: Chris Martin * fix Signed-off-by: Chris Martin * another test Signed-off-by: Chris Martin * another test Signed-off-by: Chris Martin * wip Signed-off-by: Chris Martin * fix merge conflict Signed-off-by: Chris Martin --------- Signed-off-by: Chris Martin Co-authored-by: Chris Martin --- .../armada/event/conversion/conversions.go | 2 +- .../event/conversion/conversions_test.go | 33 +- .../armada/queue/queue_repository_test.go | 29 +- internal/common/eventutil/eventutil.go | 2 +- internal/common/resource/resource.go | 19 + internal/common/resource/resource_test.go | 33 + internal/executor/domain/resources.go | 5 - internal/executor/reporter/event.go | 4 +- .../job_utilisation_reporter_test.go | 4 +- .../scheduler/constraints/constraints_test.go | 16 +- internal/scheduler/queue_scheduler_test.go | 4 +- pkg/api/event.pb.go | 428 ++++++------- pkg/api/event.proto | 6 +- pkg/api/submit.pb.go | 500 ++++++++-------- pkg/api/submit.proto | 10 +- pkg/armadaevents/events.pb.go | 564 +++++++++--------- pkg/armadaevents/events.proto | 4 +- pkg/client/domain/watch.go | 6 +- pkg/client/domain/watch_test.go | 9 +- pkg/client/queue/queue.go | 22 +- pkg/client/queue/queue_test.go | 26 + .../jobservice/fakearmada/event_server.go | 2 +- 22 files changed, 938 insertions(+), 790 deletions(-) diff --git a/internal/armada/event/conversion/conversions.go b/internal/armada/event/conversion/conversions.go index ecb8a749dfd..74691b298f5 100644 --- a/internal/armada/event/conversion/conversions.go +++ b/internal/armada/event/conversion/conversions.go @@ -89,7 +89,7 @@ func FromInternalSubmit(owner string, groups []string, queue string, jobSet stri JobSetId: jobSet, Queue: queue, Created: protoutil.ToTimestamp(time), - Job: *job, + Job: job, } queuedEvent := &api.JobQueuedEvent{ diff --git a/internal/armada/event/conversion/conversions_test.go b/internal/armada/event/conversion/conversions_test.go index 5902260ac4d..d08bcebc190 100644 --- a/internal/armada/event/conversion/conversions_test.go +++ b/internal/armada/event/conversion/conversions_test.go @@ -82,7 +82,7 @@ func TestConvertSubmitted(t *testing.T) { JobSetId: jobSetName, Queue: queue, Created: protoutil.ToTimestamp(baseTime), - Job: api.Job{ + Job: &api.Job{ Id: jobIdString, JobSetId: jobSetName, Queue: queue, @@ -99,7 +99,7 @@ func TestConvertSubmitted(t *testing.T) { }, }, }, - SchedulingResourceRequirements: v1.ResourceRequirements{ + SchedulingResourceRequirements: &v1.ResourceRequirements{ Requests: make(v1.ResourceList), Limits: make(v1.ResourceList), }, @@ -795,13 +795,13 @@ func TestConvertResourceUtilisation(t *testing.T) { }, }, }, - MaxResourcesForPeriod: map[string]resource.Quantity{ - "cpu": resource.MustParse("2.0"), - "mem": resource.MustParse("100Gi"), + MaxResourcesForPeriod: map[string]*resource.Quantity{ + "cpu": resourcePointer("2.0"), + "mem": resourcePointer("100Gi"), }, - TotalCumulativeUsage: map[string]resource.Quantity{ - "cpu": resource.MustParse("3.0"), - "mem": resource.MustParse("200Gi"), + TotalCumulativeUsage: map[string]*resource.Quantity{ + "cpu": resourcePointer("3.0"), + "mem": resourcePointer("200Gi"), }, }, }, @@ -817,17 +817,17 @@ func TestConvertResourceUtilisation(t *testing.T) { Created: protoutil.ToTimestamp(baseTime), ClusterId: executorId, KubernetesId: runIdString, - MaxResourcesForPeriod: map[string]resource.Quantity{ - "cpu": resource.MustParse("2.0"), - "mem": resource.MustParse("100Gi"), + MaxResourcesForPeriod: map[string]*resource.Quantity{ + "cpu": resourcePointer("2.0"), + "mem": resourcePointer("100Gi"), }, NodeName: nodeName, PodNumber: podNumber, PodName: podName, PodNamespace: namespace, - TotalCumulativeUsage: map[string]resource.Quantity{ - "cpu": resource.MustParse("3.0"), - "mem": resource.MustParse("200Gi"), + TotalCumulativeUsage: map[string]*resource.Quantity{ + "cpu": resourcePointer("3.0"), + "mem": resourcePointer("200Gi"), }, }, }, @@ -982,3 +982,8 @@ func toEventSeq(event ...*armadaevents.EventSequence_Event) *armadaevents.EventS UserId: userId, } } + +func resourcePointer(s string) *resource.Quantity { + r := resource.MustParse(s) + return &r +} diff --git a/internal/armada/queue/queue_repository_test.go b/internal/armada/queue/queue_repository_test.go index 0ab964a2abe..abf7415c00b 100644 --- a/internal/armada/queue/queue_repository_test.go +++ b/internal/armada/queue/queue_repository_test.go @@ -10,19 +10,22 @@ import ( "github.com/armadaproject/armada/internal/common/armadacontext" "github.com/armadaproject/armada/internal/common/database/lookout" + "github.com/armadaproject/armada/pkg/api" "github.com/armadaproject/armada/pkg/client/queue" ) var ( queueA = queue.Queue{ - Name: "queueA", - PriorityFactor: 1000, - Permissions: []queue.Permissions{}, + Name: "queueA", + PriorityFactor: 1000, + Permissions: []queue.Permissions{}, + ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{}, } queueB = queue.Queue{ - Name: "queueB", - PriorityFactor: 2000, - Permissions: []queue.Permissions{}, + Name: "queueB", + PriorityFactor: 2000, + Permissions: []queue.Permissions{}, + ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{}, } twoQueues = []queue.Queue{queueA, queueB} ) @@ -111,17 +114,19 @@ func TestGetAndUpdateQueue(t *testing.T) { "Queue Doesn't Exist": { intialQueues: twoQueues, queueToUpdate: queue.Queue{ - Name: "queueC", - PriorityFactor: 1, - Permissions: []queue.Permissions{}, + Name: "queueC", + Permissions: []queue.Permissions{}, + PriorityFactor: 1, + ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{}, }, }, "Queue Does Exist": { intialQueues: twoQueues, queueToUpdate: queue.Queue{ - Name: "queueA", - PriorityFactor: queueA.PriorityFactor + 100, - Permissions: []queue.Permissions{}, + Name: "queueA", + PriorityFactor: queueA.PriorityFactor + 100, + Permissions: []queue.Permissions{}, + ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{}, }, }, } diff --git a/internal/common/eventutil/eventutil.go b/internal/common/eventutil/eventutil.go index 9a7a62bd496..9c808403a02 100644 --- a/internal/common/eventutil/eventutil.go +++ b/internal/common/eventutil/eventutil.go @@ -162,7 +162,7 @@ func ApiJobFromLogSubmitJob(ownerId string, groups []string, queueName string, j PodSpec: podSpec, PodSpecs: podSpecs, - SchedulingResourceRequirements: schedulingResourceRequirements, + SchedulingResourceRequirements: &schedulingResourceRequirements, Created: protoutil.ToTimestamp(time), Owner: ownerId, diff --git a/internal/common/resource/resource.go b/internal/common/resource/resource.go index 64760b59f1f..00265f544eb 100644 --- a/internal/common/resource/resource.go +++ b/internal/common/resource/resource.go @@ -22,6 +22,25 @@ func FromResourceList(list v1.ResourceList) ComputeResources { return resources } +func FromProtoMap(m map[string]*resource.Quantity) ComputeResources { + resources := make(ComputeResources, len(m)) + for k, v := range m { + if v != nil { + resources[k] = *v + } + } + return resources +} + +func (a ComputeResources) ToProtoMap() map[string]*resource.Quantity { + resources := make(map[string]*resource.Quantity, len(a)) + for k, v := range a { + r := v.DeepCopy() + resources[k] = &r + } + return resources +} + // QuantityAsFloat64 returns a float64 representation of a quantity. // We need our own function because q.AsApproximateFloat64 sometimes returns surprising results. // For example, resource.MustParse("5188205838208Ki").AsApproximateFloat64() returns 0.004291583283300088, diff --git a/internal/common/resource/resource_test.go b/internal/common/resource/resource_test.go index f010d47fcc8..80752ca18aa 100644 --- a/internal/common/resource/resource_test.go +++ b/internal/common/resource/resource_test.go @@ -165,6 +165,39 @@ func TestTotalResourceRequest_ShouldCombineMaxInitContainerResourcesWithSummedCo assert.Equal(t, result, FromResourceList(expectedResult)) } +func TestToProtoMap(t *testing.T) { + oneCpu := resource.MustParse("1") + oneGi := resource.MustParse("1Gi") + + input := ComputeResources{ + "cpu": resource.MustParse("1"), + "memory": resource.MustParse("1Gi"), + } + expected := map[string]*resource.Quantity{ + "cpu": &oneCpu, + "memory": &oneGi, + } + actual := input.ToProtoMap() + assert.Equal(t, actual, expected) +} + +func TestFromProtoMap(t *testing.T) { + oneCpu := resource.MustParse("1") + oneGi := resource.MustParse("1Gi") + + input := map[string]*resource.Quantity{ + "cpu": &oneCpu, + "memory": &oneGi, + } + expected := ComputeResources{ + "cpu": resource.MustParse("1"), + "memory": resource.MustParse("1Gi"), + } + + actual := FromProtoMap(input) + assert.Equal(t, actual, expected) +} + func makeDefaultNodeResource() v1.ResourceList { cpuResource := resource.NewQuantity(100, resource.DecimalSI) memoryResource := resource.NewQuantity(50*1024*1024*1024, resource.DecimalSI) diff --git a/internal/executor/domain/resources.go b/internal/executor/domain/resources.go index 149ab9394f2..4d00d3cd366 100644 --- a/internal/executor/domain/resources.go +++ b/internal/executor/domain/resources.go @@ -2,11 +2,6 @@ package domain import armadaresource "github.com/armadaproject/armada/internal/common/resource" -const ( - AcceleratorDutyCycle = "armadaproject.io/accelerator-duty-cycle" - AcceleratorMemory = "armadaproject.io/accelerator-memory" -) - type UtilisationData struct { CurrentUsage armadaresource.ComputeResources CumulativeUsage armadaresource.ComputeResources diff --git a/internal/executor/reporter/event.go b/internal/executor/reporter/event.go index f60c3450166..75c61dfad9e 100644 --- a/internal/executor/reporter/event.go +++ b/internal/executor/reporter/event.go @@ -420,8 +420,8 @@ func CreateJobUtilisationEvent(pod *v1.Pod, utilisationData *domain.UtilisationD }, }, }, - MaxResourcesForPeriod: utilisationData.CurrentUsage, - TotalCumulativeUsage: utilisationData.CumulativeUsage, + MaxResourcesForPeriod: utilisationData.CurrentUsage.ToProtoMap(), + TotalCumulativeUsage: utilisationData.CumulativeUsage.ToProtoMap(), }, }, }) diff --git a/internal/executor/utilisation/job_utilisation_reporter_test.go b/internal/executor/utilisation/job_utilisation_reporter_test.go index d41d4b31789..1fc9e2df304 100644 --- a/internal/executor/utilisation/job_utilisation_reporter_test.go +++ b/internal/executor/utilisation/job_utilisation_reporter_test.go @@ -60,8 +60,8 @@ func TestUtilisationEventReporter_ReportUtilisationEvents(t *testing.T) { _, ok = fakeEventReporter.ReceivedEvents[1].Event.Events[0].Event.(*armadaevents.EventSequence_Event_ResourceUtilisation) assert.True(t, ok) - assert.Equal(t, testPodResources.CurrentUsage, armadaresource.ComputeResources(event1.ResourceUtilisation.MaxResourcesForPeriod)) - assert.Equal(t, testPodResources.CumulativeUsage, armadaresource.ComputeResources(event1.ResourceUtilisation.TotalCumulativeUsage)) + assert.Equal(t, testPodResources.CurrentUsage, armadaresource.FromProtoMap(event1.ResourceUtilisation.MaxResourcesForPeriod)) + assert.Equal(t, testPodResources.CumulativeUsage, armadaresource.FromProtoMap(event1.ResourceUtilisation.TotalCumulativeUsage)) event1CreatedTime := fakeEventReporter.ReceivedEvents[0].Event.Events[0].Created event2CreatedTime := fakeEventReporter.ReceivedEvents[1].Event.Events[0].Created diff --git a/internal/scheduler/constraints/constraints_test.go b/internal/scheduler/constraints/constraints_test.go index d31d7f860db..4a93ae12b59 100644 --- a/internal/scheduler/constraints/constraints_test.go +++ b/internal/scheduler/constraints/constraints_test.go @@ -40,7 +40,7 @@ func TestConstraints(t *testing.T) { makeResourceList("1000", "1000Gi"), makeResourceList("0", "0"), makeSchedulingConfig(), - []*api.Queue{{Name: "queue-1", ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{}}}, + []*api.Queue{{Name: "queue-1", ResourceLimitsByPriorityClassName: map[string]*api.PriorityClassResourceLimits{}}}, )), "within-constraints": makeConstraintsTest(NewSchedulingConstraints( "pool-1", @@ -51,7 +51,7 @@ func TestConstraints(t *testing.T) { MaxQueueLookback: 1000, PriorityClasses: map[string]types.PriorityClass{"priority-class-1": {MaximumResourceFractionPerQueueByPool: map[string]map[string]float64{"pool-1": {"cpu": 0.9, "memory": 0.9}}}}, }, - []*api.Queue{{Name: "queue-1", ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{"priority-class-1": {MaximumResourceFraction: map[string]float64{"cpu": 0.9, "memory": 0.9}}}}}, + []*api.Queue{{Name: "queue-1", ResourceLimitsByPriorityClassName: map[string]*api.PriorityClassResourceLimits{"priority-class-1": {MaximumResourceFraction: map[string]float64{"cpu": 0.9, "memory": 0.9}}}}}, )), "exceeds-queue-priority-class-constraint": func() *constraintTest { t := makeConstraintsTest(NewSchedulingConstraints( @@ -62,7 +62,7 @@ func TestConstraints(t *testing.T) { []*api.Queue{ { Name: "queue-1", - ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{ + ResourceLimitsByPriorityClassName: map[string]*api.PriorityClassResourceLimits{ "priority-class-1": { MaximumResourceFraction: map[string]float64{"cpu": 0.000001, "memory": 0.9}, }, @@ -82,9 +82,9 @@ func TestConstraints(t *testing.T) { []*api.Queue{ { Name: "queue-1", - ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{ + ResourceLimitsByPriorityClassName: map[string]*api.PriorityClassResourceLimits{ "priority-class-1": { - MaximumResourceFractionByPool: map[string]api.PriorityClassPoolResourceLimits{ + MaximumResourceFractionByPool: map[string]*api.PriorityClassPoolResourceLimits{ "pool-1": { MaximumResourceFraction: map[string]float64{"cpu": 0.000001, "memory": 0.9}, }, @@ -121,7 +121,7 @@ func TestConstraints(t *testing.T) { MaxQueueLookback: 1000, PriorityClasses: map[string]types.PriorityClass{"priority-class-1": {MaximumResourceFractionPerQueueByPool: map[string]map[string]float64{"pool-1": {"cpu": 0.00000001, "memory": 0.9}}}}, }, - []*api.Queue{{Name: "queue-1", ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{"priority-class-1": {MaximumResourceFraction: map[string]float64{"cpu": 0.9, "memory": 0.9}}}}}, + []*api.Queue{{Name: "queue-1", ResourceLimitsByPriorityClassName: map[string]*api.PriorityClassResourceLimits{"priority-class-1": {MaximumResourceFraction: map[string]float64{"cpu": 0.9, "memory": 0.9}}}}}, )), "one-constraint-per-level-falls-back-as-expected--within-limits": makeMultiLevelConstraintsTest( map[string]resource.Quantity{"a": resource.MustParse("99"), "b": resource.MustParse("19"), "c": resource.MustParse("2.9"), "d": resource.MustParse("0.39")}, @@ -251,10 +251,10 @@ func makeMultiLevelConstraints() SchedulingConstraints { []*api.Queue{ { Name: "queue-1", - ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{ + ResourceLimitsByPriorityClassName: map[string]*api.PriorityClassResourceLimits{ "priority-class-1": { MaximumResourceFraction: map[string]float64{"a": 0.01, "b": 0.02}, - MaximumResourceFractionByPool: map[string]api.PriorityClassPoolResourceLimits{ + MaximumResourceFractionByPool: map[string]*api.PriorityClassPoolResourceLimits{ "pool-1": { MaximumResourceFraction: map[string]float64{"a": 0.1}, }, diff --git a/internal/scheduler/queue_scheduler_test.go b/internal/scheduler/queue_scheduler_test.go index 510b586f5de..7ac1bb43b64 100644 --- a/internal/scheduler/queue_scheduler_test.go +++ b/internal/scheduler/queue_scheduler_test.go @@ -188,9 +188,9 @@ func TestQueueScheduler(t *testing.T) { { Name: "A", PriorityFactor: 1.0, - ResourceLimitsByPriorityClassName: map[string]api.PriorityClassResourceLimits{ + ResourceLimitsByPriorityClassName: map[string]*api.PriorityClassResourceLimits{ testfixtures.PriorityClass0: { - MaximumResourceFractionByPool: map[string]api.PriorityClassPoolResourceLimits{ + MaximumResourceFractionByPool: map[string]*api.PriorityClassPoolResourceLimits{ "pool": { MaximumResourceFraction: map[string]float64{"cpu": 0.5, "memory": 1.0}, }, diff --git a/pkg/api/event.pb.go b/pkg/api/event.pb.go index 40318daf484..5453e4de256 100644 --- a/pkg/api/event.pb.go +++ b/pkg/api/event.pb.go @@ -74,7 +74,7 @@ type JobSubmittedEvent struct { JobSetId string `protobuf:"bytes,2,opt,name=job_set_id,json=jobSetId,proto3" json:"jobSetId,omitempty"` Queue string `protobuf:"bytes,3,opt,name=queue,proto3" json:"queue,omitempty"` Created *types.Timestamp `protobuf:"bytes,4,opt,name=created,proto3" json:"created,omitempty"` - Job Job `protobuf:"bytes,5,opt,name=job,proto3" json:"job"` + Job *Job `protobuf:"bytes,5,opt,name=job,proto3" json:"job,omitempty"` } func (m *JobSubmittedEvent) Reset() { *m = JobSubmittedEvent{} } @@ -137,11 +137,11 @@ func (m *JobSubmittedEvent) GetCreated() *types.Timestamp { return nil } -func (m *JobSubmittedEvent) GetJob() Job { +func (m *JobSubmittedEvent) GetJob() *Job { if m != nil { return m.Job } - return Job{} + return nil } type JobQueuedEvent struct { @@ -1366,18 +1366,18 @@ func (m *JobSucceededEvent) GetPodNamespace() string { } type JobUtilisationEvent struct { - JobId string `protobuf:"bytes,1,opt,name=job_id,json=jobId,proto3" json:"jobId,omitempty"` - JobSetId string `protobuf:"bytes,2,opt,name=job_set_id,json=jobSetId,proto3" json:"jobSetId,omitempty"` - Queue string `protobuf:"bytes,3,opt,name=queue,proto3" json:"queue,omitempty"` - Created *types.Timestamp `protobuf:"bytes,4,opt,name=created,proto3" json:"created,omitempty"` - ClusterId string `protobuf:"bytes,5,opt,name=cluster_id,json=clusterId,proto3" json:"clusterId,omitempty"` - KubernetesId string `protobuf:"bytes,6,opt,name=kubernetes_id,json=kubernetesId,proto3" json:"kubernetesId,omitempty"` - MaxResourcesForPeriod map[string]resource.Quantity `protobuf:"bytes,7,rep,name=MaxResourcesForPeriod,proto3" json:"MaxResourcesForPeriod" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - NodeName string `protobuf:"bytes,8,opt,name=node_name,json=nodeName,proto3" json:"nodeName,omitempty"` - PodNumber int32 `protobuf:"varint,9,opt,name=pod_number,json=podNumber,proto3" json:"podNumber,omitempty"` - PodName string `protobuf:"bytes,10,opt,name=pod_name,json=podName,proto3" json:"podName,omitempty"` - PodNamespace string `protobuf:"bytes,11,opt,name=pod_namespace,json=podNamespace,proto3" json:"podNamespace,omitempty"` - TotalCumulativeUsage map[string]resource.Quantity `protobuf:"bytes,12,rep,name=total_cumulative_usage,json=totalCumulativeUsage,proto3" json:"totalCumulativeUsage" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + JobId string `protobuf:"bytes,1,opt,name=job_id,json=jobId,proto3" json:"jobId,omitempty"` + JobSetId string `protobuf:"bytes,2,opt,name=job_set_id,json=jobSetId,proto3" json:"jobSetId,omitempty"` + Queue string `protobuf:"bytes,3,opt,name=queue,proto3" json:"queue,omitempty"` + Created *types.Timestamp `protobuf:"bytes,4,opt,name=created,proto3" json:"created,omitempty"` + ClusterId string `protobuf:"bytes,5,opt,name=cluster_id,json=clusterId,proto3" json:"clusterId,omitempty"` + KubernetesId string `protobuf:"bytes,6,opt,name=kubernetes_id,json=kubernetesId,proto3" json:"kubernetesId,omitempty"` + MaxResourcesForPeriod map[string]*resource.Quantity `protobuf:"bytes,7,rep,name=MaxResourcesForPeriod,proto3" json:"MaxResourcesForPeriod,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + NodeName string `protobuf:"bytes,8,opt,name=node_name,json=nodeName,proto3" json:"nodeName,omitempty"` + PodNumber int32 `protobuf:"varint,9,opt,name=pod_number,json=podNumber,proto3" json:"podNumber,omitempty"` + PodName string `protobuf:"bytes,10,opt,name=pod_name,json=podName,proto3" json:"podName,omitempty"` + PodNamespace string `protobuf:"bytes,11,opt,name=pod_namespace,json=podNamespace,proto3" json:"podNamespace,omitempty"` + TotalCumulativeUsage map[string]*resource.Quantity `protobuf:"bytes,12,rep,name=total_cumulative_usage,json=totalCumulativeUsage,proto3" json:"totalCumulativeUsage,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *JobUtilisationEvent) Reset() { *m = JobUtilisationEvent{} } @@ -1454,7 +1454,7 @@ func (m *JobUtilisationEvent) GetKubernetesId() string { return "" } -func (m *JobUtilisationEvent) GetMaxResourcesForPeriod() map[string]resource.Quantity { +func (m *JobUtilisationEvent) GetMaxResourcesForPeriod() map[string]*resource.Quantity { if m != nil { return m.MaxResourcesForPeriod } @@ -1489,7 +1489,7 @@ func (m *JobUtilisationEvent) GetPodNamespace() string { return "" } -func (m *JobUtilisationEvent) GetTotalCumulativeUsage() map[string]resource.Quantity { +func (m *JobUtilisationEvent) GetTotalCumulativeUsage() map[string]*resource.Quantity { if m != nil { return m.TotalCumulativeUsage } @@ -2528,8 +2528,8 @@ func init() { proto.RegisterType((*JobPreemptedEvent)(nil), "api.JobPreemptedEvent") proto.RegisterType((*JobSucceededEvent)(nil), "api.JobSucceededEvent") proto.RegisterType((*JobUtilisationEvent)(nil), "api.JobUtilisationEvent") - proto.RegisterMapType((map[string]resource.Quantity)(nil), "api.JobUtilisationEvent.MaxResourcesForPeriodEntry") - proto.RegisterMapType((map[string]resource.Quantity)(nil), "api.JobUtilisationEvent.TotalCumulativeUsageEntry") + proto.RegisterMapType((map[string]*resource.Quantity)(nil), "api.JobUtilisationEvent.MaxResourcesForPeriodEntry") + proto.RegisterMapType((map[string]*resource.Quantity)(nil), "api.JobUtilisationEvent.TotalCumulativeUsageEntry") proto.RegisterType((*JobReprioritizingEvent)(nil), "api.JobReprioritizingEvent") proto.RegisterType((*JobReprioritizedEvent)(nil), "api.JobReprioritizedEvent") proto.RegisterType((*JobCancellingEvent)(nil), "api.JobCancellingEvent") @@ -2545,153 +2545,154 @@ func init() { func init() { proto.RegisterFile("pkg/api/event.proto", fileDescriptor_7758595c3bb8cf56) } var fileDescriptor_7758595c3bb8cf56 = []byte{ - // 2333 bytes of a gzipped FileDescriptorProto + // 2337 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x52, 0xe2, 0xd7, 0x50, 0x9f, 0x63, 0x49, 0x5e, 0xd3, 0xb6, 0x28, 0x30, 0x40, 0xa3, - 0x18, 0x31, 0x99, 0xca, 0x49, 0x11, 0x18, 0x05, 0x0a, 0x53, 0x51, 0x12, 0xa9, 0x71, 0xed, 0x50, - 0x36, 0xd2, 0x16, 0x01, 0x98, 0xe5, 0xee, 0x88, 0x5a, 0x89, 0xdc, 0xd9, 0xec, 0xce, 0xda, 0x56, - 0x8c, 0x00, 0x45, 0x0b, 0x14, 0xb9, 0xf5, 0x0b, 0xe8, 0xb1, 0x5f, 0x40, 0x2f, 0x3d, 0xf6, 0x2f, - 0xe8, 0xa1, 0x28, 0x72, 0x0c, 0x92, 0x4b, 0x4e, 0x44, 0x6b, 0x07, 0x09, 0xc0, 0x53, 0xef, 0xbd, - 0x14, 0xf3, 0x66, 0x76, 0x39, 0xb3, 0xa6, 0x60, 0x59, 0x69, 0x52, 0x43, 0xe1, 0xc5, 0x96, 0x7e, - 0x6f, 0xde, 0x9b, 0xb7, 0x6f, 0x7e, 0x33, 0xef, 0xcd, 0x87, 0xd0, 0x19, 0xff, 0xa0, 0x53, 0xb7, - 0x7c, 0xb7, 0x4e, 0xee, 0x10, 0x8f, 0xd5, 0xfc, 0x80, 0x32, 0x8a, 0x27, 0x2d, 0xdf, 0x2d, 0x57, - 0x3a, 0x94, 0x76, 0xba, 0xa4, 0x0e, 0x50, 0x3b, 0xda, 0xad, 0x33, 0xb7, 0x47, 0x42, 0x66, 0xf5, - 0x7c, 0xd1, 0xaa, 0xbc, 0x18, 0xab, 0x86, 0x51, 0xbb, 0xe7, 0xb2, 0x34, 0xba, 0x47, 0xac, 0x2e, - 0xdb, 0x93, 0xe8, 0xf9, 0xb4, 0x31, 0xd2, 0xf3, 0xd9, 0xa1, 0x14, 0x5e, 0xee, 0xb8, 0x6c, 0x2f, - 0x6a, 0xd7, 0x6c, 0xda, 0xab, 0x77, 0x68, 0x87, 0x0e, 0x5b, 0xf1, 0xdf, 0xe0, 0x17, 0xf8, 0x49, - 0x36, 0xbf, 0x20, 0x6d, 0xf1, 0x4e, 0x2c, 0xcf, 0xa3, 0xcc, 0x62, 0x2e, 0xf5, 0x42, 0x29, 0x7d, - 0xf1, 0xe0, 0xe5, 0xb0, 0xe6, 0x52, 0x2e, 0xed, 0x59, 0xf6, 0x9e, 0xeb, 0x91, 0xe0, 0xb0, 0x1e, - 0xfb, 0x14, 0x90, 0x90, 0x46, 0x81, 0x4d, 0xea, 0x1d, 0xe2, 0x91, 0xc0, 0x62, 0xc4, 0x11, 0x5a, - 0xd5, 0xdf, 0x66, 0xd0, 0xc2, 0x36, 0x6d, 0xef, 0xc0, 0x97, 0x30, 0xe2, 0x6c, 0xf2, 0x68, 0xe0, - 0x4b, 0x28, 0xb7, 0x4f, 0xdb, 0x2d, 0xd7, 0x31, 0x8d, 0x55, 0x63, 0xad, 0xd8, 0x38, 0x33, 0xe8, - 0x57, 0xe6, 0xf6, 0x69, 0x7b, 0xcb, 0x79, 0x9e, 0xf6, 0x5c, 0x06, 0xdf, 0xd0, 0xcc, 0x02, 0x80, - 0x5f, 0x44, 0x88, 0xb7, 0x0d, 0x09, 0xe3, 0xed, 0x33, 0xd0, 0x7e, 0x79, 0xd0, 0xaf, 0xe0, 0x7d, - 0xda, 0xde, 0x21, 0x4c, 0x53, 0x29, 0xc4, 0x18, 0x7e, 0x0e, 0x65, 0xdf, 0x8d, 0x48, 0x44, 0xcc, - 0xc9, 0x61, 0x07, 0x00, 0xa8, 0x1d, 0x00, 0x80, 0xbf, 0x8f, 0xf2, 0x76, 0x40, 0xb8, 0xcf, 0xe6, - 0xd4, 0xaa, 0xb1, 0x56, 0x5a, 0x2f, 0xd7, 0x44, 0x20, 0x6a, 0x71, 0xb8, 0x6a, 0xb7, 0xe2, 0x11, - 0x6a, 0x2c, 0x0d, 0xfa, 0x95, 0x05, 0xd9, 0x5c, 0x31, 0x15, 0x5b, 0xc0, 0xcf, 0xa2, 0xc9, 0x7d, - 0xda, 0x36, 0xb3, 0x60, 0xa8, 0x50, 0xb3, 0x7c, 0xb7, 0xb6, 0x4d, 0xdb, 0x8d, 0xd2, 0x87, 0xfd, - 0xca, 0xc4, 0xa0, 0x5f, 0xe1, 0xc2, 0x26, 0xff, 0xa7, 0x3a, 0x30, 0xd0, 0xec, 0x36, 0x6d, 0xbf, - 0xc9, 0x5d, 0x38, 0xed, 0x51, 0xa9, 0xfe, 0x29, 0x03, 0x1f, 0xfb, 0x06, 0xb1, 0xc2, 0xd3, 0x4f, - 0x81, 0xef, 0x20, 0x64, 0x77, 0xa3, 0x90, 0x91, 0x80, 0x7b, 0x9b, 0x85, 0xce, 0xcf, 0x0e, 0xfa, - 0x95, 0x33, 0x12, 0xd5, 0xdc, 0x2d, 0x26, 0x60, 0xf5, 0x57, 0x53, 0x68, 0x29, 0x0e, 0x52, 0x93, - 0xb0, 0x28, 0xf0, 0xc6, 0xb1, 0x3a, 0x22, 0x56, 0xf8, 0x79, 0x94, 0x0b, 0x88, 0x15, 0x52, 0xcf, - 0xcc, 0x81, 0xce, 0xe2, 0xa0, 0x5f, 0x99, 0x17, 0x88, 0xa2, 0x20, 0xdb, 0xe0, 0xef, 0xa1, 0x99, - 0x83, 0xa8, 0x4d, 0x02, 0x8f, 0x30, 0x12, 0xf2, 0x8e, 0xf2, 0xa0, 0x54, 0x1e, 0xf4, 0x2b, 0xcb, - 0x43, 0x81, 0xd6, 0xd7, 0xb4, 0x8a, 0x73, 0x37, 0x7d, 0xea, 0xb4, 0xbc, 0xa8, 0xd7, 0x26, 0x81, - 0x59, 0x58, 0x35, 0xd6, 0xb2, 0xc2, 0x4d, 0x9f, 0x3a, 0x3f, 0x00, 0x50, 0x75, 0x33, 0x01, 0x79, - 0xc7, 0x41, 0xe4, 0xb5, 0x2c, 0x06, 0x22, 0xe2, 0x98, 0xc5, 0x55, 0x63, 0xad, 0x20, 0x3a, 0x0e, - 0x22, 0xef, 0x5a, 0x8c, 0xab, 0x1d, 0xab, 0x78, 0xf5, 0xdf, 0x06, 0x5a, 0x8c, 0x39, 0xb1, 0x79, - 0xcf, 0x77, 0x83, 0xd3, 0xbf, 0x56, 0xfc, 0x62, 0x0a, 0xcd, 0x6d, 0xd3, 0xf6, 0x4d, 0xe2, 0x39, - 0xae, 0xd7, 0x19, 0x4f, 0x80, 0xd1, 0x13, 0xe0, 0x11, 0x4a, 0xe7, 0xbe, 0x14, 0xa5, 0xf3, 0xc7, - 0xa6, 0xf4, 0x0b, 0xa8, 0x00, 0x7a, 0x56, 0x8f, 0xc0, 0x44, 0x28, 0x8a, 0x4f, 0xe4, 0x0d, 0xac, - 0x9e, 0x1a, 0xad, 0xbc, 0x84, 0xb8, 0xab, 0xb1, 0x46, 0xe8, 0x5b, 0x36, 0x81, 0x49, 0x20, 0x5d, - 0x95, 0x6d, 0x00, 0x57, 0x5d, 0x55, 0xf1, 0xea, 0xdf, 0x05, 0x23, 0x9a, 0x91, 0xe7, 0x8d, 0x19, - 0xf1, 0xd5, 0x31, 0xe2, 0x0a, 0x2a, 0x7a, 0xd4, 0x21, 0x62, 0x68, 0xf3, 0xc3, 0x28, 0x71, 0x30, - 0x35, 0xb6, 0x85, 0x18, 0x3b, 0xf1, 0xca, 0xa8, 0xd2, 0xa8, 0x78, 0x32, 0x1a, 0xa1, 0x27, 0xa4, - 0xd1, 0x5f, 0x73, 0xe8, 0xcc, 0x36, 0x6d, 0x6f, 0x79, 0x9d, 0x80, 0x84, 0xe1, 0x96, 0xb7, 0x4b, - 0xc7, 0x54, 0x3a, 0x6d, 0x54, 0x42, 0x27, 0xa3, 0x52, 0xe9, 0xc9, 0xa8, 0x84, 0xef, 0xa3, 0x05, - 0x57, 0xd0, 0xa8, 0x65, 0x39, 0x0e, 0xff, 0x9f, 0x84, 0x66, 0x71, 0x75, 0x72, 0xad, 0xb4, 0x5e, - 0x8b, 0x6b, 0xfe, 0x34, 0xcf, 0x6a, 0x12, 0xb8, 0x16, 0x2b, 0x6c, 0x7a, 0x2c, 0x38, 0x6c, 0xac, - 0x0c, 0xfa, 0x95, 0xb2, 0x9b, 0x12, 0x29, 0x1d, 0xcf, 0xa7, 0x65, 0xe5, 0x03, 0xb4, 0x34, 0xd2, - 0x14, 0x7e, 0x06, 0x4d, 0x1e, 0x90, 0x43, 0x60, 0x71, 0xb6, 0xb1, 0x30, 0xe8, 0x57, 0x66, 0x0e, - 0xc8, 0xa1, 0x62, 0x8a, 0x4b, 0x39, 0x17, 0xef, 0x58, 0xdd, 0x88, 0x48, 0xf2, 0x02, 0x17, 0x01, - 0x50, 0xb9, 0x08, 0xc0, 0xd5, 0xcc, 0xcb, 0x46, 0xf5, 0x3f, 0x53, 0xc8, 0xdc, 0xa6, 0xed, 0xdb, - 0x9e, 0xd5, 0xee, 0x92, 0x5b, 0x74, 0xc7, 0xde, 0x23, 0x4e, 0xd4, 0x25, 0xe3, 0x99, 0xf3, 0x54, - 0xd4, 0xa5, 0xda, 0x3c, 0x2b, 0x9c, 0x68, 0x9e, 0x15, 0x9f, 0xe2, 0x79, 0x56, 0xfd, 0x38, 0x0f, - 0xfb, 0xc6, 0x57, 0x2d, 0xb7, 0x3b, 0xde, 0x0b, 0xfd, 0x6f, 0x38, 0xf7, 0x36, 0x42, 0xe4, 0x9e, - 0xcb, 0x5a, 0x36, 0x75, 0x48, 0x68, 0xe6, 0x61, 0xcd, 0xaa, 0xc6, 0x6b, 0x96, 0x12, 0xe8, 0xda, - 0xe6, 0x3d, 0x97, 0x6d, 0xf0, 0x46, 0x62, 0x9d, 0x3a, 0xc7, 0x3d, 0x21, 0x31, 0x36, 0x34, 0x6c, - 0x1a, 0xcd, 0x62, 0x02, 0x3f, 0xca, 0xe8, 0xc2, 0x97, 0x61, 0x74, 0xf1, 0x44, 0x8c, 0x46, 0x27, - 0x62, 0xf4, 0xcc, 0xc9, 0x18, 0x3d, 0xfb, 0x84, 0x99, 0xc3, 0x41, 0xd8, 0xa6, 0x1e, 0xb3, 0x5c, - 0x8f, 0x04, 0xad, 0x90, 0x59, 0x2c, 0xe2, 0xa9, 0xa3, 0x04, 0xc3, 0xb0, 0x08, 0xc3, 0xb0, 0x11, - 0x8b, 0x77, 0x40, 0xda, 0xa8, 0x0c, 0xfa, 0x95, 0xf3, 0xb6, 0x0e, 0x6a, 0x19, 0x62, 0xe1, 0x11, - 0x21, 0x7e, 0x09, 0x65, 0x6d, 0x2b, 0x0a, 0x89, 0x39, 0xbd, 0x6a, 0xac, 0xcd, 0xae, 0x23, 0x61, - 0x98, 0x23, 0x82, 0xce, 0x20, 0x54, 0xe9, 0x0c, 0x40, 0xd9, 0x41, 0xb3, 0xfa, 0xa8, 0xab, 0x29, - 0xa5, 0x78, 0xbc, 0x94, 0x92, 0x7d, 0x6c, 0x4a, 0xf9, 0x73, 0x06, 0x61, 0xbe, 0xc1, 0x0b, 0x08, - 0x17, 0x7d, 0x03, 0x2a, 0xfa, 0x97, 0x50, 0x31, 0x20, 0xef, 0x46, 0x24, 0x64, 0x34, 0x50, 0xe7, - 0x75, 0x02, 0xaa, 0xec, 0x4c, 0xc0, 0xea, 0x17, 0x93, 0x70, 0x74, 0x2a, 0xe3, 0x34, 0x5e, 0xff, - 0x8e, 0x5a, 0xff, 0x2e, 0xa1, 0x5c, 0x10, 0x79, 0xc3, 0x32, 0x15, 0x1c, 0x0e, 0x22, 0x4f, 0x8f, - 0x08, 0x00, 0x78, 0x0b, 0x2d, 0xf8, 0x92, 0x77, 0x77, 0x48, 0x4b, 0x06, 0x52, 0x64, 0xdd, 0x8b, - 0x83, 0x7e, 0xe5, 0xdc, 0x50, 0xb8, 0x9d, 0x0a, 0xe9, 0x5c, 0x4a, 0x94, 0x32, 0x25, 0x3d, 0x28, - 0x8c, 0x32, 0xd5, 0x4c, 0xf9, 0x32, 0x97, 0x12, 0x55, 0xff, 0x31, 0x25, 0x0f, 0xc9, 0x6d, 0x9b, - 0x10, 0x67, 0x3c, 0xd2, 0xe3, 0x2d, 0xee, 0x09, 0xb7, 0xb8, 0x7f, 0x2c, 0xc2, 0x16, 0xf7, 0x36, - 0x73, 0xbb, 0x6e, 0x08, 0xb7, 0x37, 0x63, 0x2a, 0x7d, 0x45, 0x54, 0xfa, 0xc0, 0x40, 0x4b, 0xd7, - 0xad, 0x7b, 0x4d, 0x79, 0xf1, 0x15, 0xbe, 0x4a, 0x83, 0x9b, 0x24, 0x70, 0xa9, 0x23, 0x6b, 0xaa, - 0x2b, 0x71, 0x4d, 0x95, 0x1e, 0x8c, 0xda, 0x48, 0x2d, 0x51, 0x64, 0x5d, 0x94, 0xd7, 0x44, 0xa3, - 0x2d, 0x37, 0x47, 0xc3, 0xa7, 0x7d, 0x17, 0x80, 0x7f, 0x6e, 0xa0, 0x65, 0x46, 0x99, 0xd5, 0x6d, - 0xd9, 0x51, 0x2f, 0xea, 0x5a, 0xb0, 0xe0, 0x46, 0xa1, 0xd5, 0xe1, 0xf5, 0x0d, 0x8f, 0xf5, 0xfa, - 0x91, 0xb1, 0xbe, 0xc5, 0xd5, 0x36, 0x12, 0xad, 0xdb, 0x5c, 0x49, 0x84, 0xfa, 0x82, 0x0c, 0xf5, - 0x22, 0x1b, 0xd1, 0xa4, 0x39, 0x12, 0x2d, 0xff, 0xc1, 0x40, 0xe5, 0xa3, 0x47, 0xef, 0x78, 0xc5, - 0xd2, 0x8f, 0xd4, 0x62, 0xa9, 0xb4, 0x5e, 0xab, 0x89, 0x6b, 0xd5, 0x9a, 0x7a, 0xad, 0x5a, 0xf3, - 0x0f, 0x3a, 0xf0, 0x49, 0xf1, 0xb5, 0x6a, 0xed, 0xcd, 0xc8, 0xf2, 0x98, 0xcb, 0x0e, 0x1f, 0x57, - 0x5c, 0x95, 0x7f, 0x6f, 0xa0, 0x73, 0x47, 0x7e, 0xf4, 0xd3, 0xe0, 0x61, 0xf5, 0x8b, 0x0c, 0x5a, - 0xde, 0xa6, 0xed, 0x26, 0xf1, 0x03, 0x97, 0x06, 0x2e, 0x73, 0xdf, 0xfb, 0x06, 0x94, 0x80, 0xdf, - 0x45, 0xd3, 0x1e, 0xb9, 0xdb, 0x92, 0x9f, 0x7c, 0x08, 0x0b, 0x95, 0x01, 0x7b, 0xaa, 0x25, 0x8f, - 0xdc, 0xbd, 0x29, 0x61, 0x45, 0xb3, 0xa4, 0xc0, 0x7a, 0x01, 0x99, 0x3b, 0x76, 0x01, 0xf9, 0x79, - 0x06, 0x2e, 0x14, 0x95, 0x48, 0x9f, 0xfe, 0xd2, 0xe2, 0xff, 0x12, 0xe8, 0x4f, 0xc4, 0x8e, 0x66, - 0xc3, 0xf2, 0x6c, 0xd2, 0xed, 0x8e, 0x77, 0x34, 0x47, 0xc4, 0xe9, 0xc9, 0x4e, 0x2a, 0xaa, 0x1f, - 0x8b, 0xa7, 0x23, 0x32, 0xaa, 0xa7, 0x9f, 0xba, 0x5f, 0x4b, 0x50, 0xff, 0x36, 0x05, 0x54, 0xbd, - 0x45, 0x82, 0x9e, 0xeb, 0x59, 0xe3, 0x5d, 0xe5, 0xd3, 0x7d, 0xc1, 0xfa, 0xf5, 0x6c, 0x1b, 0x14, - 0x0a, 0x15, 0x8e, 0x41, 0xa1, 0xcf, 0xa6, 0xd1, 0x34, 0xb0, 0xe6, 0x3a, 0x09, 0x79, 0x69, 0x81, - 0x6f, 0xa0, 0x62, 0x18, 0xbf, 0xef, 0x02, 0xfe, 0x94, 0xd6, 0x97, 0xe3, 0x8a, 0x4c, 0x7f, 0xf8, - 0x25, 0x02, 0x90, 0x34, 0x1e, 0x1a, 0x7f, 0x7d, 0xa2, 0x39, 0xb4, 0x81, 0x37, 0x50, 0x0e, 0x98, - 0xe0, 0xc8, 0x12, 0xe4, 0x4c, 0x6c, 0x4d, 0x79, 0x2d, 0x25, 0x9c, 0x14, 0xcd, 0x34, 0x3b, 0x52, - 0x95, 0x1b, 0xe9, 0xc2, 0x7b, 0x23, 0x60, 0x9c, 0x62, 0x44, 0x79, 0x85, 0x24, 0x8c, 0x88, 0x66, - 0xba, 0x11, 0x81, 0xe1, 0x77, 0xd0, 0x2c, 0xfc, 0xd4, 0x0a, 0xe4, 0x83, 0x9c, 0x84, 0x91, 0xaa, - 0x31, 0xed, 0xb5, 0x4e, 0xe3, 0xfc, 0xa0, 0x5f, 0x39, 0xdb, 0x55, 0x71, 0xcd, 0xf4, 0x8c, 0x26, - 0xc2, 0x6f, 0x23, 0x01, 0xb4, 0x88, 0x78, 0xde, 0x21, 0x9f, 0x8e, 0x9d, 0xd3, 0x3a, 0x50, 0x9f, - 0x7e, 0x88, 0x71, 0xed, 0x2a, 0xb0, 0x66, 0x7e, 0x5a, 0x95, 0xe0, 0xd7, 0x50, 0xde, 0x17, 0x0f, - 0x29, 0x80, 0xbf, 0xf1, 0x19, 0x63, 0xea, 0x7d, 0x85, 0x64, 0x98, 0x40, 0x34, 0x6b, 0xb1, 0x36, - 0x37, 0x14, 0x88, 0xfb, 0x77, 0xa0, 0xb2, 0x62, 0x48, 0xbd, 0x96, 0x17, 0x86, 0x64, 0x43, 0xdd, - 0x90, 0x04, 0x71, 0x0f, 0xe1, 0x08, 0x2e, 0x93, 0x5a, 0x8c, 0xb6, 0x42, 0x79, 0x9d, 0x04, 0xbc, - 0x2b, 0xad, 0x5f, 0x4c, 0xea, 0xf8, 0x51, 0xd7, 0x4d, 0xe2, 0xaa, 0x2c, 0x4a, 0x89, 0xb4, 0x5e, - 0xe6, 0xd3, 0x52, 0xce, 0x82, 0x5d, 0x38, 0xd4, 0x86, 0xb9, 0xa4, 0xb0, 0x40, 0x39, 0xea, 0x16, - 0x2c, 0x10, 0xcd, 0x74, 0x16, 0x08, 0x4c, 0x10, 0x5c, 0x9e, 0xcd, 0xc0, 0xe4, 0xd2, 0x08, 0xae, - 0x1e, 0xda, 0xc4, 0x04, 0x97, 0x58, 0x9a, 0xe0, 0x12, 0xc6, 0x2d, 0x34, 0x13, 0xa8, 0x55, 0x19, - 0x6c, 0x89, 0x14, 0x56, 0x3d, 0x5a, 0xb2, 0x09, 0x56, 0x69, 0x4a, 0x3a, 0xab, 0x34, 0x11, 0xde, - 0x41, 0xc8, 0x4e, 0xaa, 0x11, 0x38, 0x05, 0x2e, 0xad, 0x9f, 0x8d, 0xad, 0xa7, 0xea, 0x94, 0x86, - 0xc9, 0xb7, 0x41, 0xc3, 0xe6, 0x9a, 0x5d, 0xc5, 0x0c, 0x0f, 0x83, 0x1d, 0x27, 0x63, 0x38, 0x2f, - 0x57, 0xc2, 0xa0, 0x67, 0x69, 0xb9, 0xc2, 0xc6, 0x98, 0x1e, 0x86, 0x04, 0xe6, 0x5e, 0xb2, 0x24, - 0x11, 0xc1, 0x51, 0xba, 0xe2, 0x65, 0x2a, 0x45, 0x09, 0x2f, 0x87, 0xcd, 0x75, 0x2f, 0x87, 0x38, - 0x7e, 0x0b, 0x95, 0xa2, 0xe1, 0x36, 0xd0, 0x9c, 0x03, 0xab, 0xe6, 0x51, 0x3b, 0x44, 0x51, 0x1a, - 0x2a, 0x0a, 0x9a, 0x5d, 0xd5, 0x12, 0xfe, 0x21, 0x9a, 0x8e, 0x2f, 0x7d, 0x5d, 0x6f, 0x97, 0x9a, - 0x0b, 0xba, 0xe5, 0xf4, 0x7d, 0xaf, 0xb0, 0xec, 0x0e, 0x51, 0xdd, 0xb2, 0x22, 0xc0, 0x36, 0x9a, - 0x0d, 0xb4, 0xed, 0x90, 0x89, 0xc1, 0xf6, 0xf9, 0x11, 0x7c, 0x48, 0x46, 0xed, 0xc2, 0xa0, 0x5f, - 0x31, 0x75, 0x35, 0xad, 0x87, 0x94, 0x49, 0x3e, 0x7a, 0x7e, 0x7c, 0x94, 0x6c, 0x2e, 0xe9, 0xa3, - 0xa7, 0x9f, 0x31, 0xcb, 0x34, 0x15, 0x63, 0xfa, 0xe8, 0x25, 0x30, 0x1f, 0x3d, 0x3f, 0x39, 0xc3, - 0x37, 0x97, 0xf5, 0xd1, 0x4b, 0x9d, 0xee, 0x8b, 0xd1, 0x1b, 0x36, 0xd7, 0x47, 0x6f, 0x88, 0x37, - 0x0a, 0x28, 0x07, 0x0f, 0xa6, 0xc3, 0xea, 0xcf, 0x32, 0x68, 0x2e, 0x75, 0x17, 0x82, 0xbf, 0x85, - 0xa6, 0x20, 0x2f, 0x8a, 0x22, 0x05, 0x0f, 0xfa, 0x95, 0x59, 0x4f, 0x4f, 0x8a, 0x20, 0xc7, 0xeb, - 0xa8, 0x10, 0xdf, 0x49, 0xc9, 0x4b, 0x09, 0x28, 0x50, 0x62, 0x4c, 0x2d, 0x50, 0x62, 0x0c, 0xd7, - 0x51, 0xbe, 0x27, 0x12, 0x9a, 0x2c, 0x51, 0x60, 0x2d, 0x93, 0x90, 0x9a, 0x76, 0x25, 0xa4, 0x64, - 0xcd, 0xa9, 0x63, 0xdc, 0xbb, 0x25, 0x57, 0x32, 0xd9, 0x27, 0xb9, 0x92, 0xa9, 0xbe, 0x87, 0x30, - 0x04, 0x70, 0x87, 0x05, 0xc4, 0xea, 0xc5, 0x19, 0x77, 0x15, 0x65, 0x92, 0x52, 0x6d, 0x7e, 0xd0, - 0xaf, 0x4c, 0xbb, 0x6a, 0x1d, 0x92, 0x71, 0x1d, 0xdc, 0x18, 0x7e, 0x8d, 0xc8, 0xa1, 0x0b, 0xd0, - 0xa1, 0x9a, 0xb7, 0x1f, 0xf7, 0x81, 0xd5, 0x5f, 0x67, 0xd0, 0xcc, 0x36, 0xd4, 0x6f, 0x4d, 0x51, - 0x6d, 0x1e, 0xa3, 0xdf, 0xe7, 0x50, 0xf6, 0xae, 0xc5, 0xec, 0x3d, 0xe8, 0xb5, 0x20, 0x3e, 0x0d, - 0x00, 0xf5, 0xd3, 0x00, 0xc0, 0x1b, 0x68, 0x6e, 0x37, 0xa0, 0xbd, 0x96, 0xec, 0x8e, 0xd7, 0x58, - 0x22, 0xf0, 0xb0, 0xd4, 0x71, 0x91, 0x74, 0x54, 0x2b, 0xb2, 0x66, 0x34, 0xc1, 0xb0, 0xac, 0x9c, - 0x7a, 0x6c, 0x59, 0xf9, 0x0a, 0x9a, 0x25, 0x41, 0x40, 0x83, 0xad, 0xdd, 0xeb, 0x6e, 0x18, 0x72, - 0xce, 0x66, 0xc1, 0x47, 0x98, 0x48, 0xba, 0x44, 0x51, 0x4e, 0xe9, 0x54, 0x7f, 0x67, 0xa0, 0xe9, - 0xb7, 0xb8, 0xff, 0x71, 0x4c, 0x12, 0x0f, 0x8c, 0xc7, 0x7a, 0x70, 0xb2, 0xca, 0xf9, 0x32, 0xca, - 0x43, 0x9c, 0x92, 0xf8, 0x88, 0x74, 0x15, 0xd0, 0x9e, 0xa6, 0x90, 0x13, 0xc8, 0xa5, 0x37, 0x50, - 0x16, 0x68, 0x85, 0x8b, 0x28, 0xbb, 0xc9, 0x7d, 0x9f, 0x9f, 0xc0, 0x25, 0x94, 0xdf, 0xbc, 0xe3, - 0xda, 0x8c, 0x38, 0xf3, 0x06, 0xce, 0xa3, 0xc9, 0x1b, 0x37, 0xae, 0xcf, 0x67, 0xf0, 0x22, 0x9a, - 0x7f, 0x85, 0x58, 0x4e, 0xd7, 0xf5, 0xc8, 0xe6, 0x3d, 0x91, 0x99, 0xe6, 0x27, 0xf1, 0x34, 0x2a, - 0x34, 0xc9, 0x3e, 0x81, 0xc6, 0x53, 0xeb, 0x9f, 0x1b, 0x28, 0x2b, 0xb6, 0x08, 0x04, 0xcd, 0xbd, - 0x46, 0x98, 0xe0, 0x03, 0x20, 0x21, 0xc6, 0x49, 0x12, 0x4c, 0x28, 0x52, 0x3e, 0x3b, 0xe4, 0x99, - 0xc6, 0xd9, 0xea, 0x33, 0x3f, 0xfd, 0xe4, 0xb3, 0xdf, 0x64, 0x2e, 0x56, 0xcd, 0xfa, 0x9d, 0x6f, - 0xd7, 0xf7, 0x69, 0xfb, 0x72, 0x48, 0x58, 0xfd, 0x3e, 0x04, 0xe6, 0xfd, 0xfa, 0x7d, 0xd7, 0x79, - 0xff, 0xaa, 0x71, 0xe9, 0x05, 0x03, 0x5f, 0x45, 0x59, 0x08, 0x2f, 0x16, 0x84, 0x55, 0x43, 0x7d, - 0xb4, 0xed, 0xc9, 0x0f, 0x32, 0x06, 0xe8, 0xe6, 0x5e, 0x87, 0x3f, 0x8e, 0xc0, 0xcb, 0x8f, 0xec, - 0x18, 0x36, 0x79, 0x90, 0xca, 0x62, 0xb5, 0x16, 0x8d, 0x36, 0xf6, 0x88, 0x7d, 0xd0, 0x24, 0xa1, - 0x4f, 0xbd, 0x90, 0x34, 0xde, 0xf9, 0xf4, 0x5f, 0x2b, 0x13, 0x3f, 0x79, 0xb0, 0x62, 0x7c, 0xf8, - 0x60, 0xc5, 0xf8, 0xe8, 0xc1, 0x8a, 0xf1, 0xcf, 0x07, 0x2b, 0xc6, 0x2f, 0x1f, 0xae, 0x4c, 0x7c, - 0xf4, 0x70, 0x65, 0xe2, 0xd3, 0x87, 0x2b, 0x13, 0x3f, 0x7e, 0x56, 0xf9, 0x6b, 0x0a, 0x2b, 0xe8, - 0x59, 0x8e, 0xe5, 0x07, 0x94, 0x07, 0x4a, 0xfe, 0x16, 0xff, 0x31, 0xc4, 0x5f, 0x32, 0x8b, 0xd7, - 0x00, 0xb8, 0x29, 0xc4, 0xb5, 0x2d, 0x5a, 0xbb, 0xe6, 0xbb, 0xed, 0x1c, 0xf8, 0x72, 0xe5, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x6e, 0x85, 0x25, 0x1a, 0x32, 0x00, 0x00, + 0x15, 0xd7, 0x52, 0xe2, 0xd7, 0x50, 0x9f, 0x63, 0x49, 0x5e, 0xd3, 0x89, 0x28, 0xd0, 0x40, 0xab, + 0x18, 0x31, 0x99, 0xca, 0x49, 0x11, 0x18, 0x05, 0x0a, 0x4b, 0x51, 0x12, 0xa9, 0x71, 0xed, 0x50, + 0x36, 0xd2, 0x16, 0x01, 0x98, 0xfd, 0x18, 0x51, 0x2b, 0x91, 0x3b, 0x9b, 0xdd, 0x59, 0xdb, 0x8a, + 0x11, 0xa0, 0x68, 0x2f, 0x3d, 0x14, 0xfd, 0xbc, 0x16, 0x6d, 0x51, 0xa0, 0x97, 0x02, 0xbd, 0xf4, + 0x2f, 0xe8, 0xa1, 0x28, 0x7a, 0x0c, 0x92, 0x4b, 0x4e, 0x44, 0x6b, 0x07, 0x09, 0xc0, 0x53, 0xef, + 0xbd, 0x14, 0xf3, 0x66, 0x76, 0x39, 0xb3, 0x96, 0x60, 0x49, 0x69, 0x52, 0x43, 0xe1, 0xc9, 0xd6, + 0xef, 0xcd, 0x7b, 0xf3, 0xf6, 0xcd, 0x6f, 0xe6, 0xbd, 0xf9, 0x20, 0x3a, 0x17, 0xec, 0x77, 0x9a, + 0x56, 0xe0, 0x35, 0xc9, 0x5d, 0xe2, 0xb3, 0x46, 0x10, 0x52, 0x46, 0xf1, 0xb8, 0x15, 0x78, 0xd5, + 0x5a, 0x87, 0xd2, 0x4e, 0x97, 0x34, 0x01, 0xb2, 0xe3, 0x9d, 0x26, 0xf3, 0x7a, 0x24, 0x62, 0x56, + 0x2f, 0x10, 0xad, 0xaa, 0xf3, 0x89, 0x6a, 0x14, 0xdb, 0x3d, 0x8f, 0x65, 0xd1, 0x5d, 0x62, 0x75, + 0xd9, 0xae, 0x44, 0x2f, 0x66, 0x8d, 0x91, 0x5e, 0xc0, 0x0e, 0xa4, 0xf0, 0x4a, 0xc7, 0x63, 0xbb, + 0xb1, 0xdd, 0x70, 0x68, 0xaf, 0xd9, 0xa1, 0x1d, 0x3a, 0x6c, 0xc5, 0xff, 0x82, 0x3f, 0xe0, 0x7f, + 0xb2, 0xf9, 0x33, 0xd2, 0x16, 0xef, 0xc4, 0xf2, 0x7d, 0xca, 0x2c, 0xe6, 0x51, 0x3f, 0x92, 0xd2, + 0x17, 0xf7, 0x5f, 0x8e, 0x1a, 0x1e, 0xe5, 0xd2, 0x9e, 0xe5, 0xec, 0x7a, 0x3e, 0x09, 0x0f, 0x9a, + 0x89, 0x4f, 0x21, 0x89, 0x68, 0x1c, 0x3a, 0xa4, 0xd9, 0x21, 0x3e, 0x09, 0x2d, 0x46, 0x5c, 0xa1, + 0x55, 0xff, 0x4d, 0x0e, 0xcd, 0x6d, 0x51, 0x7b, 0x1b, 0xbe, 0x84, 0x11, 0x77, 0x83, 0x47, 0x03, + 0x5f, 0x46, 0x85, 0x3d, 0x6a, 0xb7, 0x3d, 0xd7, 0x34, 0x96, 0x8d, 0x95, 0xf2, 0xda, 0xb9, 0x41, + 0xbf, 0x36, 0xb3, 0x47, 0xed, 0x4d, 0xf7, 0x79, 0xda, 0xf3, 0x18, 0x7c, 0x43, 0x2b, 0x0f, 0x00, + 0x7e, 0x11, 0x21, 0xde, 0x36, 0x22, 0x8c, 0xb7, 0xcf, 0x41, 0xfb, 0xc5, 0x41, 0xbf, 0x86, 0xf7, + 0xa8, 0xbd, 0x4d, 0x98, 0xa6, 0x52, 0x4a, 0x30, 0xfc, 0x1c, 0xca, 0xbf, 0x1b, 0x93, 0x98, 0x98, + 0xe3, 0xc3, 0x0e, 0x00, 0x50, 0x3b, 0x00, 0x00, 0x7f, 0x07, 0x15, 0x9d, 0x90, 0x70, 0x9f, 0xcd, + 0x89, 0x65, 0x63, 0xa5, 0xb2, 0x5a, 0x6d, 0x88, 0x40, 0x34, 0x92, 0x70, 0x35, 0x6e, 0x27, 0x23, + 0xb4, 0xb6, 0x30, 0xe8, 0xd7, 0xe6, 0x64, 0x73, 0xc5, 0x54, 0x62, 0x01, 0x5f, 0x41, 0xe3, 0x7b, + 0xd4, 0x36, 0xf3, 0x60, 0xa8, 0xd4, 0xb0, 0x02, 0xaf, 0xb1, 0x45, 0xed, 0xb5, 0xb9, 0x41, 0xbf, + 0x36, 0xb5, 0x47, 0x6d, 0x45, 0x85, 0xb7, 0xab, 0x0f, 0x0c, 0x34, 0xbd, 0x45, 0xed, 0x37, 0xb9, + 0x23, 0x67, 0x3d, 0x36, 0xf5, 0x3f, 0xe4, 0xe0, 0x63, 0xdf, 0x20, 0x56, 0x74, 0xf6, 0x89, 0xf0, + 0x4d, 0x84, 0x9c, 0x6e, 0x1c, 0x31, 0x12, 0x72, 0x6f, 0xf3, 0xd0, 0xf9, 0xf9, 0x41, 0xbf, 0x76, + 0x4e, 0xa2, 0x9a, 0xbb, 0xe5, 0x14, 0xac, 0xff, 0x72, 0x02, 0x2d, 0x24, 0x41, 0x6a, 0x11, 0x16, + 0x87, 0xfe, 0x28, 0x56, 0x47, 0xc4, 0x0a, 0x3f, 0x8f, 0x0a, 0x21, 0xb1, 0x22, 0xea, 0x9b, 0x05, + 0xd0, 0x99, 0x1f, 0xf4, 0x6b, 0xb3, 0x02, 0x51, 0x14, 0x64, 0x1b, 0xfc, 0x6d, 0x34, 0xb5, 0x1f, + 0xdb, 0x24, 0xf4, 0x09, 0x23, 0x11, 0xef, 0xa8, 0x08, 0x4a, 0xd5, 0x41, 0xbf, 0xb6, 0x38, 0x14, + 0x68, 0x7d, 0x4d, 0xaa, 0x38, 0x77, 0x33, 0xa0, 0x6e, 0xdb, 0x8f, 0x7b, 0x36, 0x09, 0xcd, 0xd2, + 0xb2, 0xb1, 0x92, 0x17, 0x6e, 0x06, 0xd4, 0xfd, 0x2e, 0x80, 0xaa, 0x9b, 0x29, 0xc8, 0x3b, 0x0e, + 0x63, 0xbf, 0x6d, 0x31, 0x10, 0x11, 0xd7, 0x2c, 0x2f, 0x1b, 0x2b, 0x25, 0xd1, 0x71, 0x18, 0xfb, + 0xd7, 0x13, 0x5c, 0xed, 0x58, 0xc5, 0xeb, 0xff, 0x36, 0xd0, 0x7c, 0xc2, 0x89, 0x8d, 0xfb, 0x81, + 0x17, 0x9e, 0xfd, 0xb5, 0xe2, 0xe7, 0x13, 0x68, 0x66, 0x8b, 0xda, 0xb7, 0x88, 0xef, 0x7a, 0x7e, + 0x67, 0x34, 0x01, 0x0e, 0x9f, 0x00, 0x8f, 0x51, 0xba, 0xf0, 0xb9, 0x28, 0x5d, 0x3c, 0x36, 0xa5, + 0x5f, 0x40, 0x25, 0xd0, 0xb3, 0x7a, 0x04, 0x26, 0x42, 0x59, 0x7c, 0x22, 0x6f, 0x60, 0xf5, 0xd4, + 0x68, 0x15, 0x25, 0xc4, 0x5d, 0x4d, 0x34, 0xa2, 0xc0, 0x72, 0x08, 0x4c, 0x02, 0xe9, 0xaa, 0x6c, + 0x03, 0xb8, 0xea, 0xaa, 0x8a, 0xd7, 0xff, 0x26, 0x18, 0xd1, 0x8a, 0x7d, 0x7f, 0xc4, 0x88, 0x2f, + 0x8e, 0x11, 0x57, 0x51, 0xd9, 0xa7, 0x2e, 0x11, 0x43, 0x5b, 0x1c, 0x46, 0x89, 0x83, 0x99, 0xb1, + 0x2d, 0x25, 0xd8, 0xa9, 0x57, 0x46, 0x95, 0x46, 0xe5, 0xd3, 0xd1, 0x08, 0x9d, 0x90, 0x46, 0x7f, + 0x29, 0xa0, 0x73, 0x5b, 0xd4, 0xde, 0xf4, 0x3b, 0x21, 0x89, 0xa2, 0x4d, 0x7f, 0x87, 0x8e, 0xa8, + 0x74, 0xd6, 0xa8, 0x84, 0x4e, 0x47, 0xa5, 0xca, 0xc9, 0xa8, 0x84, 0x1f, 0xa0, 0x39, 0x4f, 0xd0, + 0xa8, 0x6d, 0xb9, 0x2e, 0xff, 0x97, 0x44, 0x66, 0x79, 0x79, 0x7c, 0xa5, 0xb2, 0xda, 0x48, 0x2a, + 0xff, 0x2c, 0xcf, 0x1a, 0x12, 0xb8, 0x9e, 0x28, 0x6c, 0xf8, 0x2c, 0x3c, 0x58, 0x5b, 0x1a, 0xf4, + 0x6b, 0x55, 0x2f, 0x23, 0x52, 0x3a, 0x9e, 0xcd, 0xca, 0xaa, 0xfb, 0x68, 0xe1, 0x50, 0x53, 0xf8, + 0x12, 0x1a, 0xdf, 0x27, 0x07, 0xc0, 0xe2, 0xbc, 0xd8, 0x77, 0xec, 0x93, 0x03, 0x75, 0xdf, 0xb1, + 0x4f, 0x0e, 0x38, 0x17, 0xef, 0x5a, 0xdd, 0x98, 0x48, 0xf2, 0x02, 0x17, 0x01, 0x50, 0xb9, 0x08, + 0xc0, 0xb5, 0xdc, 0xcb, 0x46, 0xfd, 0x3f, 0x13, 0xc8, 0xdc, 0xa2, 0xf6, 0x1d, 0xdf, 0xb2, 0xbb, + 0xe4, 0x36, 0xdd, 0x76, 0x76, 0x89, 0x1b, 0x77, 0xc9, 0x68, 0xe6, 0x3c, 0x15, 0x75, 0xa9, 0x36, + 0xcf, 0x4a, 0xa7, 0x9a, 0x67, 0xe5, 0xa7, 0x78, 0x9e, 0xd5, 0x3f, 0x2c, 0xc2, 0xbe, 0xf1, 0x55, + 0xcb, 0xeb, 0x8e, 0xf6, 0x42, 0xff, 0x1b, 0xce, 0xbd, 0x8d, 0x10, 0xb9, 0xef, 0xb1, 0xb6, 0x43, + 0x5d, 0x12, 0x99, 0x45, 0x58, 0xb3, 0xea, 0xc9, 0x9a, 0xa5, 0x04, 0xba, 0xb1, 0x71, 0xdf, 0x63, + 0xeb, 0xbc, 0x91, 0x58, 0xa7, 0x2e, 0x70, 0x4f, 0x48, 0x82, 0x0d, 0x0d, 0x9b, 0x46, 0xab, 0x9c, + 0xc2, 0x8f, 0x33, 0xba, 0xf4, 0x79, 0x18, 0x5d, 0x3e, 0x15, 0xa3, 0xd1, 0xa9, 0x18, 0x3d, 0x75, + 0x3a, 0x46, 0x4f, 0x9f, 0x30, 0x73, 0xb8, 0x08, 0x3b, 0xd4, 0x67, 0x96, 0xe7, 0x93, 0xb0, 0x1d, + 0x31, 0x8b, 0xc5, 0x3c, 0x75, 0x54, 0x60, 0x18, 0xe6, 0x61, 0x18, 0xd6, 0x13, 0xf1, 0x36, 0x48, + 0xd7, 0x6a, 0x83, 0x7e, 0xed, 0xa2, 0xa3, 0x83, 0x5a, 0x86, 0x98, 0x7b, 0x4c, 0x88, 0x5f, 0x42, + 0x79, 0xc7, 0x8a, 0x23, 0x62, 0x4e, 0x2e, 0x1b, 0x2b, 0xd3, 0xab, 0x48, 0x18, 0xe6, 0x88, 0xa0, + 0x33, 0x08, 0x55, 0x3a, 0x03, 0x50, 0x75, 0xd1, 0xb4, 0x3e, 0xea, 0x6a, 0x4a, 0x29, 0x1f, 0x2f, + 0xa5, 0xe4, 0x9f, 0x98, 0x52, 0xfe, 0x98, 0x43, 0x98, 0x6f, 0xf0, 0x42, 0xc2, 0x45, 0x5f, 0x81, + 0x8a, 0xfe, 0x25, 0x54, 0x0e, 0xc9, 0xbb, 0x31, 0x89, 0x18, 0x0d, 0xd5, 0x79, 0x9d, 0x82, 0x2a, + 0x3b, 0x53, 0xb0, 0xfe, 0xd9, 0x38, 0x1c, 0xa0, 0xca, 0x38, 0x8d, 0xd6, 0xbf, 0xa3, 0xd6, 0xbf, + 0xcb, 0xa8, 0x10, 0xc6, 0xfe, 0xb0, 0x4c, 0x05, 0x87, 0xc3, 0xd8, 0xd7, 0x23, 0x02, 0x00, 0xde, + 0x44, 0x73, 0x81, 0xe4, 0xdd, 0x5d, 0xd2, 0x96, 0x81, 0x14, 0x59, 0xf7, 0xd9, 0x41, 0xbf, 0x76, + 0x61, 0x28, 0xdc, 0xca, 0x84, 0x74, 0x26, 0x23, 0xca, 0x98, 0x92, 0x1e, 0x94, 0x0e, 0x33, 0xd5, + 0xca, 0xf8, 0x32, 0x93, 0x11, 0xd5, 0xff, 0x3e, 0x21, 0x8f, 0xca, 0x1d, 0x87, 0x10, 0x77, 0x34, + 0xd2, 0xa3, 0x2d, 0xee, 0x29, 0xb7, 0xb8, 0x7f, 0x2e, 0xc3, 0x16, 0xf7, 0x0e, 0xf3, 0xba, 0x5e, + 0x04, 0x77, 0x38, 0x23, 0x2a, 0x7d, 0x41, 0x54, 0xfa, 0x99, 0x81, 0x16, 0x6e, 0x58, 0xf7, 0x5b, + 0xf2, 0xfa, 0x2b, 0x7a, 0x95, 0x86, 0xb7, 0x48, 0xe8, 0x51, 0x57, 0xd6, 0x54, 0x57, 0x93, 0x9a, + 0x2a, 0x3b, 0x18, 0x8d, 0x43, 0xb5, 0x44, 0x91, 0x75, 0x69, 0xd0, 0xaf, 0xd5, 0x0e, 0x95, 0x2b, + 0x7e, 0x1c, 0xde, 0xed, 0x59, 0xdf, 0x0b, 0xe0, 0x9f, 0x1a, 0x68, 0x91, 0x51, 0x66, 0x75, 0xdb, + 0x4e, 0xdc, 0x8b, 0xbb, 0x16, 0x2c, 0xbb, 0x71, 0x64, 0x75, 0x78, 0x95, 0xc3, 0x23, 0xbe, 0x7a, + 0x64, 0xc4, 0x6f, 0x73, 0xb5, 0xf5, 0x54, 0xeb, 0x0e, 0x57, 0x12, 0x01, 0xaf, 0x0f, 0xfa, 0xb5, + 0x25, 0x76, 0x88, 0x58, 0x71, 0x63, 0xfe, 0x30, 0x79, 0xf5, 0xf7, 0x06, 0xaa, 0x1e, 0x3d, 0x92, + 0xc7, 0x2b, 0x9c, 0xbe, 0xaf, 0x16, 0x4e, 0x95, 0xd5, 0x46, 0x43, 0x5c, 0xb4, 0x36, 0xd4, 0x8b, + 0xd6, 0x46, 0xb0, 0xdf, 0x81, 0x0f, 0x4b, 0x2e, 0x5a, 0x1b, 0x6f, 0xc6, 0x96, 0xcf, 0x3c, 0x76, + 0xf0, 0xa4, 0x42, 0xab, 0xfa, 0x3b, 0x03, 0x5d, 0x38, 0xf2, 0xd3, 0x9f, 0x06, 0x0f, 0xeb, 0x9f, + 0xe5, 0xd0, 0xe2, 0x16, 0xb5, 0x5b, 0x24, 0x08, 0x3d, 0x1a, 0x7a, 0xcc, 0x7b, 0xef, 0x2b, 0x50, + 0x0e, 0x7e, 0x0b, 0x4d, 0xfa, 0xe4, 0x5e, 0x5b, 0x7e, 0xf2, 0x01, 0x2c, 0x5a, 0x06, 0xec, 0xaf, + 0x16, 0x7c, 0x72, 0xef, 0x96, 0x84, 0x15, 0xcd, 0x8a, 0x02, 0xeb, 0xc5, 0x64, 0xe1, 0xd8, 0xc5, + 0xe4, 0xa7, 0x39, 0xb8, 0x5c, 0x54, 0x22, 0x7d, 0xf6, 0xcb, 0x8c, 0xff, 0x4b, 0xa0, 0x3f, 0x12, + 0xbb, 0x9b, 0x75, 0xcb, 0x77, 0x48, 0xb7, 0x3b, 0xda, 0xdd, 0x1c, 0x11, 0xa7, 0x93, 0x9d, 0x5a, + 0xd4, 0x3f, 0x14, 0x8f, 0x49, 0x64, 0x54, 0xcf, 0x3e, 0x75, 0xbf, 0x94, 0xa0, 0xfe, 0x75, 0x02, + 0xa8, 0x7a, 0x9b, 0x84, 0x3d, 0xcf, 0xb7, 0x46, 0x3b, 0xcc, 0xa7, 0xfb, 0xb2, 0xf5, 0xcb, 0xd9, + 0x42, 0x28, 0x14, 0x2a, 0x1d, 0x83, 0x42, 0x9f, 0x4c, 0xa2, 0x49, 0x60, 0xcd, 0x0d, 0x12, 0xf1, + 0xd2, 0x02, 0xdf, 0x44, 0xe5, 0x28, 0x79, 0xf1, 0x05, 0xfc, 0xa9, 0xac, 0x2e, 0x26, 0x75, 0x99, + 0xfe, 0x14, 0x4c, 0x04, 0x20, 0x6d, 0x3c, 0x34, 0xfe, 0xfa, 0x58, 0x6b, 0x68, 0x03, 0xaf, 0xa3, + 0x02, 0x30, 0xc1, 0x95, 0x25, 0xc8, 0xb9, 0xc4, 0x9a, 0xf2, 0x72, 0x4a, 0x38, 0x29, 0x9a, 0x69, + 0x76, 0xa4, 0x2a, 0x37, 0xd2, 0x85, 0xb7, 0x47, 0xc0, 0x38, 0xc5, 0x88, 0xf2, 0x22, 0x49, 0x18, + 0x11, 0xcd, 0x74, 0x23, 0x02, 0xc3, 0xef, 0xa0, 0x69, 0xf8, 0x5f, 0x3b, 0x94, 0x8f, 0x73, 0x52, + 0x46, 0xaa, 0xc6, 0xb4, 0x97, 0x3b, 0x6b, 0x17, 0x07, 0xfd, 0xda, 0xf9, 0xae, 0x8a, 0x6b, 0xa6, + 0xa7, 0x34, 0x11, 0x7e, 0x1b, 0x09, 0xa0, 0x4d, 0xc4, 0x53, 0x0f, 0xf9, 0x98, 0xec, 0x82, 0xd6, + 0x81, 0xfa, 0x0c, 0x44, 0x8c, 0x6b, 0x57, 0x81, 0x35, 0xf3, 0x93, 0xaa, 0x04, 0xbf, 0x86, 0x8a, + 0x81, 0x78, 0x54, 0x01, 0xfc, 0x4d, 0xce, 0x1b, 0x33, 0x6f, 0x2d, 0x24, 0xc3, 0x04, 0xa2, 0x59, + 0x4b, 0xb4, 0xb9, 0xa1, 0x50, 0xdc, 0xc5, 0x03, 0x95, 0x15, 0x43, 0xea, 0x15, 0xbd, 0x30, 0x24, + 0x1b, 0xea, 0x86, 0x24, 0x88, 0x7b, 0x08, 0xc7, 0x70, 0xb1, 0xd4, 0x66, 0xb4, 0x1d, 0xc9, 0xab, + 0x25, 0xe0, 0x5d, 0x65, 0xf5, 0xd9, 0xb4, 0x9a, 0x3f, 0xec, 0xea, 0x49, 0x5c, 0x9b, 0xc5, 0x19, + 0x91, 0xd6, 0xcb, 0x6c, 0x56, 0xca, 0x59, 0xb0, 0x03, 0x07, 0xdc, 0x30, 0x97, 0x14, 0x16, 0x28, + 0xc7, 0xde, 0x82, 0x05, 0xa2, 0x99, 0xce, 0x02, 0x81, 0x09, 0x82, 0xcb, 0x73, 0x1a, 0x98, 0x5c, + 0x1a, 0xc1, 0xd5, 0x03, 0x9c, 0x84, 0xe0, 0x12, 0xcb, 0x12, 0x5c, 0xc2, 0xb8, 0x8d, 0xa6, 0x42, + 0xb5, 0x2a, 0x83, 0x8d, 0x91, 0xc2, 0xaa, 0xc7, 0x4b, 0x36, 0xc1, 0x2a, 0x4d, 0x49, 0x67, 0x95, + 0x26, 0xc2, 0xdb, 0x08, 0x39, 0x69, 0x35, 0x02, 0x27, 0xc2, 0x95, 0xd5, 0xf3, 0x89, 0xf5, 0x4c, + 0x9d, 0xb2, 0x66, 0x0e, 0xfa, 0xb5, 0xf9, 0x61, 0x73, 0xcd, 0xae, 0x62, 0x86, 0x87, 0xc1, 0x49, + 0x92, 0x31, 0x9c, 0x9d, 0x2b, 0x61, 0xd0, 0xb3, 0xb4, 0x5c, 0x61, 0x13, 0x4c, 0x0f, 0x43, 0x0a, + 0x73, 0x2f, 0x59, 0x9a, 0x88, 0xe0, 0x58, 0x5d, 0xf1, 0x32, 0x93, 0xa2, 0x84, 0x97, 0xc3, 0xe6, + 0xba, 0x97, 0x43, 0x1c, 0xbf, 0x85, 0x2a, 0xf1, 0x70, 0x33, 0x68, 0xce, 0x80, 0x55, 0xf3, 0xa8, + 0x7d, 0xa2, 0x28, 0x0d, 0x15, 0x05, 0xcd, 0xae, 0x6a, 0x09, 0x7f, 0x0f, 0x4d, 0x26, 0x17, 0xc0, + 0x9e, 0xbf, 0x43, 0xcd, 0x39, 0xdd, 0x72, 0xf6, 0xee, 0x57, 0x58, 0xf6, 0x86, 0xa8, 0x6e, 0x59, + 0x11, 0x60, 0x07, 0x4d, 0x87, 0xda, 0x76, 0xc8, 0xc4, 0x60, 0xfb, 0xe2, 0x21, 0x7c, 0x48, 0x47, + 0xed, 0x99, 0x41, 0xbf, 0x66, 0xea, 0x6a, 0x5a, 0x0f, 0x19, 0x93, 0x7c, 0xf4, 0x82, 0xe4, 0x58, + 0xd9, 0x5c, 0xd0, 0x47, 0x4f, 0x3f, 0x6f, 0x96, 0x69, 0x2a, 0xc1, 0xf4, 0xd1, 0x4b, 0x61, 0x3e, + 0x7a, 0x41, 0x7a, 0x9e, 0x6f, 0x2e, 0xea, 0xa3, 0x97, 0x39, 0xe9, 0x17, 0xa3, 0x37, 0x6c, 0xae, + 0x8f, 0xde, 0x10, 0x5f, 0x2b, 0xa1, 0x02, 0x3c, 0xa1, 0x8e, 0xea, 0x3f, 0xce, 0xa1, 0x99, 0xcc, + 0xbd, 0x08, 0xfe, 0x1a, 0x9a, 0x80, 0xbc, 0x28, 0x8a, 0x14, 0x3c, 0xe8, 0xd7, 0xa6, 0x7d, 0x3d, + 0x29, 0x82, 0x1c, 0xaf, 0xa2, 0x52, 0x72, 0x3f, 0x25, 0x2f, 0x28, 0xa0, 0x40, 0x49, 0x30, 0xb5, + 0x40, 0x49, 0x30, 0xdc, 0x44, 0xc5, 0x9e, 0x48, 0x68, 0xb2, 0x44, 0x81, 0xb5, 0x4c, 0x42, 0x6a, + 0xda, 0x95, 0x90, 0x92, 0x35, 0x27, 0x8e, 0x71, 0x07, 0x97, 0x5e, 0xcf, 0xe4, 0x4f, 0x72, 0x3d, + 0x53, 0x7f, 0x0f, 0x61, 0x08, 0xe0, 0x36, 0x0b, 0x89, 0xd5, 0x4b, 0x32, 0xee, 0x32, 0xca, 0xa5, + 0xa5, 0xda, 0xec, 0xa0, 0x5f, 0x9b, 0xf4, 0xd4, 0x3a, 0x24, 0xe7, 0xb9, 0x78, 0x6d, 0xf8, 0x35, + 0x22, 0x87, 0xce, 0x41, 0x87, 0x6a, 0xde, 0x7e, 0xd2, 0x07, 0xd6, 0x7f, 0x95, 0x43, 0x53, 0x5b, + 0x50, 0xbf, 0xb5, 0x44, 0xb5, 0x79, 0x8c, 0x7e, 0x9f, 0x43, 0xf9, 0x7b, 0x16, 0x73, 0x76, 0xa1, + 0xd7, 0x92, 0xf8, 0x34, 0x00, 0xd4, 0x4f, 0x03, 0x00, 0xaf, 0xa3, 0x99, 0x9d, 0x90, 0xf6, 0xda, + 0xb2, 0x3b, 0x5e, 0x63, 0x89, 0xc0, 0xc3, 0x52, 0xc7, 0x45, 0xd2, 0x51, 0xad, 0xc8, 0x9a, 0xd2, + 0x04, 0xc3, 0xb2, 0x72, 0xe2, 0x89, 0x65, 0xe5, 0x2b, 0x68, 0x9a, 0x84, 0x21, 0x0d, 0x37, 0x77, + 0x6e, 0x78, 0x51, 0xc4, 0x39, 0x9b, 0x07, 0x1f, 0x61, 0x22, 0xe9, 0x12, 0x45, 0x39, 0xa3, 0x53, + 0xff, 0xad, 0x81, 0x26, 0xdf, 0xe2, 0xfe, 0x27, 0x31, 0x49, 0x3d, 0x30, 0x9e, 0xe8, 0xc1, 0xe9, + 0x2a, 0xe7, 0x2b, 0xa8, 0x08, 0x71, 0x4a, 0xe3, 0x23, 0xd2, 0x55, 0x48, 0x7b, 0x9a, 0x42, 0x41, + 0x20, 0x97, 0xdf, 0x40, 0x79, 0xa0, 0x15, 0x2e, 0xa3, 0xfc, 0x06, 0xf7, 0x7d, 0x76, 0x0c, 0x57, + 0x50, 0x71, 0xe3, 0xae, 0xe7, 0x30, 0xe2, 0xce, 0x1a, 0xb8, 0x88, 0xc6, 0x6f, 0xde, 0xbc, 0x31, + 0x9b, 0xc3, 0xf3, 0x68, 0xf6, 0x15, 0x62, 0xb9, 0x5d, 0xcf, 0x27, 0x1b, 0xf7, 0x45, 0x66, 0x9a, + 0x1d, 0xc7, 0x93, 0xa8, 0xd4, 0x22, 0x7b, 0x04, 0x1a, 0x4f, 0xac, 0x7e, 0x6a, 0xa0, 0xbc, 0xd8, + 0x22, 0x10, 0x34, 0xf3, 0x1a, 0x61, 0x82, 0x0f, 0x80, 0x44, 0x18, 0xa7, 0x49, 0x30, 0xa5, 0x48, + 0xf5, 0xfc, 0x90, 0x67, 0x1a, 0x67, 0xeb, 0x97, 0x7e, 0xf4, 0xd1, 0x27, 0xbf, 0xce, 0x3d, 0x5b, + 0x37, 0x9b, 0x77, 0xbf, 0xd1, 0xdc, 0xa3, 0xf6, 0x95, 0x88, 0xb0, 0xe6, 0x03, 0x08, 0xcc, 0xfb, + 0xcd, 0x07, 0x9e, 0xfb, 0xfe, 0x35, 0xe3, 0xf2, 0x0b, 0x06, 0xbe, 0x86, 0xf2, 0x10, 0x5e, 0x2c, + 0x08, 0xab, 0x86, 0xfa, 0x68, 0xdb, 0xe3, 0x3f, 0xc9, 0x19, 0xa0, 0x5b, 0x78, 0x1d, 0x7e, 0x2e, + 0x81, 0x17, 0x1f, 0xdb, 0x31, 0x6c, 0xf0, 0x20, 0x55, 0xc5, 0x6a, 0x2d, 0x1a, 0xad, 0xef, 0x12, + 0x67, 0xbf, 0x45, 0xa2, 0x80, 0xfa, 0x11, 0x59, 0x7b, 0xe7, 0xe3, 0x7f, 0x2d, 0x8d, 0xfd, 0xf0, + 0xe1, 0x92, 0xf1, 0x8f, 0x87, 0x4b, 0xc6, 0x07, 0x0f, 0x97, 0x8c, 0x7f, 0x3e, 0x5c, 0x32, 0x7e, + 0xf1, 0x68, 0x69, 0xec, 0x83, 0x47, 0x4b, 0x63, 0x1f, 0x3f, 0x5a, 0x1a, 0xfb, 0xc1, 0xd7, 0x95, + 0xdf, 0x57, 0x58, 0x61, 0xcf, 0x72, 0xad, 0x20, 0xa4, 0x3c, 0x50, 0xf2, 0xaf, 0xe4, 0xe7, 0x11, + 0x7f, 0xca, 0xcd, 0x5f, 0x07, 0xe0, 0x96, 0x10, 0x37, 0x36, 0x69, 0xe3, 0x7a, 0xe0, 0xd9, 0x05, + 0xf0, 0xe5, 0xea, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x54, 0xd6, 0x74, 0x94, 0x2c, 0x32, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2922,16 +2923,18 @@ func (m *JobSubmittedEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - { - size, err := m.Job.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.Job != nil { + { + size, err := m.Job.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintEvent(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintEvent(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x2a } - i-- - dAtA[i] = 0x2a if m.Created != nil { { size, err := m.Created.MarshalToSizedBuffer(dAtA[:i]) @@ -4042,16 +4045,18 @@ func (m *JobUtilisationEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { for k := range m.TotalCumulativeUsage { v := m.TotalCumulativeUsage[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintEvent(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintEvent(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintEvent(dAtA, i, uint64(len(k))) @@ -4092,16 +4097,18 @@ func (m *JobUtilisationEvent) MarshalToSizedBuffer(dAtA []byte) (int, error) { for k := range m.MaxResourcesForPeriod { v := m.MaxResourcesForPeriod[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintEvent(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintEvent(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintEvent(dAtA, i, uint64(len(k))) @@ -5212,8 +5219,10 @@ func (m *JobSubmittedEvent) Size() (n int) { l = m.Created.Size() n += 1 + l + sovEvent(uint64(l)) } - l = m.Job.Size() - n += 1 + l + sovEvent(uint64(l)) + if m.Job != nil { + l = m.Job.Size() + n += 1 + l + sovEvent(uint64(l)) + } return n } @@ -5760,8 +5769,12 @@ func (m *JobUtilisationEvent) Size() (n int) { for k, v := range m.MaxResourcesForPeriod { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovEvent(uint64(len(k))) + 1 + l + sovEvent(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovEvent(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovEvent(uint64(len(k))) + l n += mapEntrySize + 1 + sovEvent(uint64(mapEntrySize)) } } @@ -5784,8 +5797,12 @@ func (m *JobUtilisationEvent) Size() (n int) { for k, v := range m.TotalCumulativeUsage { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovEvent(uint64(len(k))) + 1 + l + sovEvent(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovEvent(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovEvent(uint64(len(k))) + l n += mapEntrySize + 1 + sovEvent(uint64(mapEntrySize)) } } @@ -6317,7 +6334,7 @@ func (this *JobSubmittedEvent) String() string { `JobSetId:` + fmt.Sprintf("%v", this.JobSetId) + `,`, `Queue:` + fmt.Sprintf("%v", this.Queue) + `,`, `Created:` + strings.Replace(fmt.Sprintf("%v", this.Created), "Timestamp", "types.Timestamp", 1) + `,`, - `Job:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Job), "Job", "Job", 1), `&`, ``, 1) + `,`, + `Job:` + strings.Replace(fmt.Sprintf("%v", this.Job), "Job", "Job", 1) + `,`, `}`, }, "") return s @@ -6564,7 +6581,7 @@ func (this *JobUtilisationEvent) String() string { keysForMaxResourcesForPeriod = append(keysForMaxResourcesForPeriod, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForMaxResourcesForPeriod) - mapStringForMaxResourcesForPeriod := "map[string]resource.Quantity{" + mapStringForMaxResourcesForPeriod := "map[string]*resource.Quantity{" for _, k := range keysForMaxResourcesForPeriod { mapStringForMaxResourcesForPeriod += fmt.Sprintf("%v: %v,", k, this.MaxResourcesForPeriod[k]) } @@ -6574,7 +6591,7 @@ func (this *JobUtilisationEvent) String() string { keysForTotalCumulativeUsage = append(keysForTotalCumulativeUsage, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForTotalCumulativeUsage) - mapStringForTotalCumulativeUsage := "map[string]resource.Quantity{" + mapStringForTotalCumulativeUsage := "map[string]*resource.Quantity{" for _, k := range keysForTotalCumulativeUsage { mapStringForTotalCumulativeUsage += fmt.Sprintf("%v: %v,", k, this.TotalCumulativeUsage[k]) } @@ -7124,6 +7141,9 @@ func (m *JobSubmittedEvent) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.Job == nil { + m.Job = &Job{} + } if err := m.Job.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -11300,10 +11320,10 @@ func (m *JobUtilisationEvent) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MaxResourcesForPeriod == nil { - m.MaxResourcesForPeriod = make(map[string]resource.Quantity) + m.MaxResourcesForPeriod = make(map[string]*resource.Quantity) } var mapkey string - mapvalue := &resource.Quantity{} + var mapvalue *resource.Quantity for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -11397,7 +11417,7 @@ func (m *JobUtilisationEvent) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.MaxResourcesForPeriod[mapkey] = *mapvalue + m.MaxResourcesForPeriod[mapkey] = mapvalue iNdEx = postIndex case 8: if wireType != 2 { @@ -11544,10 +11564,10 @@ func (m *JobUtilisationEvent) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.TotalCumulativeUsage == nil { - m.TotalCumulativeUsage = make(map[string]resource.Quantity) + m.TotalCumulativeUsage = make(map[string]*resource.Quantity) } var mapkey string - mapvalue := &resource.Quantity{} + var mapvalue *resource.Quantity for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -11641,7 +11661,7 @@ func (m *JobUtilisationEvent) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.TotalCumulativeUsage[mapkey] = *mapvalue + m.TotalCumulativeUsage[mapkey] = mapvalue iNdEx = postIndex default: iNdEx = preIndex diff --git a/pkg/api/event.proto b/pkg/api/event.proto index 4637285c4f9..2ee4c17afb6 100644 --- a/pkg/api/event.proto +++ b/pkg/api/event.proto @@ -20,7 +20,7 @@ message JobSubmittedEvent { string job_set_id = 2; string queue = 3; google.protobuf.Timestamp created = 4; - Job job = 5 [(gogoproto.nullable) = false]; + Job job = 5; } message JobQueuedEvent { @@ -166,12 +166,12 @@ message JobUtilisationEvent { google.protobuf.Timestamp created = 4; string cluster_id = 5; string kubernetes_id = 6; - map MaxResourcesForPeriod = 7 [(gogoproto.nullable) = false]; + map MaxResourcesForPeriod = 7; string node_name = 8; int32 pod_number = 9; string pod_name = 10; string pod_namespace = 11; - map total_cumulative_usage = 12 [(gogoproto.nullable) = false]; + map total_cumulative_usage = 12; } message JobReprioritizingEvent { diff --git a/pkg/api/submit.pb.go b/pkg/api/submit.pb.go index 715474a80f8..401a1ac757d 100644 --- a/pkg/api/submit.pb.go +++ b/pkg/api/submit.pb.go @@ -735,8 +735,8 @@ type Job struct { // This is because containers run in parallel, whereas initContainers run serially. // This field is populated automatically at submission. // Submitting a job with this field already populated results in an error. - SchedulingResourceRequirements v1.ResourceRequirements `protobuf:"bytes,21,opt,name=scheduling_resource_requirements,json=schedulingResourceRequirements,proto3" json:"schedulingResourceRequirements"` - Created *types.Timestamp `protobuf:"bytes,6,opt,name=created,proto3" json:"created,omitempty"` + SchedulingResourceRequirements *v1.ResourceRequirements `protobuf:"bytes,21,opt,name=scheduling_resource_requirements,json=schedulingResourceRequirements,proto3" json:"schedulingResourceRequirements,omitempty"` + Created *types.Timestamp `protobuf:"bytes,6,opt,name=created,proto3" json:"created,omitempty"` // Services can be provided either as Armada-specific config objects or as proper k8s objects. // These options are exclusive, i.e., if either ingress or services is provided, // then neither of k8s_ingress or k8s_service can be provided, and vice versa. @@ -883,11 +883,11 @@ func (m *Job) GetPodSpecs() []*v1.PodSpec { return nil } -func (m *Job) GetSchedulingResourceRequirements() v1.ResourceRequirements { +func (m *Job) GetSchedulingResourceRequirements() *v1.ResourceRequirements { if m != nil { return m.SchedulingResourceRequirements } - return v1.ResourceRequirements{} + return nil } func (m *Job) GetCreated() *types.Timestamp { @@ -1156,8 +1156,8 @@ type Queue struct { ResourceLimits map[string]float64 `protobuf:"bytes,5,rep,name=resource_limits,json=resourceLimits,proto3" json:"resourceLimits,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` // Deprecated: Do not use. // Map from priority class name to resource limit overrides for this queue and priority class. // If provided for a priority class, global limits for that priority class do not apply to this queue. - ResourceLimitsByPriorityClassName map[string]PriorityClassResourceLimits `protobuf:"bytes,7,rep,name=resource_limits_by_priority_class_name,json=resourceLimitsByPriorityClassName,proto3" json:"resourceLimitsByPriorityClassName" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - Permissions []*Queue_Permissions `protobuf:"bytes,6,rep,name=permissions,proto3" json:"permissions,omitempty"` + ResourceLimitsByPriorityClassName map[string]*PriorityClassResourceLimits `protobuf:"bytes,7,rep,name=resource_limits_by_priority_class_name,json=resourceLimitsByPriorityClassName,proto3" json:"resourceLimitsByPriorityClassName,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Permissions []*Queue_Permissions `protobuf:"bytes,6,rep,name=permissions,proto3" json:"permissions,omitempty"` } func (m *Queue) Reset() { *m = Queue{} } @@ -1228,7 +1228,7 @@ func (m *Queue) GetResourceLimits() map[string]float64 { return nil } -func (m *Queue) GetResourceLimitsByPriorityClassName() map[string]PriorityClassResourceLimits { +func (m *Queue) GetResourceLimitsByPriorityClassName() map[string]*PriorityClassResourceLimits { if m != nil { return m.ResourceLimitsByPriorityClassName } @@ -1347,10 +1347,10 @@ func (m *Queue_Permissions_Subject) GetName() string { type PriorityClassResourceLimits struct { // Limits resources assigned to jobs of this priority class. // Specifically, jobs of this priority class are only scheduled if doing so does not exceed this limit. - MaximumResourceFraction map[string]float64 `protobuf:"bytes,1,rep,name=maximum_resource_fraction,json=maximumResourceFraction,proto3" json:"maximumResourceFraction" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` + MaximumResourceFraction map[string]float64 `protobuf:"bytes,1,rep,name=maximum_resource_fraction,json=maximumResourceFraction,proto3" json:"maximumResourceFraction,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` // Per-pool override of maximum_resource_fraction. // If missing for a particular pool, maximum_resource_fraction is used instead for that pool. - MaximumResourceFractionByPool map[string]PriorityClassPoolResourceLimits `protobuf:"bytes,2,rep,name=maximum_resource_fraction_by_pool,json=maximumResourceFractionByPool,proto3" json:"maximumResourceFractionByPool" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + MaximumResourceFractionByPool map[string]*PriorityClassPoolResourceLimits `protobuf:"bytes,2,rep,name=maximum_resource_fraction_by_pool,json=maximumResourceFractionByPool,proto3" json:"maximumResourceFractionByPool,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (m *PriorityClassResourceLimits) Reset() { *m = PriorityClassResourceLimits{} } @@ -1392,7 +1392,7 @@ func (m *PriorityClassResourceLimits) GetMaximumResourceFraction() map[string]fl return nil } -func (m *PriorityClassResourceLimits) GetMaximumResourceFractionByPool() map[string]PriorityClassPoolResourceLimits { +func (m *PriorityClassResourceLimits) GetMaximumResourceFractionByPool() map[string]*PriorityClassPoolResourceLimits { if m != nil { return m.MaximumResourceFractionByPool } @@ -1400,7 +1400,7 @@ func (m *PriorityClassResourceLimits) GetMaximumResourceFractionByPool() map[str } type PriorityClassPoolResourceLimits struct { - MaximumResourceFraction map[string]float64 `protobuf:"bytes,1,rep,name=maximum_resource_fraction,json=maximumResourceFraction,proto3" json:"maximumResourceFraction" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` + MaximumResourceFraction map[string]float64 `protobuf:"bytes,1,rep,name=maximum_resource_fraction,json=maximumResourceFraction,proto3" json:"maximumResourceFraction,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"fixed64,2,opt,name=value,proto3"` } func (m *PriorityClassPoolResourceLimits) Reset() { *m = PriorityClassPoolResourceLimits{} } @@ -2055,12 +2055,12 @@ func init() { proto.RegisterType((*JobSubmitResponseItem)(nil), "api.JobSubmitResponseItem") proto.RegisterType((*JobSubmitResponse)(nil), "api.JobSubmitResponse") proto.RegisterType((*Queue)(nil), "api.Queue") - proto.RegisterMapType((map[string]PriorityClassResourceLimits)(nil), "api.Queue.ResourceLimitsByPriorityClassNameEntry") + proto.RegisterMapType((map[string]*PriorityClassResourceLimits)(nil), "api.Queue.ResourceLimitsByPriorityClassNameEntry") proto.RegisterMapType((map[string]float64)(nil), "api.Queue.ResourceLimitsEntry") proto.RegisterType((*Queue_Permissions)(nil), "api.Queue.Permissions") proto.RegisterType((*Queue_Permissions_Subject)(nil), "api.Queue.Permissions.Subject") proto.RegisterType((*PriorityClassResourceLimits)(nil), "api.PriorityClassResourceLimits") - proto.RegisterMapType((map[string]PriorityClassPoolResourceLimits)(nil), "api.PriorityClassResourceLimits.MaximumResourceFractionByPoolEntry") + proto.RegisterMapType((map[string]*PriorityClassPoolResourceLimits)(nil), "api.PriorityClassResourceLimits.MaximumResourceFractionByPoolEntry") proto.RegisterMapType((map[string]float64)(nil), "api.PriorityClassResourceLimits.MaximumResourceFractionEntry") proto.RegisterType((*PriorityClassPoolResourceLimits)(nil), "api.PriorityClassPoolResourceLimits") proto.RegisterMapType((map[string]float64)(nil), "api.PriorityClassPoolResourceLimits.MaximumResourceFractionEntry") @@ -2081,193 +2081,194 @@ func init() { func init() { proto.RegisterFile("pkg/api/submit.proto", fileDescriptor_e998bacb27df16c1) } var fileDescriptor_e998bacb27df16c1 = []byte{ - // 2975 bytes of a gzipped FileDescriptorProto + // 2979 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xe7, 0x8a, 0xfa, 0xe2, 0xa3, 0x3e, 0xa8, 0xd1, 0x87, 0x57, 0xb4, 0x23, 0xca, 0x9b, 0xc4, - 0x95, 0x85, 0x84, 0x8a, 0x95, 0x06, 0xb5, 0xdd, 0x14, 0xae, 0x28, 0xd1, 0xb6, 0x64, 0x5b, 0x56, - 0x28, 0x2b, 0x69, 0x8a, 0xa2, 0xcc, 0x92, 0x3b, 0xa2, 0x56, 0x22, 0x77, 0x99, 0xdd, 0xa5, 0x5c, - 0xb5, 0x08, 0x50, 0x14, 0x45, 0x7b, 0xe8, 0x25, 0x40, 0x6f, 0x2d, 0x90, 0x1c, 0x7a, 0x4b, 0x0f, - 0xbd, 0x14, 0x45, 0xff, 0x84, 0x1c, 0x03, 0x14, 0x05, 0xd2, 0x0b, 0xd1, 0x38, 0xfd, 0x00, 0x78, - 0xeb, 0xbd, 0x87, 0x62, 0xde, 0xcc, 0x72, 0x67, 0xf9, 0x21, 0x8a, 0xb6, 0x95, 0x5c, 0x7a, 0xd3, - 0xfc, 0xe6, 0x7d, 0xef, 0x9b, 0x37, 0xef, 0x0d, 0x05, 0x33, 0xd5, 0xa3, 0xd2, 0x8a, 0x5e, 0x35, - 0x57, 0xdc, 0x5a, 0xa1, 0x62, 0x7a, 0xe9, 0xaa, 0x63, 0x7b, 0x36, 0x89, 0xea, 0x55, 0x33, 0x79, - 0xb1, 0x64, 0xdb, 0xa5, 0x32, 0x5d, 0x41, 0xa8, 0x50, 0xdb, 0x5f, 0xa1, 0x95, 0xaa, 0x77, 0xc2, - 0x29, 0x92, 0xa9, 0xd6, 0x4d, 0xcf, 0xac, 0x50, 0xd7, 0xd3, 0x2b, 0x55, 0x41, 0xa0, 0x1d, 0x5d, - 0x77, 0xd3, 0xa6, 0x8d, 0xb2, 0x8b, 0xb6, 0x43, 0x57, 0x8e, 0xaf, 0xad, 0x94, 0xa8, 0x45, 0x1d, - 0xdd, 0xa3, 0x86, 0xa0, 0x59, 0x92, 0x68, 0x2c, 0xea, 0x3d, 0xb6, 0x9d, 0x23, 0xd3, 0x2a, 0x75, - 0xa2, 0xbc, 0x24, 0xd4, 0x31, 0x4a, 0xdd, 0xb2, 0x6c, 0x4f, 0xf7, 0x4c, 0xdb, 0x72, 0xc5, 0xee, - 0xab, 0x25, 0xd3, 0x3b, 0xa8, 0x15, 0xd2, 0x45, 0xbb, 0xb2, 0x52, 0xb2, 0x4b, 0x76, 0x60, 0x15, - 0x5b, 0xe1, 0x02, 0xff, 0x12, 0xe4, 0x4d, 0x9f, 0x0f, 0xa8, 0x5e, 0xf6, 0x0e, 0x38, 0xaa, 0x7d, - 0x1c, 0x83, 0x99, 0x2d, 0xbb, 0xb0, 0x8b, 0x71, 0xc8, 0xd1, 0xf7, 0x6b, 0xd4, 0xf5, 0x36, 0x3d, - 0x5a, 0x21, 0xab, 0x30, 0x5a, 0x75, 0x4c, 0xdb, 0x31, 0xbd, 0x13, 0x55, 0x59, 0x54, 0x96, 0x94, - 0xcc, 0x5c, 0xa3, 0x9e, 0x22, 0x3e, 0xf6, 0x8a, 0x5d, 0x31, 0x3d, 0x0c, 0x4d, 0xae, 0x49, 0x47, - 0xde, 0x80, 0x98, 0xa5, 0x57, 0xa8, 0x5b, 0xd5, 0x8b, 0x54, 0x8d, 0x2e, 0x2a, 0x4b, 0xb1, 0xcc, - 0x85, 0x46, 0x3d, 0x35, 0xdd, 0x04, 0x25, 0xae, 0x80, 0x92, 0xbc, 0x0e, 0xb1, 0x62, 0xd9, 0xa4, - 0x96, 0x97, 0x37, 0x0d, 0x75, 0x14, 0xd9, 0x50, 0x17, 0x07, 0x37, 0x0d, 0x59, 0x97, 0x8f, 0x91, - 0x5d, 0x18, 0x2e, 0xeb, 0x05, 0x5a, 0x76, 0xd5, 0xc1, 0xc5, 0xe8, 0x52, 0x7c, 0xf5, 0xe5, 0xb4, - 0x5e, 0x35, 0xd3, 0x9d, 0x5c, 0x49, 0xdf, 0x47, 0xba, 0xac, 0xe5, 0x39, 0x27, 0x99, 0x99, 0x46, - 0x3d, 0x95, 0xe0, 0x8c, 0x92, 0x58, 0x21, 0x8a, 0x94, 0x20, 0x2e, 0xc5, 0x59, 0x1d, 0x42, 0xc9, - 0xcb, 0xdd, 0x25, 0xaf, 0x05, 0xc4, 0x5c, 0xfc, 0x7c, 0xa3, 0x9e, 0x9a, 0x95, 0x44, 0x48, 0x3a, - 0x64, 0xc9, 0xe4, 0x97, 0x0a, 0xcc, 0x38, 0xf4, 0xfd, 0x9a, 0xe9, 0x50, 0x23, 0x6f, 0xd9, 0x06, - 0xcd, 0x0b, 0x67, 0x86, 0x51, 0xe5, 0xb5, 0xee, 0x2a, 0x73, 0x82, 0x6b, 0xdb, 0x36, 0xa8, 0xec, - 0x98, 0xd6, 0xa8, 0xa7, 0x2e, 0x39, 0x6d, 0x9b, 0x81, 0x01, 0xaa, 0x92, 0x23, 0xed, 0xfb, 0xe4, - 0x21, 0x8c, 0x56, 0x6d, 0x23, 0xef, 0x56, 0x69, 0x51, 0x1d, 0x58, 0x54, 0x96, 0xe2, 0xab, 0x17, - 0xd3, 0x3c, 0x41, 0xd1, 0x06, 0x96, 0xc4, 0xe9, 0xe3, 0x6b, 0xe9, 0x1d, 0xdb, 0xd8, 0xad, 0xd2, - 0x22, 0x7e, 0xcf, 0xa9, 0x2a, 0x5f, 0x84, 0x64, 0x8f, 0x08, 0x90, 0xec, 0x40, 0xcc, 0x17, 0xe8, - 0xaa, 0x23, 0xe8, 0xce, 0xa9, 0x12, 0x79, 0x5a, 0xf1, 0x85, 0x1b, 0x4a, 0x2b, 0x81, 0x91, 0x75, - 0x18, 0x31, 0xad, 0x92, 0x43, 0x5d, 0x57, 0x8d, 0xa1, 0x3c, 0x82, 0x82, 0x36, 0x39, 0xb6, 0x6e, - 0x5b, 0xfb, 0x66, 0x29, 0x33, 0xcb, 0x0c, 0x13, 0x64, 0x92, 0x14, 0x9f, 0x93, 0xdc, 0x86, 0x51, - 0x97, 0x3a, 0xc7, 0x66, 0x91, 0xba, 0x2a, 0x48, 0x52, 0x76, 0x39, 0x28, 0xa4, 0xa0, 0x31, 0x3e, - 0x9d, 0x6c, 0x8c, 0x8f, 0xb1, 0x1c, 0x77, 0x8b, 0x07, 0xd4, 0xa8, 0x95, 0xa9, 0xa3, 0xc6, 0x83, - 0x1c, 0x6f, 0x82, 0x72, 0x8e, 0x37, 0xc1, 0xa4, 0x0e, 0x71, 0xe9, 0x6b, 0x91, 0x17, 0x21, 0x7a, - 0x44, 0xf9, 0xc1, 0x8a, 0x65, 0xa6, 0x1a, 0xf5, 0xd4, 0xf8, 0x11, 0x95, 0xcf, 0x14, 0xdb, 0x25, - 0x57, 0x61, 0xe8, 0x58, 0x2f, 0xd7, 0x28, 0x7e, 0x97, 0x58, 0x66, 0xba, 0x51, 0x4f, 0x4d, 0x22, - 0x20, 0x11, 0x72, 0x8a, 0x9b, 0x03, 0xd7, 0x95, 0xe4, 0x3e, 0x24, 0x5a, 0xf3, 0xf1, 0x5c, 0xf4, - 0x54, 0xe0, 0x42, 0x97, 0x24, 0x3c, 0x0f, 0x75, 0xda, 0x7f, 0xa2, 0x30, 0x1e, 0xfa, 0xd4, 0xe4, - 0x26, 0x0c, 0x7a, 0x27, 0x55, 0x8a, 0x6a, 0x26, 0x56, 0x13, 0x72, 0x32, 0x3c, 0x3a, 0xa9, 0x52, - 0x3c, 0xe3, 0x13, 0x8c, 0x22, 0x94, 0xa0, 0xc8, 0xc3, 0x94, 0x57, 0x6d, 0xc7, 0x73, 0xd5, 0x81, - 0xc5, 0xe8, 0xd2, 0x38, 0x57, 0x8e, 0x80, 0xac, 0x1c, 0x01, 0xf2, 0x5e, 0xb8, 0x18, 0x44, 0x31, - 0x69, 0x5e, 0x6c, 0x4f, 0xbd, 0xa7, 0xaf, 0x02, 0x37, 0x20, 0xee, 0x95, 0xdd, 0x3c, 0xb5, 0xf4, - 0x42, 0x99, 0x1a, 0xea, 0xe0, 0xa2, 0xb2, 0x34, 0x9a, 0x51, 0x1b, 0xf5, 0xd4, 0x8c, 0xc7, 0x22, - 0x8a, 0xa8, 0xc4, 0x0b, 0x01, 0x8a, 0x35, 0x93, 0x3a, 0x5e, 0x9e, 0x55, 0x51, 0x75, 0x48, 0xaa, - 0x99, 0xd4, 0xf1, 0xb6, 0xf5, 0x0a, 0x0d, 0xd5, 0x4c, 0x81, 0x91, 0x5b, 0x30, 0x5e, 0x73, 0x69, - 0xbe, 0x58, 0xae, 0xb9, 0x1e, 0x75, 0x36, 0x77, 0xd4, 0x61, 0xd4, 0x98, 0x6c, 0xd4, 0x53, 0x73, - 0x35, 0x97, 0xae, 0xfb, 0xb8, 0xc4, 0x3c, 0x26, 0xe3, 0x5f, 0x55, 0x8a, 0x69, 0x1e, 0x8c, 0x87, - 0xce, 0x25, 0xb9, 0xde, 0xe1, 0x93, 0x0b, 0x0a, 0xfc, 0xe4, 0xa4, 0xfd, 0x93, 0xf7, 0xfd, 0xc1, - 0xb5, 0xbf, 0x29, 0x90, 0x68, 0xad, 0xb9, 0x8c, 0xff, 0xfd, 0x1a, 0xad, 0x51, 0xe1, 0x20, 0xf2, - 0x23, 0x20, 0xf3, 0x23, 0x40, 0xbe, 0x09, 0x70, 0x68, 0x17, 0xf2, 0x2e, 0xc5, 0x8b, 0x6c, 0x20, - 0xf8, 0x28, 0x87, 0x76, 0x61, 0x97, 0xb6, 0x5c, 0x64, 0x3e, 0x46, 0x0c, 0x98, 0x62, 0x5c, 0x0e, - 0xd7, 0x97, 0x67, 0x04, 0x7e, 0xb2, 0xcd, 0x77, 0xbd, 0x06, 0x32, 0x2f, 0x34, 0xea, 0xa9, 0xf9, - 0x43, 0xbb, 0x20, 0x61, 0xb2, 0x47, 0x93, 0x2d, 0x5b, 0xda, 0xef, 0x14, 0x98, 0xda, 0xb2, 0x0b, - 0x3b, 0x0e, 0x65, 0x04, 0x5f, 0x99, 0x73, 0xaf, 0xc2, 0x08, 0xe3, 0x32, 0x0d, 0xee, 0x52, 0x8c, - 0xdf, 0xbf, 0x87, 0x76, 0x61, 0xd3, 0x08, 0xdd, 0xbf, 0x1c, 0xd1, 0xfe, 0xcb, 0xbf, 0xc0, 0xba, - 0x6e, 0x15, 0x69, 0xd9, 0x37, 0x72, 0x19, 0x86, 0xb9, 0x0c, 0xd9, 0x4a, 0x64, 0x90, 0xad, 0x44, - 0xe0, 0x29, 0xad, 0x6c, 0x86, 0x21, 0xda, 0x33, 0x0c, 0x92, 0x43, 0x83, 0xbd, 0x1d, 0x22, 0xaf, - 0xc0, 0xb0, 0x43, 0x75, 0xd7, 0xb6, 0xc4, 0x19, 0x45, 0x6a, 0x8e, 0xc8, 0xd4, 0x1c, 0xd1, 0xfe, - 0xa9, 0xc0, 0xf4, 0x16, 0x1a, 0x15, 0x8e, 0x40, 0xd8, 0x2b, 0xa5, 0x5f, 0xaf, 0x06, 0x7a, 0x7a, - 0x75, 0x0b, 0x86, 0xf7, 0xcd, 0xb2, 0x47, 0x1d, 0x8c, 0x40, 0x7c, 0x75, 0xaa, 0x99, 0x78, 0xd4, - 0xbb, 0x8d, 0x1b, 0xdc, 0x72, 0x4e, 0x24, 0x5b, 0xce, 0x11, 0xc9, 0xcf, 0xc1, 0x33, 0xf8, 0x79, - 0x0f, 0xc6, 0x64, 0xd9, 0xe4, 0xdb, 0x30, 0xec, 0x7a, 0xba, 0x47, 0x5d, 0x55, 0x59, 0x8c, 0x2e, - 0x4d, 0xac, 0x8e, 0x37, 0xd5, 0x33, 0x94, 0x0b, 0xe3, 0x04, 0xb2, 0x30, 0x8e, 0x68, 0x5f, 0x4c, - 0x42, 0x74, 0xcb, 0x2e, 0x90, 0x45, 0x18, 0x68, 0x06, 0x27, 0xd1, 0xa8, 0xa7, 0xc6, 0x4c, 0x39, - 0x2c, 0x03, 0xa6, 0x11, 0xee, 0x33, 0xc7, 0xcf, 0xd8, 0x67, 0x9e, 0x7b, 0x46, 0x85, 0x9a, 0xe6, - 0x91, 0x33, 0x37, 0xcd, 0x99, 0x66, 0xff, 0xcb, 0x7b, 0xa2, 0x19, 0x3f, 0x66, 0x7d, 0xb4, 0xbb, - 0x6f, 0x87, 0x6f, 0x38, 0x08, 0x17, 0x9d, 0xa7, 0xbf, 0xd7, 0x8e, 0xbb, 0x34, 0xb7, 0x71, 0x54, - 0xb0, 0xd8, 0x54, 0xf0, 0xbc, 0x7b, 0xd9, 0xab, 0x30, 0x64, 0x3f, 0xb6, 0xa8, 0x23, 0x86, 0x08, - 0x8c, 0x3a, 0x02, 0x72, 0xd4, 0x11, 0x20, 0x14, 0x2e, 0x62, 0xf8, 0xf3, 0xb8, 0x74, 0x0f, 0xcc, - 0x6a, 0xbe, 0xe6, 0x52, 0x27, 0x5f, 0x72, 0xec, 0x5a, 0xd5, 0x55, 0x27, 0xf1, 0x6c, 0x5f, 0x69, - 0xd4, 0x53, 0x1a, 0x92, 0x3d, 0xf4, 0xa9, 0xf6, 0x5c, 0xea, 0xdc, 0x41, 0x1a, 0x49, 0xa6, 0xda, - 0x8d, 0x86, 0xfc, 0x5c, 0x81, 0x2b, 0x45, 0xbb, 0x52, 0x65, 0xdd, 0x02, 0x35, 0xf2, 0xa7, 0xa9, - 0x9c, 0x5e, 0x54, 0x96, 0xc6, 0x32, 0xaf, 0x35, 0xea, 0xa9, 0x57, 0x02, 0x8e, 0xb7, 0x7a, 0x2b, - 0xd7, 0x7a, 0x53, 0x87, 0x86, 0xb9, 0xc1, 0x33, 0x0e, 0x73, 0xf2, 0x60, 0x30, 0xf4, 0xdc, 0x07, - 0x83, 0xb1, 0xe7, 0x31, 0x18, 0xfc, 0x46, 0x81, 0x45, 0xd1, 0x62, 0x9b, 0x56, 0x29, 0xef, 0x50, - 0xd7, 0xae, 0x39, 0x45, 0x9a, 0x17, 0xa9, 0x51, 0xa1, 0x96, 0xe7, 0xaa, 0xb3, 0x68, 0xfb, 0x52, - 0x27, 0x4d, 0x39, 0xc1, 0x90, 0x93, 0xe8, 0x33, 0x57, 0x3e, 0xad, 0xa7, 0x22, 0x8d, 0x7a, 0x6a, - 0x21, 0x90, 0xdc, 0x89, 0x2e, 0xd7, 0x63, 0x9f, 0xdc, 0x83, 0x91, 0xa2, 0x43, 0xd9, 0x34, 0x8f, - 0x6d, 0x56, 0x7c, 0x35, 0x99, 0xe6, 0xe3, 0x7c, 0xda, 0x9f, 0xd3, 0xd3, 0x8f, 0xfc, 0xd7, 0x03, - 0x3e, 0xbd, 0x08, 0x72, 0x79, 0x7a, 0x11, 0x90, 0x3c, 0x02, 0x4d, 0x3c, 0x97, 0x11, 0x28, 0xf1, - 0x0c, 0x23, 0xd0, 0x0f, 0x20, 0x7e, 0x74, 0xdd, 0xcd, 0xfb, 0x06, 0x4d, 0xa1, 0xa8, 0xcb, 0x72, - 0x80, 0x83, 0x67, 0x0d, 0x16, 0x66, 0x61, 0x25, 0xef, 0x6c, 0x8f, 0xae, 0xbb, 0x9b, 0x6d, 0x26, - 0x42, 0x80, 0xb2, 0xa2, 0xc4, 0xa4, 0x0b, 0x6d, 0x2a, 0xe9, 0x9e, 0x28, 0xc2, 0xee, 0xa6, 0x5c, - 0xb1, 0x6e, 0x91, 0x2b, 0xd0, 0xf0, 0xe0, 0x36, 0x73, 0xd6, 0xc1, 0x8d, 0x6c, 0xc2, 0x14, 0x3f, - 0xb5, 0x9e, 0x57, 0xce, 0xbb, 0xb4, 0x68, 0x5b, 0x86, 0xab, 0xce, 0x2d, 0x2a, 0x4b, 0x51, 0xde, - 0x83, 0xe1, 0xe6, 0x23, 0xaf, 0xbc, 0xcb, 0xb7, 0xe4, 0x1e, 0xac, 0x65, 0xeb, 0xff, 0x33, 0xe0, - 0x53, 0xcf, 0x03, 0xff, 0x52, 0x60, 0x6e, 0x8b, 0x75, 0xb4, 0xa2, 0x3a, 0x99, 0x3f, 0xa6, 0x7e, - 0x6f, 0x24, 0x35, 0x64, 0xca, 0x19, 0x1a, 0xb2, 0x73, 0xbf, 0xce, 0xdf, 0x84, 0x31, 0x8b, 0x3e, - 0xce, 0xb7, 0x94, 0x5b, 0xbc, 0x39, 0x2d, 0xfa, 0x78, 0xa7, 0xbd, 0xe2, 0xc6, 0x25, 0x58, 0xfb, - 0xfd, 0x00, 0x5c, 0x68, 0x73, 0xd4, 0xad, 0xda, 0x96, 0x4b, 0xc9, 0x6f, 0x15, 0x50, 0x9d, 0x60, - 0x03, 0x3f, 0x31, 0xab, 0x79, 0xb5, 0xb2, 0xc7, 0x7d, 0x8f, 0xaf, 0xde, 0xf0, 0xaf, 0xd6, 0x4e, - 0x02, 0xd2, 0xb9, 0x16, 0xe6, 0x1c, 0xe7, 0xe5, 0x77, 0xee, 0xcb, 0x8d, 0x7a, 0xea, 0xb2, 0xd3, - 0x99, 0x42, 0xb2, 0xf6, 0x42, 0x17, 0x92, 0xa4, 0x03, 0x97, 0x4e, 0x93, 0x7f, 0x2e, 0x69, 0x61, - 0xc1, 0xac, 0x34, 0x1c, 0x71, 0x2f, 0xf1, 0xf1, 0xb2, 0x9f, 0x91, 0xe1, 0x2a, 0x0c, 0x51, 0xc7, - 0xb1, 0x1d, 0x59, 0x27, 0x02, 0x32, 0x29, 0x02, 0xda, 0x07, 0x38, 0x43, 0x85, 0xf5, 0x91, 0x03, - 0x20, 0x7c, 0x7e, 0xe3, 0x6b, 0x31, 0xc0, 0xf1, 0xef, 0x91, 0x6c, 0x1d, 0xe0, 0x02, 0x1b, 0x33, - 0x0b, 0x8d, 0x7a, 0x2a, 0x89, 0x63, 0x5a, 0x00, 0xca, 0x91, 0x4e, 0xb4, 0xee, 0x69, 0x7f, 0x1d, - 0x85, 0x21, 0xbc, 0xe2, 0xc9, 0x15, 0x18, 0xc4, 0xc1, 0x9f, 0x7b, 0x87, 0xc3, 0xaf, 0x15, 0x1e, - 0xfa, 0x71, 0x9f, 0x64, 0x61, 0xd2, 0x4f, 0xc4, 0xfc, 0xbe, 0x5e, 0xf4, 0x84, 0x97, 0x4a, 0xe6, - 0x52, 0xa3, 0x9e, 0x52, 0xfd, 0xad, 0xdb, 0xb8, 0x23, 0x31, 0x4f, 0x84, 0x77, 0xc8, 0x0d, 0x88, - 0x63, 0xa7, 0xc2, 0x1b, 0x17, 0x31, 0xc9, 0x61, 0xd5, 0x65, 0x30, 0x6f, 0x38, 0xe4, 0xaa, 0x1b, - 0xa0, 0xec, 0x38, 0x60, 0x7f, 0xe3, 0xf3, 0xf2, 0xa1, 0x09, 0x8f, 0x03, 0xe2, 0x6d, 0xcc, 0x71, - 0x09, 0x26, 0x25, 0x98, 0x6c, 0x5e, 0xea, 0x65, 0xb3, 0x62, 0x7a, 0xfe, 0x9b, 0xec, 0x02, 0x06, - 0x16, 0x83, 0xd1, 0xbc, 0xc5, 0xef, 0x23, 0x01, 0xcf, 0x66, 0x16, 0x5c, 0xd5, 0x09, 0x6d, 0x84, - 0x9a, 0x92, 0x89, 0xf0, 0x1e, 0xf9, 0x83, 0x02, 0x57, 0x5a, 0x34, 0xe5, 0x0b, 0x27, 0xcd, 0x53, - 0x9c, 0x2f, 0x96, 0x75, 0xd7, 0xe5, 0x8f, 0x2d, 0x23, 0xd2, 0x0b, 0x6d, 0x27, 0x03, 0x32, 0x27, - 0xfe, 0x69, 0x5e, 0x67, 0x4c, 0xdb, 0x7a, 0x85, 0x72, 0x9b, 0xae, 0x8a, 0xc6, 0xe2, 0xb2, 0xd3, - 0x8b, 0x3e, 0xd7, 0x9b, 0x84, 0xec, 0x42, 0xbc, 0x4a, 0x9d, 0x8a, 0xe9, 0xba, 0xd8, 0xbb, 0xf3, - 0x77, 0xe3, 0x39, 0xc9, 0xaa, 0x9d, 0x60, 0x97, 0xc7, 0x5b, 0x22, 0x97, 0xe3, 0x2d, 0xc1, 0xc9, - 0x7f, 0x2b, 0x10, 0x97, 0xf8, 0x48, 0x0e, 0x46, 0xdd, 0x5a, 0xe1, 0x90, 0x16, 0x9b, 0x15, 0x66, - 0xa1, 0xb3, 0x86, 0xf4, 0x2e, 0x27, 0x13, 0xdd, 0x83, 0xe0, 0x09, 0x75, 0x0f, 0x02, 0xc3, 0x33, - 0x4e, 0x9d, 0x02, 0x7f, 0x90, 0xf1, 0xcf, 0x38, 0x03, 0x42, 0x67, 0x9c, 0x01, 0xc9, 0x77, 0x61, - 0x44, 0xc8, 0x65, 0x19, 0x7f, 0x64, 0x5a, 0x86, 0x9c, 0xf1, 0x6c, 0x2d, 0x67, 0x3c, 0x5b, 0x37, - 0x4f, 0xc6, 0xc0, 0xe9, 0x27, 0x23, 0x69, 0xc2, 0x74, 0x87, 0xbc, 0x79, 0x8a, 0x2a, 0xa5, 0xf4, - 0xbc, 0x2b, 0x3f, 0x52, 0xe0, 0xca, 0xd9, 0x52, 0xe4, 0x6c, 0xea, 0xef, 0xc9, 0xea, 0xfd, 0x71, - 0x2a, 0x24, 0xb0, 0x45, 0x5b, 0xaf, 0x32, 0xfa, 0x8b, 0x21, 0xb8, 0x78, 0x0a, 0x3f, 0x6b, 0xb3, - 0xe7, 0x2b, 0xfa, 0x8f, 0xcc, 0x4a, 0xad, 0x12, 0xf4, 0xd8, 0xfb, 0x8e, 0x5e, 0x64, 0x45, 0x5e, - 0xe4, 0xc5, 0x77, 0x7a, 0x59, 0x91, 0x7e, 0xc0, 0x25, 0xf8, 0xe8, 0x6d, 0xc1, 0xcf, 0xcf, 0x46, - 0x4a, 0x9c, 0x8d, 0x0b, 0x95, 0xce, 0x54, 0xb9, 0x6e, 0x1b, 0xe4, 0x8f, 0x0a, 0x5c, 0xee, 0x6a, - 0x1c, 0x9e, 0x61, 0xdb, 0x2e, 0x63, 0xae, 0xc5, 0x57, 0xd7, 0x9f, 0xd6, 0xc8, 0xcc, 0xc9, 0x8e, - 0x6d, 0x97, 0xc5, 0x45, 0x29, 0x4c, 0x7d, 0xa1, 0x72, 0x1a, 0x6d, 0xee, 0xf4, 0x6d, 0x76, 0x5d, - 0x9e, 0x16, 0x90, 0xf3, 0x4a, 0x44, 0xad, 0xb7, 0x83, 0x67, 0x53, 0xfd, 0x30, 0x9c, 0x84, 0x2f, - 0xb5, 0x47, 0x16, 0xa3, 0xd0, 0x5f, 0x22, 0xfe, 0x69, 0x00, 0x52, 0x3d, 0x64, 0x90, 0x8f, 0xce, - 0x90, 0x8c, 0x6b, 0x67, 0xb1, 0xe6, 0x9c, 0x12, 0xf2, 0xeb, 0xf8, 0xb2, 0x5a, 0x16, 0x62, 0x58, - 0x92, 0xef, 0x9b, 0xae, 0x47, 0xae, 0xc3, 0x30, 0xb6, 0xa2, 0x7e, 0xc9, 0x86, 0xa0, 0x64, 0xf3, - 0xe6, 0x98, 0xef, 0xca, 0xcd, 0x31, 0x47, 0xb4, 0x3d, 0x20, 0xfc, 0xe1, 0xb1, 0x2c, 0xf5, 0x6f, - 0xe4, 0x16, 0x8c, 0x17, 0x39, 0x4a, 0x0d, 0xa9, 0xcf, 0xc6, 0x5f, 0x0d, 0x9a, 0x1b, 0xe1, 0x6e, - 0x7b, 0x4c, 0xc6, 0xb5, 0x1b, 0x30, 0x89, 0xda, 0xef, 0xd0, 0xe6, 0xc3, 0xf3, 0x19, 0x1b, 0x18, - 0xed, 0x16, 0xa8, 0xbb, 0x9e, 0x43, 0xf5, 0x8a, 0x69, 0x95, 0x5a, 0x65, 0xbc, 0x08, 0x51, 0xab, - 0x56, 0x41, 0x11, 0xe3, 0x3c, 0x90, 0x56, 0xad, 0x22, 0x07, 0xd2, 0xaa, 0x55, 0xb4, 0x37, 0x81, - 0x20, 0xdf, 0x06, 0x2d, 0x53, 0x8f, 0xf6, 0xab, 0xfe, 0x13, 0x05, 0x80, 0xbf, 0x54, 0x6e, 0x5a, - 0xfb, 0xf6, 0x99, 0xdb, 0xae, 0x1b, 0x10, 0xc7, 0x88, 0x1a, 0xf9, 0x43, 0x1b, 0x2f, 0x3a, 0x65, - 0x69, 0x88, 0xf7, 0x4b, 0x1c, 0xde, 0xb2, 0x43, 0xb7, 0x1d, 0x04, 0x28, 0x63, 0x2d, 0x53, 0xdd, - 0xf5, 0x59, 0xa3, 0x01, 0x2b, 0x87, 0x5b, 0x59, 0x03, 0x54, 0x7b, 0x0c, 0xd3, 0xe8, 0xea, 0x5e, - 0xd5, 0xd0, 0xbd, 0x60, 0x6c, 0x78, 0x43, 0x7e, 0xe3, 0x0f, 0x67, 0xc3, 0x69, 0x73, 0x4c, 0x1f, - 0x6d, 0x71, 0x0d, 0xd4, 0x8c, 0xee, 0x15, 0x0f, 0x3a, 0x69, 0x7f, 0x17, 0xc6, 0xf7, 0x75, 0xb3, - 0xec, 0xbf, 0x7d, 0xf9, 0x39, 0xa9, 0x06, 0x56, 0x84, 0x19, 0x78, 0x5a, 0x71, 0x96, 0xb7, 0x5a, - 0xf3, 0x74, 0x4c, 0xc6, 0x9b, 0xfe, 0xae, 0xe3, 0x1b, 0xc9, 0xd7, 0xe5, 0x6f, 0x8b, 0xf6, 0xde, - 0xfe, 0x86, 0x19, 0xfa, 0xf0, 0x37, 0x0e, 0xb1, 0xac, 0x65, 0x3c, 0xd0, 0x9d, 0x23, 0xea, 0x68, - 0x1f, 0x2a, 0x30, 0x1b, 0x3e, 0x19, 0x0f, 0xa8, 0xeb, 0xea, 0x25, 0x4a, 0xbe, 0xd5, 0x9f, 0xff, - 0x77, 0x23, 0xc1, 0x43, 0x74, 0x94, 0x5a, 0x86, 0x28, 0xe8, 0x13, 0xc8, 0xd6, 0xd4, 0xc7, 0xcf, - 0x17, 0x95, 0x1b, 0xae, 0xbb, 0x91, 0x1c, 0xa3, 0xcf, 0x8c, 0xc0, 0x10, 0x3d, 0xa6, 0x96, 0xb7, - 0x9c, 0x84, 0xb8, 0xf4, 0x2b, 0x2c, 0x89, 0xc3, 0x88, 0x58, 0x26, 0x22, 0xcb, 0x57, 0x21, 0x2e, - 0xfd, 0x5c, 0x47, 0xc6, 0x60, 0x74, 0xdb, 0x36, 0xe8, 0x8e, 0xed, 0x78, 0x89, 0x08, 0x5b, 0xdd, - 0xa5, 0xba, 0x51, 0x66, 0xa4, 0xca, 0xf2, 0xc7, 0x0a, 0x8c, 0xfa, 0x4f, 0xff, 0x04, 0x60, 0xf8, - 0xad, 0xbd, 0xec, 0x5e, 0x76, 0x23, 0x11, 0x61, 0x02, 0x77, 0xb2, 0xdb, 0x1b, 0x9b, 0xdb, 0x77, - 0x12, 0x0a, 0x5b, 0xe4, 0xf6, 0xb6, 0xb7, 0xd9, 0x62, 0x80, 0x8c, 0x43, 0x6c, 0x77, 0x6f, 0x7d, - 0x3d, 0x9b, 0xdd, 0xc8, 0x6e, 0x24, 0xa2, 0x8c, 0xe9, 0xf6, 0xda, 0xe6, 0xfd, 0xec, 0x46, 0x62, - 0x90, 0xd1, 0xed, 0x6d, 0xdf, 0xdb, 0x7e, 0xf8, 0xce, 0x76, 0x62, 0x88, 0xd3, 0x65, 0x1e, 0x6c, - 0x3e, 0x7a, 0x94, 0xdd, 0x48, 0x0c, 0x33, 0xba, 0xfb, 0xd9, 0xb5, 0xdd, 0xec, 0x46, 0x62, 0x84, - 0x6d, 0xed, 0xe4, 0xb2, 0xd9, 0x07, 0x3b, 0x6c, 0x6b, 0x94, 0x2d, 0xd7, 0xd7, 0xb6, 0xd7, 0xb3, - 0xf7, 0x99, 0x94, 0x18, 0xb3, 0x30, 0x97, 0xdd, 0xca, 0xae, 0xb3, 0x4d, 0x58, 0xfd, 0x73, 0x14, - 0xc6, 0x30, 0xa0, 0xfe, 0xd3, 0xd2, 0xeb, 0x10, 0xe7, 0x5f, 0x95, 0x4f, 0x67, 0x52, 0xc8, 0x93, - 0x73, 0x6d, 0x8f, 0x7e, 0x59, 0x16, 0x3c, 0x2d, 0x42, 0x6e, 0xc1, 0x98, 0xc4, 0xe4, 0x92, 0x89, - 0x80, 0x8b, 0x95, 0xf1, 0xe4, 0x0b, 0xb8, 0xee, 0x96, 0x68, 0x5a, 0x84, 0x69, 0xe5, 0x67, 0xa7, - 0x4f, 0xad, 0x12, 0x53, 0x6f, 0xad, 0xe1, 0xd3, 0xa9, 0x45, 0xc8, 0x77, 0x21, 0xce, 0x6b, 0x29, - 0xd7, 0x7a, 0x21, 0xe0, 0x0f, 0x95, 0xd8, 0x53, 0x4c, 0x48, 0xc3, 0xe8, 0x1d, 0xea, 0x71, 0xf6, - 0x99, 0x80, 0x3d, 0xa8, 0xec, 0x49, 0xc9, 0x15, 0x2d, 0x42, 0xb6, 0x20, 0xe6, 0xd3, 0xbb, 0x84, - 0xdb, 0xd7, 0xed, 0x4e, 0x48, 0x26, 0x3b, 0x6c, 0x8b, 0x83, 0xa1, 0x45, 0x5e, 0x53, 0x56, 0x7f, - 0x15, 0x83, 0x61, 0x3e, 0x8b, 0x93, 0xb7, 0x01, 0xf8, 0x5f, 0x58, 0x77, 0x67, 0x3b, 0xfe, 0xd4, - 0x9a, 0x9c, 0xeb, 0x3c, 0xc0, 0x6b, 0xf3, 0x3f, 0xfb, 0xcb, 0x3f, 0x7e, 0x3d, 0x30, 0xad, 0x4d, - 0xac, 0x1c, 0x5f, 0x5b, 0x39, 0xb4, 0x0b, 0xe2, 0x1f, 0xc9, 0x6e, 0x2a, 0xcb, 0xe4, 0x1d, 0x00, - 0x7e, 0x89, 0x86, 0xe5, 0x86, 0x7e, 0xd1, 0x4b, 0xf2, 0xb0, 0xb5, 0x5f, 0xb6, 0xed, 0x82, 0xf9, - 0x4d, 0xca, 0x04, 0xff, 0x10, 0xc6, 0x9a, 0x82, 0x77, 0xa9, 0x47, 0x54, 0xe9, 0x47, 0xba, 0xb0, - 0xf4, 0x6e, 0xb1, 0xbf, 0x84, 0xc2, 0xe7, 0xb4, 0x29, 0x21, 0xdc, 0xa5, 0x9e, 0x24, 0xdf, 0x82, - 0x84, 0xfc, 0x6c, 0x84, 0xe6, 0x5f, 0xec, 0xfc, 0xa0, 0xc4, 0xd5, 0x5c, 0x3a, 0xed, 0xb5, 0x49, - 0x4b, 0xa1, 0xb2, 0x79, 0x6d, 0xc6, 0xf7, 0x44, 0x7a, 0x39, 0xa2, 0x4c, 0xdf, 0xbb, 0x10, 0x17, - 0x3f, 0x47, 0xa3, 0xaa, 0x66, 0xa8, 0xc3, 0xbf, 0x51, 0x77, 0x75, 0x26, 0x89, 0xf2, 0x67, 0xb4, - 0x49, 0x5f, 0x7e, 0x95, 0xf3, 0x31, 0xd1, 0x77, 0xfa, 0x3f, 0x90, 0x33, 0x28, 0x6e, 0x42, 0x8b, - 0x31, 0x71, 0x58, 0x10, 0x99, 0xa0, 0xe2, 0xb3, 0x1d, 0xd2, 0x97, 0x50, 0xe8, 0x82, 0x36, 0xcf, - 0x84, 0x16, 0x18, 0x15, 0x35, 0x56, 0xf8, 0x9b, 0xbe, 0xb8, 0x1f, 0x98, 0x92, 0xed, 0xfe, 0x0f, - 0xf2, 0x45, 0x14, 0x3c, 0x9b, 0x4c, 0x34, 0xad, 0x5d, 0xf9, 0x09, 0x6b, 0x3d, 0x3e, 0x10, 0x46, - 0x3f, 0xcb, 0x19, 0x17, 0x46, 0x27, 0x43, 0x46, 0xd7, 0x90, 0x46, 0x32, 0xfa, 0x7b, 0xcf, 0x58, - 0x07, 0x54, 0xd4, 0x42, 0x96, 0xdb, 0x3c, 0x20, 0xb7, 0xfb, 0xaa, 0x0f, 0x42, 0x0e, 0x69, 0x97, - 0x63, 0x3c, 0xa7, 0xba, 0x21, 0x12, 0x8d, 0x10, 0x39, 0x1e, 0x3c, 0x10, 0xaf, 0x29, 0xe4, 0x26, - 0x0c, 0xdf, 0xc5, 0x7f, 0xa8, 0x24, 0x5d, 0x3c, 0x4d, 0xf2, 0x73, 0xca, 0x89, 0xd6, 0x0f, 0x68, - 0xf1, 0xa8, 0x79, 0xf7, 0xbf, 0xf7, 0xf9, 0x17, 0x0b, 0x91, 0x9f, 0x3e, 0x59, 0x50, 0x3e, 0x7d, - 0xb2, 0xa0, 0x7c, 0xf6, 0x64, 0x41, 0xf9, 0xfb, 0x93, 0x05, 0xe5, 0xc3, 0x2f, 0x17, 0x22, 0x9f, - 0x7d, 0xb9, 0x10, 0xf9, 0xfc, 0xcb, 0x85, 0xc8, 0xf7, 0xbf, 0x21, 0xfd, 0x8f, 0xa7, 0xee, 0x54, - 0x74, 0x43, 0xaf, 0x3a, 0xf6, 0x21, 0x2d, 0x7a, 0x62, 0xb5, 0x22, 0xfe, 0xa9, 0xf3, 0x93, 0x81, - 0x99, 0x35, 0x04, 0x76, 0xf8, 0x76, 0x7a, 0xd3, 0x4e, 0xaf, 0x55, 0xcd, 0xc2, 0x30, 0xda, 0xf2, - 0xfa, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x6d, 0xc0, 0x75, 0xf1, 0x2a, 0x00, 0x00, + 0x15, 0xe7, 0x8a, 0xfa, 0xe2, 0xa3, 0x3e, 0xa8, 0xb1, 0x24, 0xaf, 0x68, 0x47, 0x94, 0x37, 0x89, + 0x23, 0x2b, 0x0e, 0x19, 0x2b, 0x0d, 0x6a, 0xbb, 0x29, 0x5c, 0x91, 0xa2, 0x6d, 0xc9, 0x36, 0xad, + 0x50, 0x56, 0xd2, 0x14, 0x45, 0x99, 0x25, 0x77, 0x44, 0xad, 0x44, 0xee, 0x32, 0xbb, 0x4b, 0xb9, + 0x6a, 0x11, 0xa0, 0x28, 0x0a, 0xf4, 0xd0, 0x4b, 0xd0, 0x1e, 0x0b, 0x34, 0x05, 0xda, 0x53, 0x7a, + 0x2e, 0x50, 0x14, 0xfd, 0x03, 0x7a, 0x0c, 0xd0, 0x4b, 0x8a, 0x02, 0x44, 0xeb, 0xb4, 0x0d, 0xc0, + 0x5b, 0xef, 0x3d, 0x14, 0xf3, 0x66, 0x97, 0x3b, 0xcb, 0x0f, 0x91, 0xb4, 0xad, 0xe4, 0xd2, 0x9b, + 0xe6, 0x37, 0xef, 0x7b, 0xdf, 0xbc, 0x79, 0x6f, 0x28, 0x98, 0xaf, 0x1d, 0x95, 0x53, 0x6a, 0x4d, + 0x4f, 0xd9, 0xf5, 0x62, 0x55, 0x77, 0x92, 0x35, 0xcb, 0x74, 0x4c, 0x12, 0x56, 0x6b, 0x7a, 0xfc, + 0x42, 0xd9, 0x34, 0xcb, 0x15, 0x9a, 0x42, 0xa8, 0x58, 0xdf, 0x4f, 0xd1, 0x6a, 0xcd, 0x39, 0xe1, + 0x14, 0xf1, 0x44, 0xfb, 0xa6, 0xa3, 0x57, 0xa9, 0xed, 0xa8, 0xd5, 0x9a, 0x4b, 0xa0, 0x1c, 0x5d, + 0xb7, 0x93, 0xba, 0x89, 0xb2, 0x4b, 0xa6, 0x45, 0x53, 0xc7, 0xd7, 0x52, 0x65, 0x6a, 0x50, 0x4b, + 0x75, 0xa8, 0xe6, 0xd2, 0xac, 0x0a, 0x34, 0x06, 0x75, 0x1e, 0x9b, 0xd6, 0x91, 0x6e, 0x94, 0xbb, + 0x51, 0x5e, 0x74, 0xd5, 0x31, 0x4a, 0xd5, 0x30, 0x4c, 0x47, 0x75, 0x74, 0xd3, 0xb0, 0xdd, 0xdd, + 0xd7, 0xca, 0xba, 0x73, 0x50, 0x2f, 0x26, 0x4b, 0x66, 0x35, 0x55, 0x36, 0xcb, 0xa6, 0x6f, 0x15, + 0x5b, 0xe1, 0x02, 0xff, 0x72, 0xc9, 0x5b, 0x3e, 0x1f, 0x50, 0xb5, 0xe2, 0x1c, 0x70, 0x54, 0xf9, + 0x38, 0x02, 0xf3, 0xdb, 0x66, 0x71, 0x17, 0xe3, 0x90, 0xa7, 0x1f, 0xd4, 0xa9, 0xed, 0x6c, 0x39, + 0xb4, 0x4a, 0xd6, 0x61, 0xb2, 0x66, 0xe9, 0xa6, 0xa5, 0x3b, 0x27, 0xb2, 0xb4, 0x22, 0xad, 0x4a, + 0xe9, 0xc5, 0x66, 0x23, 0x41, 0x3c, 0xec, 0xaa, 0x59, 0xd5, 0x1d, 0x0c, 0x4d, 0xbe, 0x45, 0x47, + 0xde, 0x84, 0x88, 0xa1, 0x56, 0xa9, 0x5d, 0x53, 0x4b, 0x54, 0x0e, 0xaf, 0x48, 0xab, 0x91, 0xf4, + 0xf9, 0x66, 0x23, 0x71, 0xae, 0x05, 0x0a, 0x5c, 0x3e, 0x25, 0x79, 0x03, 0x22, 0xa5, 0x8a, 0x4e, + 0x0d, 0xa7, 0xa0, 0x6b, 0xf2, 0x24, 0xb2, 0xa1, 0x2e, 0x0e, 0x6e, 0x69, 0xa2, 0x2e, 0x0f, 0x23, + 0xbb, 0x30, 0x5e, 0x51, 0x8b, 0xb4, 0x62, 0xcb, 0xa3, 0x2b, 0xe1, 0xd5, 0xe8, 0xfa, 0xcb, 0x49, + 0xb5, 0xa6, 0x27, 0xbb, 0xb9, 0x92, 0xbc, 0x8f, 0x74, 0x59, 0xc3, 0xb1, 0x4e, 0xd2, 0xf3, 0xcd, + 0x46, 0x22, 0xc6, 0x19, 0x05, 0xb1, 0xae, 0x28, 0x52, 0x86, 0xa8, 0x10, 0x67, 0x79, 0x0c, 0x25, + 0xaf, 0xf5, 0x96, 0xbc, 0xe1, 0x13, 0x73, 0xf1, 0x4b, 0xcd, 0x46, 0x62, 0x41, 0x10, 0x21, 0xe8, + 0x10, 0x25, 0x93, 0x9f, 0x4a, 0x30, 0x6f, 0xd1, 0x0f, 0xea, 0xba, 0x45, 0xb5, 0x82, 0x61, 0x6a, + 0xb4, 0xe0, 0x3a, 0x33, 0x8e, 0x2a, 0xaf, 0xf5, 0x56, 0x99, 0x77, 0xb9, 0x72, 0xa6, 0x46, 0x45, + 0xc7, 0x94, 0x66, 0x23, 0x71, 0xd1, 0xea, 0xd8, 0xf4, 0x0d, 0x90, 0xa5, 0x3c, 0xe9, 0xdc, 0x27, + 0x0f, 0x61, 0xb2, 0x66, 0x6a, 0x05, 0xbb, 0x46, 0x4b, 0xf2, 0xc8, 0x8a, 0xb4, 0x1a, 0x5d, 0xbf, + 0x90, 0xe4, 0x09, 0x8a, 0x36, 0xb0, 0x24, 0x4e, 0x1e, 0x5f, 0x4b, 0xee, 0x98, 0xda, 0x6e, 0x8d, + 0x96, 0xf0, 0x7b, 0xce, 0xd5, 0xf8, 0x22, 0x20, 0x7b, 0xc2, 0x05, 0xc9, 0x0e, 0x44, 0x3c, 0x81, + 0xb6, 0x3c, 0x81, 0xee, 0x9c, 0x2a, 0x91, 0xa7, 0x15, 0x5f, 0xd8, 0x81, 0xb4, 0x72, 0x31, 0x92, + 0x81, 0x09, 0xdd, 0x28, 0x5b, 0xd4, 0xb6, 0xe5, 0x08, 0xca, 0x23, 0x28, 0x68, 0x8b, 0x63, 0x19, + 0xd3, 0xd8, 0xd7, 0xcb, 0xe9, 0x05, 0x66, 0x98, 0x4b, 0x26, 0x48, 0xf1, 0x38, 0xc9, 0x6d, 0x98, + 0xb4, 0xa9, 0x75, 0xac, 0x97, 0xa8, 0x2d, 0x83, 0x20, 0x65, 0x97, 0x83, 0xae, 0x14, 0x34, 0xc6, + 0xa3, 0x13, 0x8d, 0xf1, 0x30, 0x96, 0xe3, 0x76, 0xe9, 0x80, 0x6a, 0xf5, 0x0a, 0xb5, 0xe4, 0xa8, + 0x9f, 0xe3, 0x2d, 0x50, 0xcc, 0xf1, 0x16, 0x18, 0x57, 0x21, 0x2a, 0x7c, 0x2d, 0xf2, 0x22, 0x84, + 0x8f, 0x28, 0x3f, 0x58, 0x91, 0xf4, 0x5c, 0xb3, 0x91, 0x98, 0x3e, 0xa2, 0xe2, 0x99, 0x62, 0xbb, + 0xe4, 0x0a, 0x8c, 0x1d, 0xab, 0x95, 0x3a, 0xc5, 0xef, 0x12, 0x49, 0x9f, 0x6b, 0x36, 0x12, 0xb3, + 0x08, 0x08, 0x84, 0x9c, 0xe2, 0xe6, 0xc8, 0x75, 0x29, 0xbe, 0x0f, 0xb1, 0xf6, 0x7c, 0x3c, 0x13, + 0x3d, 0x55, 0x38, 0xdf, 0x23, 0x09, 0xcf, 0x42, 0x9d, 0xf2, 0x9f, 0x30, 0x4c, 0x07, 0x3e, 0x35, + 0xb9, 0x09, 0xa3, 0xce, 0x49, 0x8d, 0xa2, 0x9a, 0x99, 0xf5, 0x98, 0x98, 0x0c, 0x8f, 0x4e, 0x6a, + 0x14, 0xcf, 0xf8, 0x0c, 0xa3, 0x08, 0x24, 0x28, 0xf2, 0x30, 0xe5, 0x35, 0xd3, 0x72, 0x6c, 0x79, + 0x64, 0x25, 0xbc, 0x3a, 0xcd, 0x95, 0x23, 0x20, 0x2a, 0x47, 0x80, 0xbc, 0x1f, 0x2c, 0x06, 0x61, + 0x4c, 0x9a, 0x17, 0x3b, 0x53, 0xef, 0xe9, 0xab, 0xc0, 0x0d, 0x88, 0x3a, 0x15, 0xbb, 0x40, 0x0d, + 0xb5, 0x58, 0xa1, 0x9a, 0x3c, 0xba, 0x22, 0xad, 0x4e, 0xa6, 0xe5, 0x66, 0x23, 0x31, 0xef, 0xb0, + 0x88, 0x22, 0x2a, 0xf0, 0x82, 0x8f, 0x62, 0xcd, 0xa4, 0x96, 0x53, 0x60, 0x55, 0x54, 0x1e, 0x13, + 0x6a, 0x26, 0xb5, 0x9c, 0x9c, 0x5a, 0xa5, 0x81, 0x9a, 0xe9, 0x62, 0xe4, 0x16, 0x4c, 0xd7, 0x6d, + 0x5a, 0x28, 0x55, 0xea, 0xb6, 0x43, 0xad, 0xad, 0x1d, 0x79, 0x1c, 0x35, 0xc6, 0x9b, 0x8d, 0xc4, + 0x62, 0xdd, 0xa6, 0x19, 0x0f, 0x17, 0x98, 0xa7, 0x44, 0xfc, 0xcb, 0x4a, 0x31, 0xc5, 0x81, 0xe9, + 0xc0, 0xb9, 0x24, 0xd7, 0xbb, 0x7c, 0x72, 0x97, 0x02, 0x3f, 0x39, 0xe9, 0xfc, 0xe4, 0x43, 0x7f, + 0x70, 0xe5, 0xaf, 0x12, 0xc4, 0xda, 0x6b, 0x2e, 0xe3, 0xff, 0xa0, 0x4e, 0xeb, 0xd4, 0x75, 0x10, + 0xf9, 0x11, 0x10, 0xf9, 0x11, 0x20, 0x5f, 0x03, 0x38, 0x34, 0x8b, 0x05, 0x9b, 0xe2, 0x45, 0x36, + 0xe2, 0x7f, 0x94, 0x43, 0xb3, 0xb8, 0x4b, 0xdb, 0x2e, 0x32, 0x0f, 0x23, 0x1a, 0xcc, 0x31, 0x2e, + 0x8b, 0xeb, 0x2b, 0x30, 0x02, 0x2f, 0xd9, 0x96, 0x7a, 0x5e, 0x03, 0xe9, 0x17, 0x9a, 0x8d, 0xc4, + 0xd2, 0xa1, 0x59, 0x14, 0x30, 0xd1, 0xa3, 0xd9, 0xb6, 0x2d, 0xe5, 0x37, 0x12, 0xcc, 0x6d, 0x9b, + 0xc5, 0x1d, 0x8b, 0x32, 0x82, 0x2f, 0xcd, 0xb9, 0xd7, 0x60, 0x82, 0x71, 0xe9, 0x1a, 0x77, 0x29, + 0xc2, 0xef, 0xdf, 0x43, 0xb3, 0xb8, 0xa5, 0x05, 0xee, 0x5f, 0x8e, 0x28, 0xff, 0xe5, 0x5f, 0x20, + 0xa3, 0x1a, 0x25, 0x5a, 0xf1, 0x8c, 0x5c, 0x83, 0x71, 0x2e, 0x43, 0xb4, 0x12, 0x19, 0x44, 0x2b, + 0x11, 0x78, 0x4a, 0x2b, 0x5b, 0x61, 0x08, 0xf7, 0x0d, 0x83, 0xe0, 0xd0, 0x68, 0x7f, 0x87, 0xc8, + 0x55, 0x18, 0xb7, 0xa8, 0x6a, 0x9b, 0x86, 0x7b, 0x46, 0x91, 0x9a, 0x23, 0x22, 0x35, 0x47, 0x94, + 0x7f, 0x49, 0x70, 0x6e, 0x1b, 0x8d, 0x0a, 0x46, 0x20, 0xe8, 0x95, 0x34, 0xac, 0x57, 0x23, 0x7d, + 0xbd, 0xba, 0x05, 0xe3, 0xfb, 0x7a, 0xc5, 0xa1, 0x16, 0x46, 0x20, 0xba, 0x3e, 0xd7, 0x4a, 0x3c, + 0xea, 0xdc, 0xc6, 0x0d, 0x6e, 0x39, 0x27, 0x12, 0x2d, 0xe7, 0x88, 0xe0, 0xe7, 0xe8, 0x00, 0x7e, + 0xde, 0x83, 0x29, 0x51, 0x36, 0xf9, 0x06, 0x8c, 0xdb, 0x8e, 0xea, 0x50, 0x5b, 0x96, 0x56, 0xc2, + 0xab, 0x33, 0xeb, 0xd3, 0x2d, 0xf5, 0x0c, 0xe5, 0xc2, 0x38, 0x81, 0x28, 0x8c, 0x23, 0xca, 0x17, + 0xb3, 0x10, 0xde, 0x36, 0x8b, 0x64, 0x05, 0x46, 0x5a, 0xc1, 0x89, 0x35, 0x1b, 0x89, 0x29, 0x5d, + 0x0c, 0xcb, 0x88, 0xae, 0x05, 0xfb, 0xcc, 0xe9, 0x01, 0xfb, 0xcc, 0x33, 0xcf, 0xa8, 0x40, 0xd3, + 0x3c, 0x31, 0x70, 0xd3, 0x9c, 0x6e, 0xf5, 0xbf, 0xbc, 0x27, 0x9a, 0xf7, 0x62, 0x36, 0x44, 0xbb, + 0xfb, 0x4e, 0xf0, 0x86, 0x83, 0x60, 0xd1, 0x79, 0xfa, 0x7b, 0xed, 0xb8, 0x47, 0x73, 0x1b, 0x45, + 0x05, 0x2b, 0x2d, 0x05, 0xcf, 0xbb, 0x97, 0xbd, 0x02, 0x63, 0xe6, 0x63, 0x83, 0x5a, 0xee, 0x10, + 0x81, 0x51, 0x47, 0x40, 0x8c, 0x3a, 0x02, 0x84, 0xc2, 0x05, 0x0c, 0x7f, 0x01, 0x97, 0xf6, 0x81, + 0x5e, 0x2b, 0xd4, 0x6d, 0x6a, 0x15, 0xca, 0x96, 0x59, 0xaf, 0xd9, 0xf2, 0x2c, 0x9e, 0xed, 0xcb, + 0xcd, 0x46, 0x42, 0x41, 0xb2, 0x87, 0x1e, 0xd5, 0x9e, 0x4d, 0xad, 0x3b, 0x48, 0x23, 0xc8, 0x94, + 0x7b, 0xd1, 0x90, 0x9f, 0x48, 0x70, 0xb9, 0x64, 0x56, 0x6b, 0xac, 0x5b, 0xa0, 0x5a, 0xe1, 0x34, + 0x95, 0xe7, 0x56, 0xa4, 0xd5, 0xa9, 0xf4, 0xeb, 0xcd, 0x46, 0xe2, 0xaa, 0xcf, 0xf1, 0x76, 0x7f, + 0xe5, 0x4a, 0x7f, 0xea, 0xc0, 0x30, 0x37, 0x3a, 0xe0, 0x30, 0x27, 0x0e, 0x06, 0x63, 0xcf, 0x7d, + 0x30, 0x98, 0x7a, 0x1e, 0x83, 0xc1, 0xaf, 0x25, 0x58, 0x71, 0x5b, 0x6c, 0xdd, 0x28, 0x17, 0x2c, + 0x6a, 0x9b, 0x75, 0xab, 0x44, 0x0b, 0x6e, 0x6a, 0x54, 0xa9, 0xe1, 0xd8, 0xf2, 0x02, 0xda, 0xbe, + 0xda, 0x4d, 0x53, 0xde, 0x65, 0xc8, 0x0b, 0xf4, 0xe9, 0xab, 0xcd, 0x46, 0x62, 0xd5, 0x97, 0xda, + 0x8d, 0x46, 0x30, 0x66, 0xf9, 0x74, 0x4a, 0x72, 0x0f, 0x26, 0x4a, 0x16, 0x65, 0x33, 0x3d, 0x36, + 0x5b, 0xd1, 0xf5, 0x78, 0x92, 0x0f, 0xf5, 0x49, 0x6f, 0x5a, 0x4f, 0x3e, 0xf2, 0xde, 0x10, 0xf8, + 0x0c, 0xe3, 0x92, 0x8b, 0x33, 0x8c, 0x0b, 0x89, 0x83, 0xd0, 0xcc, 0x73, 0x19, 0x84, 0x62, 0xcf, + 0x30, 0x08, 0x7d, 0x17, 0xa2, 0x47, 0xd7, 0xed, 0x82, 0x67, 0xd0, 0x1c, 0x8a, 0xba, 0x24, 0x86, + 0xd9, 0x7f, 0xdc, 0x60, 0xc1, 0x76, 0xad, 0xe4, 0xfd, 0xed, 0xd1, 0x75, 0x7b, 0xab, 0xc3, 0x44, + 0xf0, 0x51, 0x56, 0x9a, 0x98, 0x74, 0x57, 0x9b, 0x4c, 0x7a, 0xa7, 0x8b, 0x6b, 0x77, 0x4b, 0xae, + 0xbb, 0x6e, 0x93, 0xeb, 0xa2, 0xc1, 0xf1, 0x6d, 0x7e, 0xd0, 0xf1, 0x8d, 0x6c, 0xc1, 0x1c, 0x3f, + 0xbb, 0x8e, 0x53, 0x29, 0xd8, 0xb4, 0x64, 0x1a, 0x9a, 0x2d, 0x2f, 0xae, 0x48, 0xab, 0x61, 0xde, + 0x89, 0xe1, 0xe6, 0x23, 0xa7, 0xb2, 0xcb, 0xb7, 0xc4, 0x4e, 0xac, 0x6d, 0xeb, 0xff, 0x93, 0xe0, + 0x53, 0x4f, 0x05, 0xff, 0x96, 0x60, 0x71, 0x9b, 0xf5, 0xb5, 0x6e, 0x8d, 0xd2, 0x7f, 0x40, 0xbd, + 0x0e, 0x49, 0x68, 0xcb, 0xa4, 0x01, 0xda, 0xb2, 0x33, 0xbf, 0xd4, 0xdf, 0x82, 0x29, 0x83, 0x3e, + 0x2e, 0xb4, 0x15, 0x5d, 0xbc, 0x3f, 0x0d, 0xfa, 0x78, 0xa7, 0xb3, 0xee, 0x46, 0x05, 0x58, 0xf9, + 0xdd, 0x08, 0x9c, 0xef, 0x70, 0xd4, 0xae, 0x99, 0x86, 0x4d, 0xc9, 0x2f, 0x25, 0x90, 0x2d, 0x7f, + 0x03, 0x3f, 0x31, 0xab, 0x7c, 0xf5, 0x8a, 0xc3, 0x7d, 0x8f, 0xae, 0xdf, 0xf0, 0x2e, 0xd8, 0x6e, + 0x02, 0x92, 0xf9, 0x36, 0xe6, 0x3c, 0xe7, 0xe5, 0x37, 0xef, 0xcb, 0xcd, 0x46, 0xe2, 0x92, 0xd5, + 0x9d, 0x42, 0xb0, 0xf6, 0x7c, 0x0f, 0x92, 0xb8, 0x05, 0x17, 0x4f, 0x93, 0x7f, 0x26, 0x69, 0x61, + 0xc0, 0x82, 0x30, 0x22, 0x71, 0x2f, 0xf1, 0x09, 0x73, 0x98, 0xc1, 0xe1, 0x0a, 0x8c, 0x51, 0xcb, + 0x32, 0x2d, 0x51, 0x27, 0x02, 0x22, 0x29, 0x02, 0xca, 0x87, 0x38, 0x49, 0x05, 0xf5, 0x91, 0x03, + 0x20, 0x7c, 0x8a, 0xe3, 0x6b, 0x77, 0x8c, 0xe3, 0xdf, 0x23, 0xde, 0x3e, 0xc6, 0xf9, 0x36, 0xa6, + 0x97, 0x9b, 0x8d, 0x44, 0x1c, 0x87, 0x35, 0x1f, 0x14, 0x23, 0x1d, 0x6b, 0xdf, 0x53, 0xfe, 0x36, + 0x09, 0x63, 0x78, 0xd1, 0x93, 0xcb, 0x30, 0x8a, 0xe3, 0x3f, 0xf7, 0x0e, 0x47, 0x60, 0x23, 0x38, + 0xfa, 0xe3, 0x3e, 0xc9, 0xc2, 0xac, 0x97, 0x88, 0x85, 0x7d, 0xb5, 0xe4, 0xb8, 0x5e, 0x4a, 0xe9, + 0x8b, 0xcd, 0x46, 0x42, 0xf6, 0xb6, 0x6e, 0xe3, 0x8e, 0xc0, 0x3c, 0x13, 0xdc, 0x21, 0x37, 0x20, + 0x8a, 0xfd, 0x0a, 0x6f, 0x5f, 0xdc, 0x79, 0x0e, 0xab, 0x2e, 0x83, 0x79, 0xdb, 0x21, 0x56, 0x5d, + 0x1f, 0x65, 0xc7, 0x01, 0xbb, 0x1c, 0x8f, 0x97, 0x8f, 0x4e, 0x78, 0x1c, 0x10, 0xef, 0x60, 0x8e, + 0x0a, 0x30, 0x29, 0xc3, 0x6c, 0xeb, 0x6a, 0xaf, 0xe8, 0x55, 0xdd, 0xf1, 0x5e, 0x66, 0x97, 0x31, + 0xb0, 0x18, 0x8c, 0xd6, 0x5d, 0x7e, 0x1f, 0x09, 0x78, 0x36, 0xb3, 0xe0, 0xca, 0x56, 0x60, 0x23, + 0xd0, 0x9a, 0xcc, 0x04, 0xf7, 0xc8, 0xef, 0x25, 0xb8, 0xdc, 0xa6, 0xa9, 0x50, 0x3c, 0x69, 0x9d, + 0xe2, 0x42, 0xa9, 0xa2, 0xda, 0x36, 0x7f, 0x72, 0x99, 0x10, 0xde, 0x69, 0xbb, 0x19, 0x90, 0x3e, + 0xf1, 0x4e, 0x73, 0x86, 0x31, 0xe5, 0xd4, 0x2a, 0xe5, 0x36, 0xa5, 0x9a, 0x8d, 0xc4, 0xab, 0x56, + 0x3f, 0x5a, 0x21, 0x14, 0x97, 0xfa, 0x12, 0x93, 0x5d, 0x88, 0xd6, 0xa8, 0x55, 0xd5, 0x6d, 0x1b, + 0xfb, 0x78, 0xfe, 0x86, 0xbc, 0x28, 0xd8, 0xb6, 0xe3, 0xef, 0xf2, 0xa8, 0x0b, 0xe4, 0x62, 0xd4, + 0x05, 0x38, 0xfe, 0x85, 0x04, 0x51, 0x81, 0x8f, 0xe4, 0x61, 0xd2, 0xae, 0x17, 0x0f, 0x69, 0xa9, + 0x55, 0x67, 0x96, 0xbb, 0x6b, 0x48, 0xee, 0x72, 0x32, 0xb7, 0x87, 0x70, 0x79, 0x02, 0x3d, 0x84, + 0x8b, 0xe1, 0x49, 0xa7, 0x56, 0x91, 0x3f, 0xce, 0x78, 0x27, 0x9d, 0x01, 0x81, 0x93, 0xce, 0x80, + 0xf8, 0x7b, 0x30, 0xe1, 0xca, 0x65, 0x79, 0x7f, 0xa4, 0x1b, 0x9a, 0x98, 0xf7, 0x6c, 0x2d, 0xe6, + 0x3d, 0x5b, 0xb7, 0xce, 0xc7, 0xc8, 0xe9, 0xe7, 0x23, 0xae, 0xc3, 0xb9, 0x2e, 0xd9, 0xf3, 0x14, + 0xb5, 0x4a, 0xea, 0x7b, 0x63, 0xfe, 0x4a, 0x82, 0xcb, 0x83, 0x25, 0xca, 0x60, 0xea, 0xef, 0x89, + 0xea, 0xbd, 0xd1, 0x2a, 0x20, 0xb0, 0x4d, 0x5b, 0xbf, 0x62, 0xfa, 0xf3, 0x31, 0xb8, 0x70, 0x0a, + 0x3f, 0x6b, 0xb9, 0x97, 0xaa, 0xea, 0xf7, 0xf5, 0x6a, 0xbd, 0xea, 0xf7, 0xdb, 0xfb, 0x96, 0x5a, + 0x62, 0xa5, 0xde, 0xcd, 0x8b, 0x6f, 0xf6, 0xb3, 0x22, 0xf9, 0x80, 0x4b, 0xf0, 0xd0, 0xdb, 0x2e, + 0xbf, 0x70, 0x07, 0x55, 0xbb, 0x53, 0x88, 0x77, 0x50, 0x0f, 0x12, 0xf2, 0x47, 0x09, 0x2e, 0xf5, + 0x34, 0x11, 0xcf, 0xb3, 0x69, 0x56, 0x30, 0xe3, 0xa2, 0xeb, 0x99, 0xa7, 0x35, 0x35, 0x7d, 0xb2, + 0x63, 0x9a, 0x15, 0x6e, 0xf0, 0xab, 0xcd, 0x46, 0xe2, 0x95, 0xea, 0x69, 0x74, 0x82, 0xd9, 0x2f, + 0x9c, 0x4a, 0xc8, 0x2e, 0xd0, 0xd3, 0x82, 0x73, 0x56, 0x49, 0xa9, 0xf4, 0x77, 0x73, 0x30, 0xd5, + 0x0f, 0x83, 0x09, 0xf9, 0x52, 0x67, 0x7c, 0x99, 0xc0, 0x21, 0x93, 0xf2, 0x4f, 0x23, 0x90, 0xe8, + 0x23, 0x83, 0xfc, 0x76, 0x80, 0xc4, 0xdc, 0x18, 0xc4, 0x9a, 0x33, 0x4d, 0xce, 0xaf, 0xe2, 0xfb, + 0x2a, 0x59, 0x88, 0x60, 0x91, 0xbe, 0xaf, 0xdb, 0x0e, 0xb9, 0x0e, 0xe3, 0xd8, 0xa2, 0x7a, 0x45, + 0x1c, 0xfc, 0x22, 0xce, 0x9b, 0x66, 0xbe, 0x2b, 0x36, 0xcd, 0x1c, 0x51, 0xf6, 0x80, 0xf0, 0x67, + 0xc9, 0x8a, 0xd0, 0xd7, 0x91, 0x5b, 0x30, 0x5d, 0xe2, 0x28, 0xd5, 0x84, 0xfe, 0x1b, 0x7f, 0x53, + 0x68, 0x6d, 0x04, 0xbb, 0xf0, 0x29, 0x11, 0x57, 0x6e, 0xc0, 0x2c, 0x6a, 0xbf, 0x43, 0x5b, 0xcf, + 0xd2, 0x03, 0x36, 0x36, 0xca, 0x2d, 0x90, 0x77, 0x1d, 0x8b, 0xaa, 0x55, 0xdd, 0x28, 0xb7, 0xcb, + 0x78, 0x11, 0xc2, 0x46, 0xbd, 0x8a, 0x22, 0xa6, 0x79, 0x20, 0x8d, 0x7a, 0x55, 0x0c, 0xa4, 0x51, + 0xaf, 0x2a, 0x6f, 0x01, 0x41, 0xbe, 0x4d, 0x5a, 0xa1, 0x0e, 0x1d, 0x56, 0xfd, 0x27, 0x12, 0x00, + 0x7f, 0xc7, 0xdc, 0x32, 0xf6, 0xcd, 0x81, 0xdb, 0xb1, 0x1b, 0x10, 0xc5, 0x88, 0x6a, 0x85, 0x43, + 0x13, 0xaf, 0x3e, 0x69, 0x75, 0x8c, 0xf7, 0x51, 0x1c, 0xde, 0x36, 0x03, 0xf7, 0x1f, 0xf8, 0x28, + 0x63, 0xad, 0x50, 0xd5, 0xf6, 0x58, 0xc3, 0x3e, 0x2b, 0x87, 0xdb, 0x59, 0x7d, 0x54, 0x79, 0x0c, + 0xe7, 0xd0, 0xd5, 0xbd, 0x9a, 0xa6, 0x3a, 0xfe, 0x38, 0xf1, 0xa6, 0xf8, 0x0b, 0x40, 0x30, 0x1b, + 0x4e, 0x9b, 0x6f, 0x86, 0x68, 0x97, 0xeb, 0x20, 0xa7, 0x55, 0xa7, 0x74, 0xd0, 0x4d, 0xfb, 0x7b, + 0x30, 0xbd, 0xaf, 0xea, 0x15, 0xef, 0x65, 0xcc, 0xcb, 0x49, 0xd9, 0xb7, 0x22, 0xc8, 0xc0, 0xd3, + 0x8a, 0xb3, 0xbc, 0xdd, 0x9e, 0xa7, 0x53, 0x22, 0xde, 0xf2, 0x37, 0x83, 0x6f, 0x27, 0x5f, 0x95, + 0xbf, 0x6d, 0xda, 0xfb, 0xfb, 0x1b, 0x64, 0x18, 0xc2, 0xdf, 0x28, 0x44, 0xb2, 0x86, 0xf6, 0x40, + 0xb5, 0x8e, 0xa8, 0xa5, 0x7c, 0x24, 0xc1, 0x42, 0xf0, 0x64, 0x3c, 0xa0, 0xb6, 0xad, 0x96, 0x29, + 0xf9, 0xfa, 0x70, 0xfe, 0xdf, 0x0d, 0xf9, 0xcf, 0xd4, 0x61, 0x6a, 0x68, 0x6e, 0x59, 0x9f, 0x41, + 0xb6, 0x96, 0x3e, 0x7e, 0xbe, 0xa8, 0xd8, 0x82, 0xdd, 0x0d, 0xe5, 0x19, 0x7d, 0x7a, 0x02, 0xc6, + 0xe8, 0x31, 0x35, 0x9c, 0xb5, 0x38, 0x44, 0x85, 0xdf, 0x68, 0x49, 0x14, 0x26, 0xdc, 0x65, 0x2c, + 0xb4, 0x76, 0x05, 0xa2, 0xc2, 0x8f, 0x79, 0x64, 0x0a, 0x26, 0x73, 0xa6, 0x46, 0x77, 0x4c, 0xcb, + 0x89, 0x85, 0xd8, 0xea, 0x2e, 0x55, 0xb5, 0x0a, 0x23, 0x95, 0xd6, 0x3e, 0x96, 0x60, 0xd2, 0xfb, + 0x61, 0x80, 0x00, 0x8c, 0xbf, 0xbd, 0x97, 0xdd, 0xcb, 0x6e, 0xc6, 0x42, 0x4c, 0xe0, 0x4e, 0x36, + 0xb7, 0xb9, 0x95, 0xbb, 0x13, 0x93, 0xd8, 0x22, 0xbf, 0x97, 0xcb, 0xb1, 0xc5, 0x08, 0x99, 0x86, + 0xc8, 0xee, 0x5e, 0x26, 0x93, 0xcd, 0x6e, 0x66, 0x37, 0x63, 0x61, 0xc6, 0x74, 0x7b, 0x63, 0xeb, + 0x7e, 0x76, 0x33, 0x36, 0xca, 0xe8, 0xf6, 0x72, 0xf7, 0x72, 0x0f, 0xdf, 0xcd, 0xc5, 0xc6, 0x38, + 0x5d, 0xfa, 0xc1, 0xd6, 0xa3, 0x47, 0xd9, 0xcd, 0xd8, 0x38, 0xa3, 0xbb, 0x9f, 0xdd, 0xd8, 0xcd, + 0x6e, 0xc6, 0x26, 0xd8, 0xd6, 0x4e, 0x3e, 0x9b, 0x7d, 0xb0, 0xc3, 0xb6, 0x26, 0xd9, 0x32, 0xb3, + 0x91, 0xcb, 0x64, 0xef, 0x33, 0x29, 0x11, 0x66, 0x61, 0x3e, 0xbb, 0x9d, 0xcd, 0xb0, 0x4d, 0x58, + 0xff, 0x43, 0x18, 0xa6, 0x30, 0xa0, 0xde, 0x93, 0xd3, 0x1b, 0x10, 0xe5, 0x5f, 0x95, 0x4f, 0x6d, + 0x42, 0xc8, 0xe3, 0x8b, 0x1d, 0x8f, 0x81, 0x59, 0x16, 0x3c, 0x25, 0x44, 0x6e, 0xc1, 0x94, 0xc0, + 0x64, 0x93, 0x19, 0x9f, 0x8b, 0x95, 0xf1, 0xf8, 0x0b, 0xb8, 0xee, 0x95, 0x68, 0x4a, 0x88, 0x69, + 0xe5, 0x67, 0x67, 0x48, 0xad, 0x02, 0x53, 0x7f, 0xad, 0xc1, 0xd3, 0xa9, 0x84, 0xc8, 0xb7, 0x20, + 0xca, 0x6b, 0x29, 0xd7, 0x7a, 0xde, 0xe7, 0x0f, 0x94, 0xd8, 0x53, 0x4c, 0x48, 0xc2, 0xe4, 0x1d, + 0xea, 0x70, 0xf6, 0x79, 0x9f, 0xdd, 0xaf, 0xec, 0x71, 0xc1, 0x15, 0x25, 0x44, 0xb6, 0x21, 0xe2, + 0xd1, 0xdb, 0x84, 0xdb, 0xd7, 0xeb, 0x4e, 0x88, 0xc7, 0xbb, 0x6c, 0xbb, 0x07, 0x43, 0x09, 0xbd, + 0x2e, 0xad, 0xff, 0x2c, 0x02, 0xe3, 0x7c, 0x46, 0x27, 0xef, 0x00, 0xf0, 0xbf, 0xb0, 0xee, 0x2e, + 0x74, 0xfd, 0x21, 0x36, 0xbe, 0xd8, 0x7d, 0xb0, 0x57, 0x96, 0x7e, 0xfc, 0x97, 0x7f, 0xfe, 0x62, + 0xe4, 0x9c, 0x32, 0x93, 0x3a, 0xbe, 0x96, 0x3a, 0x34, 0x8b, 0xee, 0xbf, 0x99, 0xdd, 0x94, 0xd6, + 0xc8, 0xbb, 0x00, 0xfc, 0x12, 0x0d, 0xca, 0x0d, 0xfc, 0xde, 0x17, 0xe7, 0x61, 0xeb, 0xbc, 0x6c, + 0x3b, 0x05, 0xf3, 0x9b, 0x94, 0x09, 0xfe, 0x1e, 0x4c, 0xb5, 0x04, 0xef, 0x52, 0x87, 0xc8, 0xc2, + 0x4f, 0x78, 0x41, 0xe9, 0xbd, 0x62, 0x7f, 0x11, 0x85, 0x2f, 0x2a, 0x73, 0xae, 0x70, 0x9b, 0x3a, + 0x82, 0x7c, 0x03, 0x62, 0xe2, 0x73, 0x12, 0x9a, 0x7f, 0xa1, 0xfb, 0x43, 0x13, 0x57, 0x73, 0xf1, + 0xb4, 0x57, 0x28, 0x25, 0x81, 0xca, 0x96, 0x94, 0x79, 0xcf, 0x13, 0xe1, 0x45, 0x89, 0x32, 0x7d, + 0xef, 0x41, 0xd4, 0xfd, 0xb1, 0x1a, 0x55, 0xb5, 0x42, 0x1d, 0xfc, 0x05, 0xbb, 0xa7, 0x33, 0x71, + 0x94, 0x3f, 0xaf, 0xcc, 0x7a, 0xf2, 0x6b, 0x9c, 0x8f, 0x89, 0xbe, 0x33, 0xfc, 0x81, 0x9c, 0x47, + 0x71, 0x33, 0x4a, 0x84, 0x89, 0xc3, 0x82, 0xc8, 0x04, 0x95, 0x9e, 0xed, 0x90, 0xbe, 0x84, 0x42, + 0x97, 0x95, 0x25, 0x26, 0xb4, 0xc8, 0xa8, 0xa8, 0x96, 0xe2, 0x6f, 0xfd, 0xee, 0xfd, 0xc0, 0x94, + 0xe4, 0x86, 0x3f, 0xc8, 0x17, 0x50, 0xf0, 0x42, 0x3c, 0xd6, 0xb2, 0x36, 0xf5, 0x43, 0xd6, 0x7a, + 0x7c, 0xe8, 0x1a, 0xfd, 0x2c, 0x67, 0xdc, 0x35, 0x3a, 0x1e, 0x30, 0xba, 0x8e, 0x34, 0x82, 0xd1, + 0xdf, 0x7e, 0xc6, 0x3a, 0x20, 0xa3, 0x16, 0xb2, 0xd6, 0xe1, 0x01, 0xb9, 0x3d, 0x54, 0x7d, 0x70, + 0xe5, 0x90, 0x4e, 0x39, 0xda, 0x73, 0xaa, 0x1b, 0x6e, 0xa2, 0x11, 0x22, 0xc6, 0x83, 0x07, 0xe2, + 0x75, 0x89, 0xdc, 0x84, 0xf1, 0xbb, 0xf8, 0xef, 0x96, 0xa4, 0x87, 0xa7, 0x71, 0x7e, 0x4e, 0x39, + 0x51, 0xe6, 0x80, 0x96, 0x8e, 0x5a, 0x77, 0xff, 0xfb, 0x9f, 0xfd, 0x63, 0x39, 0xf4, 0xa3, 0x27, + 0xcb, 0xd2, 0x9f, 0x9f, 0x2c, 0x4b, 0x9f, 0x3e, 0x59, 0x96, 0xfe, 0xfe, 0x64, 0x59, 0xfa, 0xe8, + 0xf3, 0xe5, 0xd0, 0xa7, 0x9f, 0x2f, 0x87, 0x3e, 0xfb, 0x7c, 0x39, 0xf4, 0x9d, 0x57, 0x84, 0xff, + 0x00, 0x55, 0xad, 0xaa, 0xaa, 0xa9, 0x35, 0xcb, 0x3c, 0xa4, 0x25, 0xc7, 0x5d, 0xa5, 0xdc, 0x7f, + 0xf9, 0xfc, 0x64, 0x64, 0x7e, 0x03, 0x81, 0x1d, 0xbe, 0x9d, 0xdc, 0x32, 0x93, 0x1b, 0x35, 0xbd, + 0x38, 0x8e, 0xb6, 0xbc, 0xf1, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xab, 0xa7, 0x17, 0x0f, + 0x2b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3706,18 +3707,20 @@ func (m *Job) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0xb0 } - { - size, err := m.SchedulingResourceRequirements.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.SchedulingResourceRequirements != nil { + { + size, err := m.SchedulingResourceRequirements.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSubmit(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSubmit(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xaa } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xaa if len(m.Scheduler) > 0 { i -= len(m.Scheduler) copy(dAtA[i:], m.Scheduler) @@ -4145,16 +4148,18 @@ func (m *Queue) MarshalToSizedBuffer(dAtA []byte) (int, error) { for k := range m.ResourceLimitsByPriorityClassName { v := m.ResourceLimitsByPriorityClassName[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSubmit(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSubmit(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintSubmit(dAtA, i, uint64(len(k))) @@ -4338,16 +4343,18 @@ func (m *PriorityClassResourceLimits) MarshalToSizedBuffer(dAtA []byte) (int, er for k := range m.MaximumResourceFractionByPool { v := m.MaximumResourceFractionByPool[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSubmit(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintSubmit(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintSubmit(dAtA, i, uint64(len(k))) @@ -5236,8 +5243,10 @@ func (m *Job) Size() (n int) { if l > 0 { n += 2 + l + sovSubmit(uint64(l)) } - l = m.SchedulingResourceRequirements.Size() - n += 2 + l + sovSubmit(uint64(l)) + if m.SchedulingResourceRequirements != nil { + l = m.SchedulingResourceRequirements.Size() + n += 2 + l + sovSubmit(uint64(l)) + } if m.QueueTtlSeconds != 0 { n += 2 + sovSubmit(uint64(m.QueueTtlSeconds)) } @@ -5362,8 +5371,12 @@ func (m *Queue) Size() (n int) { for k, v := range m.ResourceLimitsByPriorityClassName { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovSubmit(uint64(len(k))) + 1 + l + sovSubmit(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovSubmit(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovSubmit(uint64(len(k))) + l n += mapEntrySize + 1 + sovSubmit(uint64(mapEntrySize)) } } @@ -5426,8 +5439,12 @@ func (m *PriorityClassResourceLimits) Size() (n int) { for k, v := range m.MaximumResourceFractionByPool { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovSubmit(uint64(len(k))) + 1 + l + sovSubmit(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovSubmit(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovSubmit(uint64(len(k))) + l n += mapEntrySize + 1 + sovSubmit(uint64(mapEntrySize)) } } @@ -5901,7 +5918,7 @@ func (this *Job) String() string { `K8SService:` + repeatedStringForK8SService + `,`, `CompressedQueueOwnershipUserGroups:` + fmt.Sprintf("%v", this.CompressedQueueOwnershipUserGroups) + `,`, `Scheduler:` + fmt.Sprintf("%v", this.Scheduler) + `,`, - `SchedulingResourceRequirements:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.SchedulingResourceRequirements), "ResourceRequirements", "v1.ResourceRequirements", 1), `&`, ``, 1) + `,`, + `SchedulingResourceRequirements:` + strings.Replace(fmt.Sprintf("%v", this.SchedulingResourceRequirements), "ResourceRequirements", "v1.ResourceRequirements", 1) + `,`, `QueueTtlSeconds:` + fmt.Sprintf("%v", this.QueueTtlSeconds) + `,`, `}`, }, "") @@ -5990,7 +6007,7 @@ func (this *Queue) String() string { keysForResourceLimitsByPriorityClassName = append(keysForResourceLimitsByPriorityClassName, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForResourceLimitsByPriorityClassName) - mapStringForResourceLimitsByPriorityClassName := "map[string]PriorityClassResourceLimits{" + mapStringForResourceLimitsByPriorityClassName := "map[string]*PriorityClassResourceLimits{" for _, k := range keysForResourceLimitsByPriorityClassName { mapStringForResourceLimitsByPriorityClassName += fmt.Sprintf("%v: %v,", k, this.ResourceLimitsByPriorityClassName[k]) } @@ -6053,7 +6070,7 @@ func (this *PriorityClassResourceLimits) String() string { keysForMaximumResourceFractionByPool = append(keysForMaximumResourceFractionByPool, k) } github_com_gogo_protobuf_sortkeys.Strings(keysForMaximumResourceFractionByPool) - mapStringForMaximumResourceFractionByPool := "map[string]PriorityClassPoolResourceLimits{" + mapStringForMaximumResourceFractionByPool := "map[string]*PriorityClassPoolResourceLimits{" for _, k := range keysForMaximumResourceFractionByPool { mapStringForMaximumResourceFractionByPool += fmt.Sprintf("%v: %v,", k, this.MaximumResourceFractionByPool[k]) } @@ -9203,6 +9220,9 @@ func (m *Job) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.SchedulingResourceRequirements == nil { + m.SchedulingResourceRequirements = &v1.ResourceRequirements{} + } if err := m.SchedulingResourceRequirements.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -10085,10 +10105,10 @@ func (m *Queue) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ResourceLimitsByPriorityClassName == nil { - m.ResourceLimitsByPriorityClassName = make(map[string]PriorityClassResourceLimits) + m.ResourceLimitsByPriorityClassName = make(map[string]*PriorityClassResourceLimits) } var mapkey string - mapvalue := &PriorityClassResourceLimits{} + var mapvalue *PriorityClassResourceLimits for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -10182,7 +10202,7 @@ func (m *Queue) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.ResourceLimitsByPriorityClassName[mapkey] = *mapvalue + m.ResourceLimitsByPriorityClassName[mapkey] = mapvalue iNdEx = postIndex default: iNdEx = preIndex @@ -10600,10 +10620,10 @@ func (m *PriorityClassResourceLimits) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MaximumResourceFractionByPool == nil { - m.MaximumResourceFractionByPool = make(map[string]PriorityClassPoolResourceLimits) + m.MaximumResourceFractionByPool = make(map[string]*PriorityClassPoolResourceLimits) } var mapkey string - mapvalue := &PriorityClassPoolResourceLimits{} + var mapvalue *PriorityClassPoolResourceLimits for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -10697,7 +10717,7 @@ func (m *PriorityClassResourceLimits) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.MaximumResourceFractionByPool[mapkey] = *mapvalue + m.MaximumResourceFractionByPool[mapkey] = mapvalue iNdEx = postIndex default: iNdEx = preIndex diff --git a/pkg/api/submit.proto b/pkg/api/submit.proto index 5c9dbacbe27..fefc70db42a 100644 --- a/pkg/api/submit.proto +++ b/pkg/api/submit.proto @@ -135,7 +135,7 @@ message Job { // This is because containers run in parallel, whereas initContainers run serially. // This field is populated automatically at submission. // Submitting a job with this field already populated results in an error. - k8s.io.api.core.v1.ResourceRequirements scheduling_resource_requirements = 21 [(gogoproto.nullable) = false]; + k8s.io.api.core.v1.ResourceRequirements scheduling_resource_requirements = 21; google.protobuf.Timestamp created = 6; // Services can be provided either as Armada-specific config objects or as proper k8s objects. // These options are exclusive, i.e., if either ingress or services is provided, @@ -194,21 +194,21 @@ message Queue { map resource_limits = 5 [deprecated = true]; // Map from priority class name to resource limit overrides for this queue and priority class. // If provided for a priority class, global limits for that priority class do not apply to this queue. - map resource_limits_by_priority_class_name = 7 [(gogoproto.nullable) = false]; + map resource_limits_by_priority_class_name = 7; repeated Permissions permissions = 6; } message PriorityClassResourceLimits { // Limits resources assigned to jobs of this priority class. // Specifically, jobs of this priority class are only scheduled if doing so does not exceed this limit. - map maximum_resource_fraction = 1 [(gogoproto.nullable) = false]; + map maximum_resource_fraction = 1; // Per-pool override of maximum_resource_fraction. // If missing for a particular pool, maximum_resource_fraction is used instead for that pool. - map maximum_resource_fraction_by_pool = 2 [(gogoproto.nullable) = false]; + map maximum_resource_fraction_by_pool = 2; } message PriorityClassPoolResourceLimits { - map maximum_resource_fraction = 1 [(gogoproto.nullable) = false]; + map maximum_resource_fraction = 1; } // swagger:model diff --git a/pkg/armadaevents/events.pb.go b/pkg/armadaevents/events.pb.go index 6c8b802d274..2a316ff91a2 100644 --- a/pkg/armadaevents/events.pb.go +++ b/pkg/armadaevents/events.pb.go @@ -548,11 +548,11 @@ func (*EventSequence_Event) XXX_OneofWrappers() []interface{} { // Resource usage of a particular k8s object created as part of a job. type ResourceUtilisation struct { - RunId *Uuid `protobuf:"bytes,1,opt,name=run_id,json=runId,proto3" json:"runId,omitempty"` - JobId *Uuid `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"jobId,omitempty"` - ResourceInfo *KubernetesResourceInfo `protobuf:"bytes,3,opt,name=resource_info,json=resourceInfo,proto3" json:"resourceInfo,omitempty"` - MaxResourcesForPeriod map[string]resource.Quantity `protobuf:"bytes,4,rep,name=max_resources_for_period,json=maxResourcesForPeriod,proto3" json:"maxResourcesForPeriod" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - TotalCumulativeUsage map[string]resource.Quantity `protobuf:"bytes,5,rep,name=total_cumulative_usage,json=totalCumulativeUsage,proto3" json:"totalCumulativeUsage" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + RunId *Uuid `protobuf:"bytes,1,opt,name=run_id,json=runId,proto3" json:"runId,omitempty"` + JobId *Uuid `protobuf:"bytes,2,opt,name=job_id,json=jobId,proto3" json:"jobId,omitempty"` + ResourceInfo *KubernetesResourceInfo `protobuf:"bytes,3,opt,name=resource_info,json=resourceInfo,proto3" json:"resourceInfo,omitempty"` + MaxResourcesForPeriod map[string]*resource.Quantity `protobuf:"bytes,4,rep,name=max_resources_for_period,json=maxResourcesForPeriod,proto3" json:"maxResourcesForPeriod,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + TotalCumulativeUsage map[string]*resource.Quantity `protobuf:"bytes,5,rep,name=total_cumulative_usage,json=totalCumulativeUsage,proto3" json:"totalCumulativeUsage,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // This is a string representation of the job_id. Eventually we will retire the job_id field and just use strings JobIdStr string `protobuf:"bytes,6,opt,name=job_id_str,json=jobIdStr,proto3" json:"jobIdStr,omitempty"` RunIdStr string `protobuf:"bytes,7,opt,name=run_id_str,json=runIdStr,proto3" json:"runIdStr,omitempty"` @@ -612,14 +612,14 @@ func (m *ResourceUtilisation) GetResourceInfo() *KubernetesResourceInfo { return nil } -func (m *ResourceUtilisation) GetMaxResourcesForPeriod() map[string]resource.Quantity { +func (m *ResourceUtilisation) GetMaxResourcesForPeriod() map[string]*resource.Quantity { if m != nil { return m.MaxResourcesForPeriod } return nil } -func (m *ResourceUtilisation) GetTotalCumulativeUsage() map[string]resource.Quantity { +func (m *ResourceUtilisation) GetTotalCumulativeUsage() map[string]*resource.Quantity { if m != nil { return m.TotalCumulativeUsage } @@ -3905,8 +3905,8 @@ func init() { proto.RegisterType((*EventSequence)(nil), "armadaevents.EventSequence") proto.RegisterType((*EventSequence_Event)(nil), "armadaevents.EventSequence.Event") proto.RegisterType((*ResourceUtilisation)(nil), "armadaevents.ResourceUtilisation") - proto.RegisterMapType((map[string]resource.Quantity)(nil), "armadaevents.ResourceUtilisation.MaxResourcesForPeriodEntry") - proto.RegisterMapType((map[string]resource.Quantity)(nil), "armadaevents.ResourceUtilisation.TotalCumulativeUsageEntry") + proto.RegisterMapType((map[string]*resource.Quantity)(nil), "armadaevents.ResourceUtilisation.MaxResourcesForPeriodEntry") + proto.RegisterMapType((map[string]*resource.Quantity)(nil), "armadaevents.ResourceUtilisation.TotalCumulativeUsageEntry") proto.RegisterType((*Uuid)(nil), "armadaevents.Uuid") proto.RegisterType((*SubmitJob)(nil), "armadaevents.SubmitJob") proto.RegisterType((*KubernetesMainObject)(nil), "armadaevents.KubernetesMainObject") @@ -3960,247 +3960,247 @@ func init() { func init() { proto.RegisterFile("pkg/armadaevents/events.proto", fileDescriptor_6aab92ca59e015f8) } var fileDescriptor_6aab92ca59e015f8 = []byte{ - // 3831 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x3c, 0x4b, 0x6f, 0x1b, 0x47, - 0x9a, 0x6e, 0x92, 0xe2, 0xe3, 0xa3, 0x1e, 0x74, 0xe9, 0x61, 0x5a, 0xb6, 0x45, 0x99, 0xce, 0x6e, - 0xec, 0x20, 0xa1, 0x12, 0xc5, 0x09, 0xf2, 0x58, 0x24, 0x10, 0x6d, 0xc5, 0xb6, 0x62, 0xd9, 0x0a, - 0x65, 0x65, 0xbd, 0x41, 0x16, 0x4c, 0x93, 0x5d, 0xa2, 0xda, 0x22, 0xbb, 0x99, 0x7e, 0x28, 0x12, - 0x90, 0x43, 0xb2, 0x08, 0x76, 0x6f, 0x59, 0x1f, 0xf6, 0xb0, 0xb7, 0xec, 0x1e, 0x77, 0x17, 0xc1, - 0x02, 0x7b, 0xdc, 0xc7, 0x6d, 0x0f, 0x59, 0x60, 0x31, 0xc8, 0x69, 0x30, 0x27, 0xce, 0x4c, 0x32, - 0x33, 0x07, 0x02, 0x33, 0xff, 0x60, 0x80, 0x41, 0xbd, 0xba, 0xab, 0x9a, 0x4d, 0x9b, 0x96, 0xac, - 0x38, 0x41, 0x72, 0xb2, 0xfb, 0x7b, 0x56, 0xd5, 0xf7, 0xd5, 0x57, 0xdf, 0xf7, 0x55, 0x51, 0x70, - 0xae, 0xbb, 0xdb, 0x5a, 0xd2, 0x9d, 0x8e, 0x6e, 0xe8, 0x78, 0x0f, 0x5b, 0x9e, 0xbb, 0xc4, 0xfe, - 0xa9, 0x74, 0x1d, 0xdb, 0xb3, 0xd1, 0xb8, 0x8c, 0x9a, 0x2f, 0xef, 0xbe, 0xe2, 0x56, 0x4c, 0x7b, - 0x49, 0xef, 0x9a, 0x4b, 0x4d, 0xdb, 0xc1, 0x4b, 0x7b, 0x2f, 0x2c, 0xb5, 0xb0, 0x85, 0x1d, 0xdd, - 0xc3, 0x06, 0xe3, 0x98, 0xbf, 0x28, 0xd1, 0x58, 0xd8, 0xfb, 0xc8, 0x76, 0x76, 0x4d, 0xab, 0x15, - 0x47, 0x59, 0x6a, 0xd9, 0x76, 0xab, 0x8d, 0x97, 0xe8, 0x57, 0xc3, 0xdf, 0x5e, 0xf2, 0xcc, 0x0e, - 0x76, 0x3d, 0xbd, 0xd3, 0xe5, 0x04, 0x97, 0x43, 0x51, 0x1d, 0xbd, 0xb9, 0x63, 0x5a, 0xd8, 0x39, - 0x58, 0xa2, 0xe3, 0xed, 0x9a, 0x4b, 0x0e, 0x76, 0x6d, 0xdf, 0x69, 0xe2, 0x01, 0xb1, 0xcf, 0xb5, - 0x4c, 0x6f, 0xc7, 0x6f, 0x54, 0x9a, 0x76, 0x67, 0xa9, 0x65, 0xb7, 0xec, 0x50, 0x3e, 0xf9, 0xa2, - 0x1f, 0xf4, 0x7f, 0x9c, 0xfc, 0x35, 0xd3, 0xf2, 0xb0, 0x63, 0xe9, 0xed, 0x25, 0xb7, 0xb9, 0x83, - 0x0d, 0xbf, 0x8d, 0x9d, 0xf0, 0x7f, 0x76, 0xe3, 0x1e, 0x6e, 0x7a, 0xee, 0x00, 0x80, 0xf1, 0x96, - 0x7f, 0x3d, 0x0b, 0x13, 0xab, 0x64, 0x69, 0x36, 0xf1, 0x87, 0x3e, 0xb6, 0x9a, 0x18, 0x5d, 0x82, - 0xb1, 0x0f, 0x7d, 0xec, 0xe3, 0xa2, 0xb6, 0xa8, 0x5d, 0xcc, 0x55, 0xa7, 0xfb, 0xbd, 0xd2, 0x14, - 0x05, 0x3c, 0x6b, 0x77, 0x4c, 0x0f, 0x77, 0xba, 0xde, 0x41, 0x8d, 0x51, 0xa0, 0xd7, 0x60, 0xfc, - 0x9e, 0xdd, 0xa8, 0xbb, 0xd8, 0xab, 0x5b, 0x7a, 0x07, 0x17, 0x13, 0x94, 0xa3, 0xd8, 0xef, 0x95, - 0x66, 0xee, 0xd9, 0x8d, 0x4d, 0xec, 0xdd, 0xd2, 0x3b, 0x32, 0x1b, 0x84, 0x50, 0xf4, 0x1c, 0x64, - 0x7c, 0x17, 0x3b, 0x75, 0xd3, 0x28, 0x26, 0x29, 0xdb, 0x4c, 0xbf, 0x57, 0x2a, 0x10, 0xd0, 0x0d, - 0x43, 0x62, 0x49, 0x33, 0x08, 0x7a, 0x16, 0xd2, 0x2d, 0xc7, 0xf6, 0xbb, 0x6e, 0x31, 0xb5, 0x98, - 0x14, 0xd4, 0x0c, 0x22, 0x53, 0x33, 0x08, 0xba, 0x0d, 0x69, 0x66, 0xef, 0xe2, 0xd8, 0x62, 0xf2, - 0x62, 0x7e, 0xf9, 0x7c, 0x45, 0x76, 0x82, 0x8a, 0x32, 0x61, 0xf6, 0xc5, 0x04, 0x32, 0xbc, 0x2c, - 0x90, 0xbb, 0xcd, 0x7f, 0x4e, 0xc3, 0x18, 0xa5, 0x43, 0xb7, 0x21, 0xd3, 0x74, 0x30, 0x31, 0x56, - 0x11, 0x2d, 0x6a, 0x17, 0xf3, 0xcb, 0xf3, 0x15, 0xe6, 0x04, 0x15, 0x61, 0xa4, 0xca, 0x1d, 0xe1, - 0x04, 0xd5, 0xd3, 0xfd, 0x5e, 0xe9, 0x24, 0x27, 0x0f, 0xa5, 0xde, 0xff, 0x65, 0x49, 0xab, 0x09, - 0x29, 0x68, 0x03, 0x72, 0xae, 0xdf, 0xe8, 0x98, 0xde, 0x9a, 0xdd, 0xa0, 0x6b, 0x9e, 0x5f, 0x3e, - 0xa5, 0x0e, 0x77, 0x53, 0xa0, 0xab, 0xa7, 0xfa, 0xbd, 0xd2, 0x74, 0x40, 0x1d, 0x4a, 0xbc, 0x7e, - 0xa2, 0x16, 0x0a, 0x41, 0x3b, 0x30, 0xe5, 0xe0, 0xae, 0x63, 0xda, 0x8e, 0xe9, 0x99, 0x2e, 0x26, - 0x72, 0x13, 0x54, 0xee, 0x39, 0x55, 0x6e, 0x4d, 0x25, 0xaa, 0x9e, 0xeb, 0xf7, 0x4a, 0xa7, 0x23, - 0x9c, 0x8a, 0x8e, 0xa8, 0x58, 0xe4, 0x01, 0x8a, 0x80, 0x36, 0xb1, 0x47, 0xed, 0x99, 0x5f, 0x5e, - 0x7c, 0xa0, 0xb2, 0x4d, 0xec, 0x55, 0x17, 0xfb, 0xbd, 0xd2, 0xd9, 0x41, 0x7e, 0x45, 0x65, 0x8c, - 0x7c, 0xd4, 0x86, 0x82, 0x0c, 0x35, 0xc8, 0x04, 0x53, 0x54, 0xe7, 0xc2, 0x70, 0x9d, 0x84, 0xaa, - 0xba, 0xd0, 0xef, 0x95, 0xe6, 0xa3, 0xbc, 0x8a, 0xbe, 0x01, 0xc9, 0xc4, 0x3e, 0x4d, 0xdd, 0x6a, - 0xe2, 0x36, 0x51, 0x33, 0x16, 0x67, 0x9f, 0x2b, 0x02, 0xcd, 0xec, 0x13, 0x50, 0xab, 0xf6, 0x09, - 0xc0, 0xe8, 0x7d, 0x18, 0x0f, 0x3e, 0xc8, 0x7a, 0xa5, 0xb9, 0x1f, 0xc5, 0x0b, 0x25, 0x2b, 0x35, - 0xdf, 0xef, 0x95, 0xe6, 0x64, 0x1e, 0x45, 0xb4, 0x22, 0x2d, 0x94, 0xde, 0x66, 0x2b, 0x93, 0x19, - 0x2e, 0x9d, 0x51, 0xc8, 0xd2, 0xdb, 0x83, 0x2b, 0xa2, 0x48, 0x23, 0xd2, 0xc9, 0x26, 0xf6, 0x9b, - 0x4d, 0x8c, 0x0d, 0x6c, 0x14, 0xb3, 0x71, 0xd2, 0xd7, 0x24, 0x0a, 0x26, 0x5d, 0xe6, 0x51, 0xa5, - 0xcb, 0x18, 0xb2, 0xd6, 0xf7, 0xec, 0xc6, 0xaa, 0xe3, 0xd8, 0x8e, 0x5b, 0xcc, 0xc5, 0xad, 0xf5, - 0x9a, 0x40, 0xb3, 0xb5, 0x0e, 0xa8, 0xd5, 0xb5, 0x0e, 0xc0, 0x7c, 0xbc, 0x35, 0xdf, 0xba, 0x89, - 0x75, 0x17, 0x1b, 0x45, 0x18, 0x32, 0xde, 0x80, 0x22, 0x18, 0x6f, 0x00, 0x19, 0x18, 0x6f, 0x80, - 0x41, 0x06, 0x4c, 0xb2, 0xef, 0x15, 0xd7, 0x35, 0x5b, 0x16, 0x36, 0x8a, 0x79, 0x2a, 0xff, 0x6c, - 0x9c, 0x7c, 0x41, 0x53, 0x3d, 0xdb, 0xef, 0x95, 0x8a, 0x2a, 0x9f, 0xa2, 0x23, 0x22, 0x13, 0x7d, - 0x00, 0x13, 0x0c, 0x52, 0xf3, 0x2d, 0xcb, 0xb4, 0x5a, 0xc5, 0x71, 0xaa, 0xe4, 0x4c, 0x9c, 0x12, - 0x4e, 0x52, 0x3d, 0xd3, 0xef, 0x95, 0x4e, 0x29, 0x5c, 0x8a, 0x0a, 0x55, 0x20, 0x89, 0x18, 0x0c, - 0x10, 0x1a, 0x76, 0x22, 0x2e, 0x62, 0xac, 0xa9, 0x44, 0x2c, 0x62, 0x44, 0x38, 0xd5, 0x88, 0x11, - 0x41, 0x86, 0xf6, 0xe0, 0x46, 0x9e, 0x1c, 0x6e, 0x0f, 0x6e, 0x67, 0xc9, 0x1e, 0x31, 0xa6, 0x56, - 0xa4, 0xa1, 0x4f, 0x34, 0x98, 0x75, 0x3d, 0xdd, 0x32, 0xf4, 0xb6, 0x6d, 0xe1, 0x1b, 0x56, 0xcb, - 0xc1, 0xae, 0x7b, 0xc3, 0xda, 0xb6, 0x8b, 0x05, 0xaa, 0xe7, 0x42, 0x24, 0xb0, 0xc6, 0x91, 0x56, - 0x2f, 0xf4, 0x7b, 0xa5, 0x52, 0xac, 0x14, 0x45, 0x73, 0xbc, 0x22, 0xb4, 0x0f, 0xd3, 0xe2, 0x5c, - 0xdf, 0xf2, 0xcc, 0xb6, 0xe9, 0xea, 0x9e, 0x69, 0x5b, 0xc5, 0x93, 0x54, 0xff, 0xf9, 0x68, 0x7c, - 0x1a, 0x20, 0xac, 0x9e, 0xef, 0xf7, 0x4a, 0xe7, 0x62, 0x24, 0x28, 0xba, 0xe3, 0x54, 0x84, 0x46, - 0xdc, 0x70, 0x30, 0x21, 0xc4, 0x46, 0x71, 0x7a, 0xb8, 0x11, 0x03, 0x22, 0xd9, 0x88, 0x01, 0x30, - 0xce, 0x88, 0x01, 0x92, 0x68, 0xea, 0xea, 0x8e, 0x67, 0x12, 0xb5, 0xeb, 0xba, 0xb3, 0x8b, 0x9d, - 0xe2, 0x4c, 0x9c, 0xa6, 0x0d, 0x95, 0x88, 0x69, 0x8a, 0x70, 0xaa, 0x9a, 0x22, 0x48, 0x74, 0x5f, - 0x03, 0x75, 0x68, 0xa6, 0x6d, 0xd5, 0xc8, 0xc1, 0xed, 0x92, 0xe9, 0xcd, 0x52, 0xa5, 0x4f, 0x3f, - 0x60, 0x7a, 0x32, 0x79, 0xf5, 0xe9, 0x7e, 0xaf, 0x74, 0x61, 0xa8, 0x34, 0x65, 0x20, 0xc3, 0x95, - 0xa2, 0xbb, 0x90, 0x27, 0x48, 0x4c, 0x53, 0x20, 0xa3, 0x38, 0x47, 0xc7, 0x70, 0x7a, 0x70, 0x0c, - 0x9c, 0x80, 0xe6, 0x00, 0xb3, 0x12, 0x87, 0xa2, 0x47, 0x16, 0x85, 0x3e, 0xd3, 0x80, 0x38, 0x7a, - 0xdc, 0x4c, 0x4f, 0x51, 0x2d, 0x4f, 0x0d, 0x68, 0x89, 0x9b, 0xe6, 0x53, 0xfd, 0x5e, 0x69, 0x31, - 0x5e, 0x8e, 0xa2, 0x7b, 0x88, 0xae, 0xd0, 0x8f, 0x82, 0x43, 0xa2, 0x58, 0x1c, 0xee, 0x47, 0x01, - 0x91, 0xec, 0x47, 0x01, 0x30, 0xce, 0x8f, 0x02, 0x24, 0x0f, 0x06, 0xef, 0xea, 0x6d, 0xd3, 0xa0, - 0x09, 0xd5, 0xe9, 0x21, 0xc1, 0x20, 0xa0, 0x08, 0x82, 0x41, 0x00, 0x19, 0x08, 0x06, 0x21, 0x6d, - 0x06, 0xc6, 0xa8, 0x88, 0xf2, 0xcf, 0x33, 0x30, 0x1d, 0xb3, 0xd5, 0xd0, 0x1b, 0x90, 0x76, 0x7c, - 0x8b, 0x64, 0xa0, 0x2c, 0xed, 0x42, 0xaa, 0xe2, 0x2d, 0xdf, 0x34, 0x58, 0xfa, 0xeb, 0xf8, 0x96, - 0x92, 0x94, 0x8e, 0x51, 0x00, 0xe1, 0x27, 0xe9, 0xaf, 0x69, 0xf0, 0xf4, 0x6a, 0x28, 0xff, 0x3d, - 0xbb, 0xa1, 0xf2, 0x53, 0x00, 0xc2, 0x30, 0x21, 0xf6, 0x71, 0xdd, 0x24, 0x41, 0x2a, 0x19, 0x67, - 0xe5, 0xb7, 0xfd, 0x06, 0x76, 0x2c, 0xec, 0x61, 0x57, 0xcc, 0x81, 0x46, 0x29, 0xba, 0x12, 0x8e, - 0x04, 0x91, 0xe4, 0x8f, 0xcb, 0x70, 0xf4, 0x0f, 0x1a, 0x14, 0x3b, 0xfa, 0x7e, 0x5d, 0x00, 0xdd, - 0xfa, 0xb6, 0xed, 0xd4, 0xbb, 0xd8, 0x31, 0x6d, 0x83, 0x66, 0xd3, 0xf9, 0xe5, 0xbf, 0x78, 0x68, - 0x5c, 0xaa, 0xac, 0xeb, 0xfb, 0x02, 0xec, 0xbe, 0x65, 0x3b, 0x1b, 0x94, 0x7d, 0xd5, 0xf2, 0x9c, - 0x83, 0xea, 0xb9, 0xaf, 0x7a, 0xa5, 0x13, 0xc4, 0xcb, 0x3b, 0x71, 0x34, 0xb5, 0x78, 0x30, 0xfa, - 0x7b, 0x0d, 0xe6, 0x3c, 0xdb, 0xd3, 0xdb, 0xf5, 0xa6, 0xdf, 0xf1, 0xdb, 0xba, 0x67, 0xee, 0xe1, - 0xba, 0xef, 0xea, 0x2d, 0xcc, 0x93, 0xf6, 0xd7, 0x1f, 0x3e, 0xa8, 0x3b, 0x84, 0xff, 0x4a, 0xc0, - 0xbe, 0x45, 0xb8, 0xd9, 0x98, 0xce, 0xf2, 0x31, 0xcd, 0x78, 0x31, 0x24, 0xb5, 0x58, 0x28, 0xba, - 0x0c, 0xc0, 0xec, 0x59, 0x77, 0x3d, 0x87, 0x66, 0x65, 0xb9, 0xea, 0x5c, 0xbf, 0x57, 0x42, 0xd4, - 0x5c, 0x9b, 0x9e, 0x14, 0xab, 0x6a, 0x59, 0x01, 0x23, 0x5c, 0xcc, 0x8b, 0x28, 0x57, 0x26, 0xe4, - 0xa2, 0x4e, 0x12, 0xe1, 0x12, 0xb0, 0xf9, 0x7f, 0xd2, 0x60, 0x7e, 0xf8, 0x92, 0xa2, 0x0b, 0x90, - 0xdc, 0xc5, 0x07, 0xbc, 0x04, 0x3b, 0xd9, 0xef, 0x95, 0x26, 0x76, 0xf1, 0x81, 0x24, 0x88, 0x60, - 0xd1, 0x5f, 0xc1, 0xd8, 0x9e, 0xde, 0xf6, 0x31, 0x77, 0xbf, 0x4a, 0x85, 0x15, 0x9b, 0x15, 0xb9, - 0xd8, 0xac, 0x74, 0x77, 0x5b, 0x04, 0x50, 0x11, 0xd6, 0xaf, 0xbc, 0xe3, 0xeb, 0x96, 0x67, 0x7a, - 0x07, 0xcc, 0x35, 0xa9, 0x00, 0xd9, 0x35, 0x29, 0xe0, 0xb5, 0xc4, 0x2b, 0xda, 0xfc, 0x17, 0x1a, - 0x9c, 0x1e, 0xba, 0xc0, 0xdf, 0x87, 0x11, 0x96, 0xeb, 0x90, 0x22, 0x9b, 0x8c, 0x14, 0x87, 0x3b, - 0x66, 0x6b, 0xe7, 0xe5, 0xcb, 0x74, 0x38, 0x69, 0x56, 0xcb, 0x31, 0x88, 0x5c, 0xcb, 0x31, 0x08, - 0x29, 0x70, 0xdb, 0xf6, 0x47, 0x2f, 0x5f, 0xa6, 0x83, 0x4a, 0x33, 0x25, 0x14, 0x20, 0x2b, 0xa1, - 0x80, 0x72, 0x3f, 0x0d, 0xb9, 0xa0, 0xfa, 0x92, 0xf6, 0xbb, 0x76, 0xa8, 0xfd, 0x7e, 0x1d, 0x0a, - 0x06, 0x36, 0xfc, 0x6e, 0xdb, 0x6c, 0x52, 0xf7, 0x15, 0x91, 0x23, 0xc7, 0x42, 0xa7, 0x82, 0x53, - 0xf8, 0xa7, 0x22, 0x28, 0xb4, 0x0c, 0x59, 0x5e, 0xa5, 0x1c, 0xd0, 0xa0, 0x31, 0xc1, 0x3c, 0x4e, - 0xc0, 0x64, 0x8f, 0x13, 0x30, 0x54, 0x03, 0x60, 0xa5, 0xff, 0x3a, 0xf6, 0x74, 0x5e, 0x2f, 0x15, - 0xd5, 0x19, 0xdc, 0x0e, 0xf0, 0xac, 0x88, 0x0f, 0xe9, 0xe5, 0x22, 0x3e, 0x84, 0xa2, 0xf7, 0x01, - 0x3a, 0xba, 0x69, 0x31, 0x3e, 0x5e, 0x1c, 0x95, 0x87, 0x85, 0xaf, 0xf5, 0x80, 0x92, 0x49, 0x0f, - 0x39, 0x65, 0xe9, 0x21, 0x94, 0x94, 0xda, 0xbc, 0x59, 0x51, 0x4c, 0xd3, 0x88, 0xb0, 0x30, 0x4c, - 0x34, 0x17, 0x3b, 0x4b, 0xca, 0x6d, 0xce, 0x22, 0xc9, 0x14, 0x52, 0xc8, 0xb2, 0xb5, 0xcd, 0x6d, - 0xec, 0x99, 0x1d, 0x4c, 0x37, 0x2a, 0x5f, 0x36, 0x01, 0x93, 0x97, 0x4d, 0xc0, 0xd0, 0x2b, 0x00, - 0xba, 0xb7, 0x6e, 0xbb, 0xde, 0x6d, 0xab, 0x89, 0x69, 0xb9, 0x93, 0x65, 0xc3, 0x0f, 0xa1, 0xf2, - 0xf0, 0x43, 0x28, 0x7a, 0x1d, 0xf2, 0x5d, 0x7e, 0xbc, 0x36, 0xda, 0x98, 0x96, 0x33, 0x59, 0x96, - 0x0d, 0x48, 0x60, 0x89, 0x57, 0xa6, 0x46, 0xd7, 0x60, 0xaa, 0x69, 0x5b, 0x4d, 0xdf, 0x71, 0xb0, - 0xd5, 0x3c, 0xd8, 0xd4, 0xb7, 0x31, 0x2d, 0x5d, 0xb2, 0xcc, 0x55, 0x22, 0x28, 0xd9, 0x55, 0x22, - 0x28, 0xf4, 0x12, 0xe4, 0x82, 0xd6, 0x0f, 0xad, 0x4e, 0x72, 0xbc, 0x8b, 0x20, 0x80, 0x12, 0x73, - 0x48, 0x49, 0x06, 0x6f, 0xba, 0x57, 0xb9, 0xd3, 0x61, 0x5a, 0x71, 0xf0, 0xc1, 0x4b, 0x60, 0x79, - 0xf0, 0x12, 0x38, 0x12, 0x48, 0x27, 0x47, 0x0b, 0xa4, 0xe5, 0xff, 0xd7, 0x60, 0x26, 0xce, 0x5b, - 0x22, 0x9e, 0xab, 0x3d, 0x16, 0xcf, 0x7d, 0x17, 0xb2, 0x5d, 0xdb, 0xa8, 0xbb, 0x5d, 0xdc, 0xe4, - 0xc1, 0x29, 0xe2, 0xb7, 0x1b, 0xb6, 0xb1, 0xd9, 0xc5, 0xcd, 0xbf, 0x34, 0xbd, 0x9d, 0x95, 0x3d, - 0xdb, 0x34, 0x6e, 0x9a, 0x2e, 0x77, 0xb0, 0x2e, 0xc3, 0x28, 0x99, 0x47, 0x86, 0x03, 0xab, 0x59, - 0x48, 0x33, 0x2d, 0xe5, 0x9f, 0x25, 0xa1, 0x10, 0xf5, 0xd0, 0x1f, 0xd2, 0x54, 0xd0, 0x5d, 0xc8, - 0x98, 0xac, 0xb0, 0xe1, 0x89, 0xc9, 0x9f, 0x49, 0xe1, 0xbb, 0x12, 0x36, 0x46, 0x2b, 0x7b, 0x2f, - 0x54, 0x78, 0x05, 0x44, 0x97, 0x80, 0x4a, 0xe6, 0x9c, 0xaa, 0x64, 0x0e, 0x44, 0x35, 0xc8, 0xb8, - 0xd8, 0xd9, 0x33, 0x9b, 0x98, 0xc7, 0xa1, 0x92, 0x2c, 0xb9, 0x69, 0x3b, 0x98, 0xc8, 0xdc, 0x64, - 0x24, 0xa1, 0x4c, 0xce, 0xa3, 0xca, 0xe4, 0x40, 0xf4, 0x2e, 0xe4, 0x9a, 0xb6, 0xb5, 0x6d, 0xb6, - 0xd6, 0xf5, 0x2e, 0x8f, 0x44, 0xe7, 0xe2, 0xa4, 0x5e, 0x11, 0x44, 0xbc, 0x59, 0x23, 0x3e, 0x23, - 0xcd, 0x9a, 0x80, 0x2a, 0x34, 0xe8, 0x1f, 0x52, 0x00, 0xa1, 0x71, 0xd0, 0xab, 0x90, 0xc7, 0xfb, - 0xb8, 0xe9, 0x7b, 0xb6, 0x23, 0x8e, 0x04, 0xde, 0xfb, 0x14, 0x60, 0x25, 0x86, 0x43, 0x08, 0x25, - 0x7b, 0xd2, 0xd2, 0x3b, 0xd8, 0xed, 0xea, 0x4d, 0xd1, 0x34, 0xa5, 0x83, 0x09, 0x80, 0xf2, 0x9e, - 0x0c, 0x80, 0xe8, 0xcf, 0x21, 0x45, 0xdb, 0xac, 0xac, 0x5f, 0x8a, 0xfa, 0xbd, 0xd2, 0xa4, 0xa5, - 0x36, 0x58, 0x29, 0x1e, 0xbd, 0x09, 0x13, 0xbb, 0x81, 0xe3, 0x91, 0xb1, 0xa5, 0x28, 0x03, 0xcd, - 0x18, 0x43, 0x84, 0x32, 0xba, 0x71, 0x19, 0x8e, 0xb6, 0x21, 0xaf, 0x5b, 0x96, 0xed, 0xd1, 0xe3, - 0x46, 0xf4, 0x50, 0x2f, 0x0d, 0x73, 0xd3, 0xca, 0x4a, 0x48, 0xcb, 0x92, 0x2f, 0x1a, 0x27, 0x24, - 0x09, 0x72, 0x9c, 0x90, 0xc0, 0xa8, 0x06, 0xe9, 0xb6, 0xde, 0xc0, 0x6d, 0x11, 0xdf, 0x9f, 0x1a, - 0xaa, 0xe2, 0x26, 0x25, 0x63, 0xd2, 0xe9, 0xe9, 0xce, 0xf8, 0xe4, 0xd3, 0x9d, 0x41, 0xe6, 0xb7, - 0xa1, 0x10, 0x1d, 0xcf, 0x68, 0xb9, 0xca, 0x25, 0x39, 0x57, 0xc9, 0x3d, 0x34, 0x3b, 0xd2, 0x21, - 0x2f, 0x0d, 0xea, 0x38, 0x54, 0x94, 0xff, 0x45, 0x83, 0x99, 0xb8, 0xbd, 0x8b, 0xd6, 0xa5, 0x1d, - 0xaf, 0xf1, 0x5e, 0x50, 0x8c, 0xab, 0x73, 0xde, 0x21, 0x5b, 0x3d, 0xdc, 0xe8, 0x55, 0x98, 0xb4, - 0x6c, 0x03, 0xd7, 0x75, 0xa2, 0xa0, 0x6d, 0xba, 0x5e, 0x31, 0x41, 0x7b, 0xec, 0xb4, 0x87, 0x44, - 0x30, 0x2b, 0x02, 0x21, 0x71, 0x4f, 0x28, 0x88, 0xf2, 0x7f, 0x69, 0x30, 0x15, 0x69, 0xf1, 0x1e, - 0x39, 0x5f, 0x92, 0xb3, 0x9c, 0xc4, 0x88, 0x59, 0x8e, 0x7a, 0xf4, 0x24, 0x47, 0x3c, 0x7a, 0xfe, - 0x2f, 0x01, 0x79, 0xa9, 0x66, 0x3f, 0xf2, 0xc8, 0xef, 0xc1, 0x14, 0x3f, 0x4a, 0x4d, 0xab, 0xc5, - 0x6a, 0xbb, 0x04, 0x6f, 0x40, 0x0d, 0xdc, 0xc3, 0xac, 0xd9, 0x8d, 0xcd, 0x80, 0x96, 0x96, 0x76, - 0xb4, 0x3f, 0xe8, 0x2a, 0x30, 0x49, 0xc5, 0xa4, 0x8a, 0x41, 0x77, 0x61, 0xce, 0xef, 0x92, 0x8a, - 0xb7, 0xee, 0xf2, 0x1b, 0x8d, 0xba, 0xe5, 0x77, 0x1a, 0x98, 0xcd, 0x7e, 0xac, 0x5a, 0xee, 0xf7, - 0x4a, 0x0b, 0x8c, 0x42, 0x5c, 0x79, 0xdc, 0xa2, 0x78, 0x49, 0xe6, 0x4c, 0x1c, 0x3e, 0xb2, 0x96, - 0xa9, 0x11, 0xd7, 0xf2, 0x3a, 0xa0, 0xc1, 0x5e, 0xbf, 0x62, 0x4b, 0x6d, 0x34, 0x5b, 0x96, 0xff, - 0x5b, 0x83, 0x42, 0xb4, 0x85, 0xff, 0x03, 0x72, 0xaa, 0x7f, 0xd7, 0x20, 0x17, 0x74, 0xf1, 0x8f, - 0x3c, 0xee, 0x67, 0x21, 0xed, 0x60, 0xdd, 0xb5, 0x2d, 0x1e, 0x3c, 0x68, 0x14, 0x64, 0x10, 0x39, - 0x0a, 0x32, 0xc8, 0x21, 0x47, 0x7c, 0x07, 0xc6, 0x99, 0xb9, 0xde, 0x32, 0xdb, 0x1e, 0x76, 0xd0, - 0x55, 0x48, 0xbb, 0x9e, 0xee, 0x61, 0xb7, 0xa8, 0x2d, 0x26, 0x2f, 0x4e, 0x2e, 0xcf, 0x0d, 0xb6, - 0xf9, 0x09, 0x9a, 0x8d, 0x85, 0x51, 0xca, 0x63, 0x61, 0x90, 0xf2, 0xdf, 0x68, 0x30, 0x2e, 0xdf, - 0x66, 0x3c, 0x1e, 0xb1, 0x8f, 0xb6, 0x20, 0xe5, 0xff, 0x08, 0x06, 0xd1, 0x7e, 0x3c, 0x7e, 0xf4, - 0x5d, 0xd8, 0xe3, 0xf7, 0x1a, 0x33, 0x48, 0xd0, 0x3d, 0x3f, 0xea, 0xa0, 0x5b, 0x61, 0xc7, 0x89, - 0xc4, 0x0e, 0x97, 0x06, 0xfa, 0x51, 0x3b, 0x4e, 0xf4, 0x38, 0x50, 0xd8, 0xe5, 0xe3, 0x40, 0x41, - 0x1c, 0x72, 0xbe, 0x9f, 0xa4, 0xe9, 0x7c, 0xc3, 0xfb, 0x95, 0x27, 0xdd, 0xa1, 0x8b, 0xe4, 0x78, - 0xc9, 0x47, 0xc8, 0xf1, 0x9e, 0x83, 0x0c, 0x3d, 0x54, 0x83, 0xf4, 0x8b, 0x3a, 0x08, 0x01, 0xa9, - 0xf7, 0xdb, 0x0c, 0xf2, 0x80, 0x28, 0x3e, 0x76, 0xc4, 0x28, 0x5e, 0x87, 0xd3, 0x3b, 0xba, 0x5b, - 0x17, 0xe7, 0x8e, 0x51, 0xd7, 0xbd, 0x7a, 0x10, 0x01, 0xd3, 0xb4, 0xae, 0xa3, 0x1d, 0xe3, 0x1d, - 0xdd, 0xdd, 0x14, 0x34, 0x2b, 0xde, 0xc6, 0x60, 0x3c, 0x9c, 0x8b, 0xa7, 0x40, 0x5b, 0x30, 0x1b, - 0x2f, 0x3c, 0x43, 0x47, 0x4e, 0x2f, 0x34, 0xdc, 0x07, 0x4a, 0x9e, 0x8e, 0x41, 0xa3, 0x4f, 0x35, - 0x28, 0x92, 0x2c, 0xc7, 0xc1, 0x1f, 0xfa, 0xa6, 0x83, 0x3b, 0xc4, 0x62, 0x75, 0x7b, 0x0f, 0x3b, - 0x6d, 0xfd, 0x80, 0xdf, 0x0d, 0x9e, 0x1f, 0x3c, 0x4d, 0x37, 0x6c, 0xa3, 0x26, 0x31, 0xb0, 0xa9, - 0x75, 0x55, 0xe0, 0x6d, 0x26, 0x44, 0x9e, 0x5a, 0x3c, 0x45, 0xc4, 0x8d, 0xe1, 0x50, 0x1d, 0xc1, - 0xfc, 0x68, 0x1d, 0xc1, 0xb5, 0x54, 0x36, 0x5b, 0xc8, 0x95, 0x7f, 0x9b, 0x80, 0x49, 0xf5, 0xba, - 0xf0, 0x89, 0x6f, 0x82, 0x81, 0xa0, 0x91, 0xfc, 0x4e, 0x82, 0x46, 0xea, 0x50, 0xab, 0x3d, 0x36, - 0xda, 0x6a, 0x97, 0x7f, 0x93, 0x80, 0x09, 0xe5, 0xc6, 0xf4, 0xa7, 0x65, 0x3e, 0x8e, 0x65, 0xfe, - 0xc7, 0x04, 0xcc, 0xc5, 0x0f, 0xf9, 0x58, 0x5a, 0x21, 0xd7, 0x81, 0x14, 0x35, 0x37, 0xc2, 0x7c, - 0x7b, 0x76, 0xa0, 0x13, 0x42, 0x97, 0x4b, 0x54, 0x44, 0x03, 0x97, 0xba, 0x82, 0x1d, 0xdd, 0x85, - 0xbc, 0x29, 0x5d, 0x1f, 0x27, 0xe3, 0x6e, 0xf9, 0xe4, 0x4b, 0x63, 0xd6, 0x1a, 0x1b, 0x72, 0x55, - 0x2c, 0x8b, 0xaa, 0xa6, 0x21, 0x45, 0x0a, 0x82, 0xf2, 0x1e, 0x64, 0xf8, 0x70, 0xd0, 0x8b, 0x90, - 0xa3, 0x67, 0x05, 0xad, 0xee, 0xb5, 0x70, 0x69, 0x09, 0x30, 0xf2, 0x84, 0x2a, 0x2b, 0x60, 0xe8, - 0x65, 0x00, 0x12, 0x1e, 0xf9, 0x29, 0x91, 0xa0, 0xb1, 0x96, 0x76, 0x11, 0xba, 0xb6, 0x31, 0x70, - 0x34, 0xe4, 0x02, 0x60, 0xf9, 0xcb, 0x04, 0xe4, 0xe5, 0x0b, 0xeb, 0x43, 0x29, 0xff, 0x18, 0x44, - 0x87, 0xa7, 0xae, 0x1b, 0x06, 0xf9, 0x17, 0x8b, 0x64, 0x62, 0x69, 0xe8, 0x22, 0x89, 0xff, 0xaf, - 0x08, 0x0e, 0x56, 0xcf, 0xd3, 0x47, 0x39, 0x66, 0x04, 0x25, 0x69, 0x2d, 0x44, 0x71, 0xf3, 0xbb, - 0x30, 0x1b, 0x2b, 0x4a, 0xae, 0xc2, 0xc7, 0x1e, 0x57, 0x15, 0xfe, 0x65, 0x1a, 0x66, 0x63, 0x1f, - 0x0a, 0x3c, 0xf1, 0x88, 0xa1, 0xee, 0xa0, 0xe4, 0x63, 0xd9, 0x41, 0x7f, 0xab, 0xc5, 0x59, 0x96, - 0xdd, 0x12, 0xbe, 0x3a, 0xc2, 0xeb, 0x89, 0xc7, 0x65, 0x63, 0xd5, 0x2d, 0xc7, 0x0e, 0xb5, 0x27, - 0xd2, 0xa3, 0xee, 0x09, 0xf4, 0x3c, 0x6b, 0xa8, 0x50, 0x5d, 0xec, 0x06, 0x4f, 0x44, 0x88, 0x88, - 0xaa, 0x0c, 0x07, 0xa1, 0x37, 0x61, 0x42, 0x70, 0xb0, 0x36, 0x5e, 0x36, 0xec, 0xb1, 0x71, 0x9a, - 0x68, 0x27, 0x6f, 0x5c, 0x86, 0x47, 0xa2, 0x70, 0xee, 0x50, 0x51, 0x18, 0x46, 0xbc, 0x6c, 0xfc, - 0x4e, 0xf7, 0xcb, 0xef, 0x12, 0x30, 0x15, 0x79, 0x27, 0xf4, 0xd3, 0xd9, 0x7a, 0x1c, 0x67, 0xeb, - 0xff, 0x6a, 0x90, 0x0b, 0x9e, 0xc3, 0x1d, 0xb9, 0x34, 0x5c, 0x81, 0x34, 0x66, 0x4f, 0xb2, 0x58, - 0x18, 0x9f, 0x8e, 0x3c, 0x99, 0x25, 0x38, 0xfe, 0x48, 0x36, 0xf2, 0x0a, 0xab, 0xc6, 0x19, 0x0f, - 0x59, 0xf4, 0xfd, 0x4f, 0x42, 0x14, 0x7d, 0xe1, 0x4c, 0x9e, 0xa8, 0xb3, 0x84, 0x2b, 0x91, 0x7c, - 0x3c, 0x2b, 0x71, 0xbc, 0x6e, 0xf0, 0xcf, 0x00, 0x63, 0x74, 0x4c, 0x68, 0x19, 0xb2, 0x1e, 0x76, - 0x3a, 0xa6, 0xa5, 0xb7, 0xe9, 0xd2, 0x65, 0x19, 0xb7, 0x80, 0xc9, 0xdc, 0x02, 0x86, 0x76, 0x60, - 0x2a, 0x6c, 0xfd, 0x53, 0x31, 0xf1, 0x6f, 0x85, 0xdf, 0x56, 0x89, 0xd8, 0x35, 0x64, 0x84, 0x53, - 0x7d, 0xec, 0x13, 0x41, 0x22, 0x03, 0x26, 0x9b, 0xb6, 0xe5, 0xe9, 0xa6, 0x85, 0x1d, 0xa6, 0x28, - 0x19, 0xf7, 0x56, 0xf2, 0x8a, 0x42, 0xc3, 0x7a, 0xa1, 0x2a, 0x9f, 0xfa, 0x56, 0x52, 0xc5, 0xa1, - 0x0f, 0x60, 0x42, 0x14, 0xe1, 0x4c, 0x49, 0x2a, 0xee, 0xad, 0xe4, 0xaa, 0x4c, 0xc2, 0x36, 0xb8, - 0xc2, 0xa5, 0xbe, 0x95, 0x54, 0x50, 0xa8, 0x0d, 0x85, 0xae, 0x6d, 0x6c, 0x59, 0xbc, 0xf4, 0xd4, - 0x1b, 0x6d, 0xcc, 0xef, 0x9b, 0x16, 0x06, 0x92, 0x4d, 0x85, 0x8a, 0x1d, 0x82, 0x51, 0x5e, 0xf5, - 0xf5, 0x71, 0x14, 0x8b, 0xde, 0x87, 0xf1, 0x36, 0xd6, 0x5d, 0xbc, 0xba, 0xdf, 0x35, 0x1d, 0x6c, - 0xc4, 0xbf, 0x15, 0xbe, 0x29, 0x51, 0xb0, 0x23, 0x48, 0xe6, 0x51, 0x9f, 0x48, 0xc9, 0x18, 0x62, - 0xfd, 0x8e, 0xbe, 0x5f, 0xf3, 0x2d, 0x77, 0x75, 0x9f, 0xbf, 0xfb, 0xcc, 0xc4, 0x59, 0x7f, 0x5d, - 0x25, 0x62, 0xd6, 0x8f, 0x70, 0xaa, 0xd6, 0x8f, 0x20, 0xd1, 0x4d, 0x7a, 0xc2, 0x32, 0x93, 0xb0, - 0x37, 0xc3, 0x73, 0x03, 0xab, 0xc5, 0xac, 0xc1, 0xda, 0xb1, 0xfc, 0x4b, 0x11, 0x1a, 0x48, 0xe0, - 0x36, 0xa0, 0xd3, 0xae, 0x61, 0xcf, 0x77, 0x2c, 0x6c, 0xf0, 0x96, 0xc0, 0xa0, 0x0d, 0x14, 0xaa, - 0xc0, 0x06, 0x0a, 0x74, 0xc0, 0x06, 0x0a, 0x96, 0xf8, 0x54, 0xd7, 0x36, 0xee, 0xb0, 0x2d, 0xe3, - 0x05, 0x8f, 0x88, 0xcf, 0x0c, 0xa8, 0x0a, 0x49, 0x98, 0x4f, 0x29, 0x5c, 0xaa, 0x4f, 0x29, 0x28, - 0xf4, 0x31, 0xcc, 0x44, 0xde, 0x58, 0xb2, 0x95, 0xca, 0xc7, 0x5d, 0xe7, 0xae, 0xc5, 0x50, 0xb2, - 0xfe, 0x50, 0x9c, 0x0c, 0x45, 0x6d, 0xac, 0x16, 0xa2, 0xbd, 0xa5, 0x5b, 0xad, 0x35, 0xbb, 0xa1, - 0x7a, 0xf5, 0x78, 0x9c, 0xf6, 0x6b, 0x31, 0x94, 0x4c, 0x7b, 0x9c, 0x0c, 0x55, 0x7b, 0x1c, 0x45, - 0xf0, 0x9e, 0x92, 0xa4, 0xa0, 0xc1, 0xbb, 0xe3, 0xb8, 0xf7, 0x94, 0x8c, 0x40, 0x7a, 0x4f, 0xc9, - 0x00, 0x31, 0xef, 0x29, 0x39, 0x65, 0x56, 0xb4, 0x68, 0xcb, 0x5f, 0x68, 0x30, 0x15, 0x89, 0x60, - 0xe8, 0x0d, 0x08, 0x9e, 0xc9, 0xdd, 0x39, 0xe8, 0x8a, 0xd2, 0x47, 0x79, 0x56, 0x47, 0xe0, 0x71, - 0xcf, 0xea, 0x08, 0x1c, 0xdd, 0x04, 0x08, 0xce, 0xfe, 0x07, 0x1d, 0x35, 0x34, 0xef, 0x0e, 0x29, - 0xe5, 0xbc, 0x3b, 0x84, 0x96, 0xef, 0xa7, 0x20, 0x2b, 0xb6, 0xc0, 0xb1, 0x94, 0xc6, 0x4b, 0x90, - 0xe9, 0x60, 0x97, 0x3e, 0xaf, 0x4b, 0x84, 0x19, 0x2e, 0x07, 0xc9, 0x19, 0x2e, 0x07, 0xa9, 0x09, - 0x78, 0xf2, 0x50, 0x09, 0x78, 0x6a, 0xe4, 0x04, 0x1c, 0xd3, 0xe7, 0x2e, 0x52, 0x20, 0x17, 0xb7, - 0xce, 0x0f, 0x3e, 0x1d, 0xc4, 0x63, 0x18, 0x99, 0x31, 0xf2, 0x18, 0x46, 0x46, 0xa1, 0x5d, 0x38, - 0x29, 0xdd, 0x8c, 0xf3, 0xfe, 0x3d, 0x09, 0xa9, 0x93, 0xc3, 0xdf, 0x16, 0xd5, 0x28, 0x15, 0x0b, - 0x1c, 0xbb, 0x11, 0xa8, 0x5c, 0xc1, 0x44, 0x71, 0xc4, 0xc1, 0x0c, 0xdc, 0xf0, 0x5b, 0xeb, 0x7c, - 0xd9, 0x33, 0xa1, 0x83, 0xc9, 0x70, 0xd9, 0xc1, 0x64, 0x38, 0x6d, 0x05, 0xaa, 0xf3, 0x3d, 0x16, - 0xc7, 0x78, 0x11, 0x72, 0x78, 0xdf, 0xf4, 0xea, 0x4d, 0xdb, 0xc0, 0xbc, 0x8d, 0x40, 0xed, 0x4c, - 0x80, 0x57, 0x6c, 0x43, 0xb1, 0xb3, 0x80, 0xc9, 0xde, 0x94, 0x1c, 0xc9, 0x9b, 0xc2, 0xeb, 0x92, - 0xd4, 0x08, 0xd7, 0x25, 0xb1, 0x76, 0xca, 0x1d, 0x8f, 0x9d, 0xca, 0x5f, 0x27, 0xa0, 0x10, 0x3d, - 0x27, 0xbe, 0x1f, 0x5b, 0x50, 0xdd, 0x4d, 0xc9, 0x91, 0x77, 0xd3, 0x9b, 0x30, 0x41, 0x12, 0x49, - 0xdd, 0xf3, 0xf8, 0xef, 0x00, 0x52, 0x34, 0x1b, 0x64, 0xb1, 0xcd, 0xb7, 0x56, 0x04, 0x5c, 0x89, - 0x6d, 0x12, 0x7c, 0xc0, 0x75, 0xc7, 0x1e, 0xd1, 0x75, 0x3f, 0x4d, 0xc0, 0x84, 0x72, 0x1e, 0xfe, - 0xf8, 0x42, 0x5a, 0x79, 0x0a, 0x26, 0x94, 0x34, 0xb3, 0xfc, 0x19, 0xf3, 0x33, 0xf5, 0xf4, 0xfb, - 0xf1, 0xad, 0xcb, 0x24, 0x8c, 0xcb, 0xf9, 0x6a, 0xb9, 0x0a, 0x53, 0x91, 0xf4, 0x52, 0x9e, 0x80, - 0x36, 0xca, 0x04, 0xca, 0x73, 0x30, 0x13, 0x97, 0x15, 0x95, 0xaf, 0xc1, 0x4c, 0x5c, 0xbe, 0xf2, - 0xe8, 0x0a, 0xde, 0xe0, 0xef, 0x43, 0x58, 0x66, 0xf1, 0xe8, 0xfc, 0xff, 0x96, 0x12, 0x4d, 0x91, - 0xf0, 0x57, 0x34, 0xef, 0x41, 0xa1, 0x2b, 0x3e, 0xea, 0x0f, 0xad, 0xdd, 0x69, 0x21, 0x14, 0xd0, - 0xaf, 0x45, 0x4a, 0xd7, 0x49, 0x15, 0xa3, 0xca, 0xe6, 0xd5, 0x74, 0x62, 0x44, 0xd9, 0xb5, 0x48, - 0x59, 0x3d, 0xa9, 0x62, 0xd0, 0x5f, 0xc3, 0x49, 0xf1, 0x52, 0x75, 0x0f, 0x8b, 0x81, 0x27, 0x87, - 0x0a, 0x67, 0x3f, 0xfa, 0x09, 0x18, 0xa2, 0x23, 0x9f, 0x8a, 0xa0, 0x22, 0xe2, 0xf9, 0xd8, 0x53, - 0xa3, 0x8a, 0x8f, 0x0e, 0x7e, 0x2a, 0x82, 0x42, 0x1b, 0x30, 0x13, 0x5d, 0x75, 0xa9, 0xdc, 0x2e, - 0xf5, 0x7b, 0xa5, 0x33, 0xea, 0x5a, 0xaa, 0x75, 0xf7, 0xc9, 0x01, 0xa4, 0x2a, 0x51, 0x2a, 0xe0, - 0xd3, 0x31, 0x12, 0x6b, 0x83, 0x95, 0xfc, 0xc9, 0x01, 0x64, 0xf9, 0x73, 0x0d, 0xa6, 0x22, 0xbf, - 0x9d, 0x42, 0x57, 0x21, 0x4b, 0x7f, 0xdc, 0xfc, 0x60, 0x2f, 0xa1, 0x7e, 0x48, 0xe9, 0x94, 0x55, - 0xc8, 0x70, 0x10, 0x7a, 0x09, 0x72, 0xc1, 0x4f, 0xac, 0xf8, 0xf3, 0x17, 0xb6, 0x67, 0x05, 0x50, - 0xd9, 0xb3, 0x02, 0x58, 0xfe, 0xbb, 0x04, 0x9c, 0x1e, 0xfa, 0xbb, 0xaa, 0x27, 0xde, 0xb0, 0x39, - 0x54, 0xdf, 0x29, 0xd2, 0x6d, 0x49, 0x8d, 0xd8, 0x6d, 0xf9, 0x5c, 0x83, 0xb9, 0xf8, 0xdf, 0x5d, - 0x1d, 0xb9, 0x03, 0xa7, 0x4e, 0x23, 0x31, 0xfa, 0x2b, 0xa3, 0x71, 0xf9, 0x27, 0x52, 0x47, 0x1e, - 0xc6, 0x25, 0x18, 0xeb, 0xda, 0x76, 0xdb, 0xe5, 0x8f, 0x00, 0x29, 0x29, 0x05, 0xc8, 0xa4, 0x14, - 0x70, 0xc8, 0x86, 0xdf, 0x1f, 0x35, 0x11, 0x0b, 0xc3, 0x5f, 0x82, 0xfd, 0x88, 0x5c, 0xe8, 0x99, - 0xe7, 0x21, 0x2b, 0x9e, 0x38, 0x21, 0x80, 0xf4, 0x3b, 0x5b, 0xab, 0x5b, 0xab, 0x57, 0x0b, 0x27, - 0x50, 0x1e, 0x32, 0x1b, 0xab, 0xb7, 0xae, 0xde, 0xb8, 0x75, 0xad, 0xa0, 0x91, 0x8f, 0xda, 0xd6, - 0xad, 0x5b, 0xe4, 0x23, 0xf1, 0xcc, 0x4d, 0xf9, 0x25, 0x39, 0xaf, 0x2e, 0xc6, 0x21, 0xbb, 0xd2, - 0xed, 0xd2, 0x63, 0x8e, 0xf1, 0xae, 0xee, 0x99, 0xe4, 0x6c, 0x2a, 0x68, 0x28, 0x03, 0xc9, 0xdb, - 0xb7, 0xd7, 0x0b, 0x09, 0x34, 0x03, 0x85, 0xab, 0x58, 0x37, 0xda, 0xa6, 0x85, 0xc5, 0xd9, 0x5a, - 0x48, 0x56, 0xef, 0x7d, 0xf5, 0xcd, 0x82, 0xf6, 0xf5, 0x37, 0x0b, 0xda, 0xaf, 0xbe, 0x59, 0xd0, - 0xee, 0x7f, 0xbb, 0x70, 0xe2, 0xeb, 0x6f, 0x17, 0x4e, 0xfc, 0xe2, 0xdb, 0x85, 0x13, 0xef, 0x3d, - 0x2f, 0xfd, 0xdd, 0x09, 0xb6, 0x7e, 0x5d, 0xc7, 0x26, 0x47, 0x1e, 0xff, 0x5a, 0x8a, 0xfe, 0xa5, - 0x8d, 0x7f, 0x4d, 0x9c, 0x5b, 0xa1, 0x9f, 0x1b, 0x8c, 0xae, 0x72, 0xc3, 0xae, 0x30, 0x00, 0xfd, - 0x63, 0x09, 0x6e, 0x23, 0x4d, 0xff, 0x28, 0xc2, 0x8b, 0x7f, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x9f, - 0x35, 0xa0, 0x61, 0xa4, 0x43, 0x00, 0x00, + // 3827 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x3c, 0x4d, 0x6f, 0x1b, 0x47, + 0x96, 0x6e, 0x92, 0xe2, 0xc7, 0xa3, 0x3e, 0xe8, 0xd2, 0x87, 0x69, 0x39, 0x16, 0x65, 0x3a, 0xbb, + 0xb1, 0x83, 0x84, 0x4a, 0x14, 0x27, 0xc8, 0xc7, 0x22, 0x81, 0x68, 0x2b, 0xb6, 0x15, 0xcb, 0x56, + 0x28, 0x2b, 0xeb, 0x0d, 0xb2, 0x60, 0x9a, 0xec, 0x12, 0xd5, 0x16, 0xd9, 0xcd, 0xf4, 0x87, 0x22, + 0x01, 0x39, 0x24, 0x8b, 0x60, 0xf7, 0x16, 0xf8, 0xb2, 0xc0, 0x62, 0x2f, 0xd9, 0x3d, 0xee, 0x2e, + 0x82, 0x05, 0xf6, 0xb8, 0xbb, 0x73, 0x9b, 0xc3, 0x0c, 0x30, 0x18, 0xe4, 0x38, 0x27, 0xce, 0x8c, + 0x33, 0x33, 0x07, 0x02, 0x33, 0xff, 0x60, 0x80, 0x41, 0x7d, 0x75, 0x57, 0x35, 0x9b, 0x36, 0x2d, + 0x59, 0x71, 0x82, 0xe4, 0x64, 0xf7, 0xfb, 0xac, 0xaa, 0xf7, 0xea, 0xd5, 0x7b, 0xaf, 0x8a, 0x82, + 0xb3, 0xdd, 0xdd, 0xd6, 0x92, 0xee, 0x74, 0x74, 0x43, 0xc7, 0x7b, 0xd8, 0xf2, 0xdc, 0x25, 0xf6, + 0x4f, 0xa5, 0xeb, 0xd8, 0x9e, 0x8d, 0xc6, 0x65, 0xd4, 0x7c, 0x79, 0xf7, 0x55, 0xb7, 0x62, 0xda, + 0x4b, 0x7a, 0xd7, 0x5c, 0x6a, 0xda, 0x0e, 0x5e, 0xda, 0x7b, 0x71, 0xa9, 0x85, 0x2d, 0xec, 0xe8, + 0x1e, 0x36, 0x18, 0xc7, 0xfc, 0x05, 0x89, 0xc6, 0xc2, 0xde, 0xc7, 0xb6, 0xb3, 0x6b, 0x5a, 0xad, + 0x38, 0xca, 0x52, 0xcb, 0xb6, 0x5b, 0x6d, 0xbc, 0x44, 0xbf, 0x1a, 0xfe, 0xf6, 0x92, 0x67, 0x76, + 0xb0, 0xeb, 0xe9, 0x9d, 0x2e, 0x27, 0xb8, 0x14, 0x8a, 0xea, 0xe8, 0xcd, 0x1d, 0xd3, 0xc2, 0xce, + 0xc1, 0x12, 0x1d, 0x6f, 0xd7, 0x5c, 0x72, 0xb0, 0x6b, 0xfb, 0x4e, 0x13, 0x0f, 0x88, 0x7d, 0xbe, + 0x65, 0x7a, 0x3b, 0x7e, 0xa3, 0xd2, 0xb4, 0x3b, 0x4b, 0x2d, 0xbb, 0x65, 0x87, 0xf2, 0xc9, 0x17, + 0xfd, 0xa0, 0xff, 0xe3, 0xe4, 0xaf, 0x9b, 0x96, 0x87, 0x1d, 0x4b, 0x6f, 0x2f, 0xb9, 0xcd, 0x1d, + 0x6c, 0xf8, 0x6d, 0xec, 0x84, 0xff, 0xb3, 0x1b, 0x77, 0x71, 0xd3, 0x73, 0x07, 0x00, 0x8c, 0xb7, + 0xfc, 0xdb, 0x59, 0x98, 0x58, 0x25, 0x4b, 0xb3, 0x89, 0x3f, 0xf2, 0xb1, 0xd5, 0xc4, 0xe8, 0x22, + 0x8c, 0x7d, 0xe4, 0x63, 0x1f, 0x17, 0xb5, 0x45, 0xed, 0x42, 0xae, 0x3a, 0xdd, 0xef, 0x95, 0xa6, + 0x28, 0xe0, 0x39, 0xbb, 0x63, 0x7a, 0xb8, 0xd3, 0xf5, 0x0e, 0x6a, 0x8c, 0x02, 0xbd, 0x0e, 0xe3, + 0x77, 0xed, 0x46, 0xdd, 0xc5, 0x5e, 0xdd, 0xd2, 0x3b, 0xb8, 0x98, 0xa0, 0x1c, 0xc5, 0x7e, 0xaf, + 0x34, 0x73, 0xd7, 0x6e, 0x6c, 0x62, 0xef, 0xa6, 0xde, 0x91, 0xd9, 0x20, 0x84, 0xa2, 0xe7, 0x21, + 0xe3, 0xbb, 0xd8, 0xa9, 0x9b, 0x46, 0x31, 0x49, 0xd9, 0x66, 0xfa, 0xbd, 0x52, 0x81, 0x80, 0xae, + 0x1b, 0x12, 0x4b, 0x9a, 0x41, 0xd0, 0x73, 0x90, 0x6e, 0x39, 0xb6, 0xdf, 0x75, 0x8b, 0xa9, 0xc5, + 0xa4, 0xa0, 0x66, 0x10, 0x99, 0x9a, 0x41, 0xd0, 0x2d, 0x48, 0x33, 0x7b, 0x17, 0xc7, 0x16, 0x93, + 0x17, 0xf2, 0xcb, 0xe7, 0x2a, 0xb2, 0x13, 0x54, 0x94, 0x09, 0xb3, 0x2f, 0x26, 0x90, 0xe1, 0x65, + 0x81, 0xdc, 0x6d, 0xfe, 0x77, 0x1a, 0xc6, 0x28, 0x1d, 0xba, 0x05, 0x99, 0xa6, 0x83, 0x89, 0xb1, + 0x8a, 0x68, 0x51, 0xbb, 0x90, 0x5f, 0x9e, 0xaf, 0x30, 0x27, 0xa8, 0x08, 0x23, 0x55, 0x6e, 0x0b, + 0x27, 0xa8, 0x9e, 0xee, 0xf7, 0x4a, 0x27, 0x39, 0x79, 0x28, 0xf5, 0xde, 0xaf, 0x4b, 0x5a, 0x4d, + 0x48, 0x41, 0x1b, 0x90, 0x73, 0xfd, 0x46, 0xc7, 0xf4, 0xd6, 0xec, 0x06, 0x5d, 0xf3, 0xfc, 0xf2, + 0x29, 0x75, 0xb8, 0x9b, 0x02, 0x5d, 0x3d, 0xd5, 0xef, 0x95, 0xa6, 0x03, 0xea, 0x50, 0xe2, 0xb5, + 0x13, 0xb5, 0x50, 0x08, 0xda, 0x81, 0x29, 0x07, 0x77, 0x1d, 0xd3, 0x76, 0x4c, 0xcf, 0x74, 0x31, + 0x91, 0x9b, 0xa0, 0x72, 0xcf, 0xaa, 0x72, 0x6b, 0x2a, 0x51, 0xf5, 0x6c, 0xbf, 0x57, 0x3a, 0x1d, + 0xe1, 0x54, 0x74, 0x44, 0xc5, 0x22, 0x0f, 0x50, 0x04, 0xb4, 0x89, 0x3d, 0x6a, 0xcf, 0xfc, 0xf2, + 0xe2, 0x03, 0x95, 0x6d, 0x62, 0xaf, 0xba, 0xd8, 0xef, 0x95, 0x9e, 0x1a, 0xe4, 0x57, 0x54, 0xc6, + 0xc8, 0x47, 0x6d, 0x28, 0xc8, 0x50, 0x83, 0x4c, 0x30, 0x45, 0x75, 0x2e, 0x0c, 0xd7, 0x49, 0xa8, + 0xaa, 0x0b, 0xfd, 0x5e, 0x69, 0x3e, 0xca, 0xab, 0xe8, 0x1b, 0x90, 0x4c, 0xec, 0xd3, 0xd4, 0xad, + 0x26, 0x6e, 0x13, 0x35, 0x63, 0x71, 0xf6, 0xb9, 0x2c, 0xd0, 0xcc, 0x3e, 0x01, 0xb5, 0x6a, 0x9f, + 0x00, 0x8c, 0x3e, 0x80, 0xf1, 0xe0, 0x83, 0xac, 0x57, 0x9a, 0xfb, 0x51, 0xbc, 0x50, 0xb2, 0x52, + 0xf3, 0xfd, 0x5e, 0x69, 0x4e, 0xe6, 0x51, 0x44, 0x2b, 0xd2, 0x42, 0xe9, 0x6d, 0xb6, 0x32, 0x99, + 0xe1, 0xd2, 0x19, 0x85, 0x2c, 0xbd, 0x3d, 0xb8, 0x22, 0x8a, 0x34, 0x22, 0x9d, 0x6c, 0x62, 0xbf, + 0xd9, 0xc4, 0xd8, 0xc0, 0x46, 0x31, 0x1b, 0x27, 0x7d, 0x4d, 0xa2, 0x60, 0xd2, 0x65, 0x1e, 0x55, + 0xba, 0x8c, 0x21, 0x6b, 0x7d, 0xd7, 0x6e, 0xac, 0x3a, 0x8e, 0xed, 0xb8, 0xc5, 0x5c, 0xdc, 0x5a, + 0xaf, 0x09, 0x34, 0x5b, 0xeb, 0x80, 0x5a, 0x5d, 0xeb, 0x00, 0xcc, 0xc7, 0x5b, 0xf3, 0xad, 0x1b, + 0x58, 0x77, 0xb1, 0x51, 0x84, 0x21, 0xe3, 0x0d, 0x28, 0x82, 0xf1, 0x06, 0x90, 0x81, 0xf1, 0x06, + 0x18, 0x64, 0xc0, 0x24, 0xfb, 0x5e, 0x71, 0x5d, 0xb3, 0x65, 0x61, 0xa3, 0x98, 0xa7, 0xf2, 0x9f, + 0x8a, 0x93, 0x2f, 0x68, 0xaa, 0x4f, 0xf5, 0x7b, 0xa5, 0xa2, 0xca, 0xa7, 0xe8, 0x88, 0xc8, 0x44, + 0x1f, 0xc2, 0x04, 0x83, 0xd4, 0x7c, 0xcb, 0x32, 0xad, 0x56, 0x71, 0x9c, 0x2a, 0x39, 0x13, 0xa7, + 0x84, 0x93, 0x54, 0xcf, 0xf4, 0x7b, 0xa5, 0x53, 0x0a, 0x97, 0xa2, 0x42, 0x15, 0x48, 0x22, 0x06, + 0x03, 0x84, 0x86, 0x9d, 0x88, 0x8b, 0x18, 0x6b, 0x2a, 0x11, 0x8b, 0x18, 0x11, 0x4e, 0x35, 0x62, + 0x44, 0x90, 0xa1, 0x3d, 0xb8, 0x91, 0x27, 0x87, 0xdb, 0x83, 0xdb, 0x59, 0xb2, 0x47, 0x8c, 0xa9, + 0x15, 0x69, 0xe8, 0x53, 0x0d, 0x66, 0x5d, 0x4f, 0xb7, 0x0c, 0xbd, 0x6d, 0x5b, 0xf8, 0xba, 0xd5, + 0x72, 0xb0, 0xeb, 0x5e, 0xb7, 0xb6, 0xed, 0x62, 0x81, 0xea, 0x39, 0x1f, 0x09, 0xac, 0x71, 0xa4, + 0xd5, 0xf3, 0xfd, 0x5e, 0xa9, 0x14, 0x2b, 0x45, 0xd1, 0x1c, 0xaf, 0x08, 0xed, 0xc3, 0xb4, 0x38, + 0xd7, 0xb7, 0x3c, 0xb3, 0x6d, 0xba, 0xba, 0x67, 0xda, 0x56, 0xf1, 0x24, 0xd5, 0x7f, 0x2e, 0x1a, + 0x9f, 0x06, 0x08, 0xab, 0xe7, 0xfa, 0xbd, 0xd2, 0xd9, 0x18, 0x09, 0x8a, 0xee, 0x38, 0x15, 0xa1, + 0x11, 0x37, 0x1c, 0x4c, 0x08, 0xb1, 0x51, 0x9c, 0x1e, 0x6e, 0xc4, 0x80, 0x48, 0x36, 0x62, 0x00, + 0x8c, 0x33, 0x62, 0x80, 0x24, 0x9a, 0xba, 0xba, 0xe3, 0x99, 0x44, 0xed, 0xba, 0xee, 0xec, 0x62, + 0xa7, 0x38, 0x13, 0xa7, 0x69, 0x43, 0x25, 0x62, 0x9a, 0x22, 0x9c, 0xaa, 0xa6, 0x08, 0x12, 0xdd, + 0xd3, 0x40, 0x1d, 0x9a, 0x69, 0x5b, 0x35, 0x72, 0x70, 0xbb, 0x64, 0x7a, 0xb3, 0x54, 0xe9, 0x33, + 0x0f, 0x98, 0x9e, 0x4c, 0x5e, 0x7d, 0xa6, 0xdf, 0x2b, 0x9d, 0x1f, 0x2a, 0x4d, 0x19, 0xc8, 0x70, + 0xa5, 0xe8, 0x0e, 0xe4, 0x09, 0x12, 0xd3, 0x14, 0xc8, 0x28, 0xce, 0xd1, 0x31, 0x9c, 0x1e, 0x1c, + 0x03, 0x27, 0xa0, 0x39, 0xc0, 0xac, 0xc4, 0xa1, 0xe8, 0x91, 0x45, 0xa1, 0xcf, 0x35, 0x20, 0x8e, + 0x1e, 0x37, 0xd3, 0x53, 0x54, 0xcb, 0xd3, 0x03, 0x5a, 0xe2, 0xa6, 0xf9, 0x74, 0xbf, 0x57, 0x5a, + 0x8c, 0x97, 0xa3, 0xe8, 0x1e, 0xa2, 0x2b, 0xf4, 0xa3, 0xe0, 0x90, 0x28, 0x16, 0x87, 0xfb, 0x51, + 0x40, 0x24, 0xfb, 0x51, 0x00, 0x8c, 0xf3, 0xa3, 0x00, 0xc9, 0x83, 0xc1, 0x7b, 0x7a, 0xdb, 0x34, + 0x68, 0x42, 0x75, 0x7a, 0x48, 0x30, 0x08, 0x28, 0x82, 0x60, 0x10, 0x40, 0x06, 0x82, 0x41, 0x48, + 0x9b, 0x81, 0x31, 0x2a, 0xa2, 0x7c, 0x3f, 0x03, 0xd3, 0x31, 0x5b, 0x0d, 0xbd, 0x09, 0x69, 0xc7, + 0xb7, 0x48, 0x06, 0xca, 0xd2, 0x2e, 0xa4, 0x2a, 0xde, 0xf2, 0x4d, 0x83, 0xa5, 0xbf, 0x8e, 0x6f, + 0x29, 0x49, 0xe9, 0x18, 0x05, 0x10, 0x7e, 0x92, 0xfe, 0x9a, 0x06, 0x4f, 0xaf, 0x86, 0xf2, 0xdf, + 0xb5, 0x1b, 0x2a, 0x3f, 0x05, 0x20, 0x0c, 0x13, 0x62, 0x1f, 0xd7, 0x4d, 0x12, 0xa4, 0x92, 0x71, + 0x56, 0x7e, 0xc7, 0x6f, 0x60, 0xc7, 0xc2, 0x1e, 0x76, 0xc5, 0x1c, 0x68, 0x94, 0xa2, 0x2b, 0xe1, + 0x48, 0x10, 0x49, 0xfe, 0xb8, 0x0c, 0x47, 0xff, 0xaa, 0x41, 0xb1, 0xa3, 0xef, 0xd7, 0x05, 0xd0, + 0xad, 0x6f, 0xdb, 0x4e, 0xbd, 0x8b, 0x1d, 0xd3, 0x36, 0x68, 0x36, 0x9d, 0x5f, 0xfe, 0x9b, 0x87, + 0xc6, 0xa5, 0xca, 0xba, 0xbe, 0x2f, 0xc0, 0xee, 0xdb, 0xb6, 0xb3, 0x41, 0xd9, 0x57, 0x2d, 0xcf, + 0x39, 0x60, 0x01, 0xb3, 0x13, 0x87, 0x97, 0xc6, 0x34, 0x1b, 0x4b, 0x80, 0xfe, 0x59, 0x83, 0x39, + 0xcf, 0xf6, 0xf4, 0x76, 0xbd, 0xe9, 0x77, 0xfc, 0xb6, 0xee, 0x99, 0x7b, 0xb8, 0xee, 0xbb, 0x7a, + 0x0b, 0xf3, 0xd4, 0xfd, 0x8d, 0x87, 0x0f, 0xed, 0x36, 0xe1, 0xbf, 0x1c, 0xb0, 0x6f, 0x11, 0x6e, + 0x36, 0xb2, 0x72, 0xbf, 0x57, 0x5a, 0xf0, 0x62, 0xd0, 0xd2, 0xc0, 0x66, 0xe2, 0xf0, 0xe8, 0x12, + 0x00, 0xb3, 0x6d, 0xdd, 0xf5, 0x1c, 0x9a, 0xa1, 0xe5, 0xaa, 0x73, 0xfd, 0x5e, 0x09, 0x51, 0xd3, + 0x6d, 0x7a, 0x52, 0xdc, 0xaa, 0x65, 0x05, 0x8c, 0x70, 0x31, 0x8f, 0xa2, 0x5c, 0x99, 0x90, 0x8b, + 0x3a, 0x4c, 0x84, 0x4b, 0xc0, 0xe6, 0xff, 0x4d, 0x83, 0xf9, 0xe1, 0xcb, 0x8b, 0xce, 0x43, 0x72, + 0x17, 0x1f, 0xf0, 0x72, 0xec, 0x64, 0xbf, 0x57, 0x9a, 0xd8, 0xc5, 0x07, 0x92, 0x20, 0x82, 0x45, + 0x7f, 0x07, 0x63, 0x7b, 0x7a, 0xdb, 0xc7, 0xdc, 0x15, 0x2b, 0x15, 0x56, 0x78, 0x56, 0xe4, 0xc2, + 0xb3, 0xd2, 0xdd, 0x6d, 0x11, 0x40, 0x45, 0x78, 0x42, 0xe5, 0x5d, 0x5f, 0xb7, 0x3c, 0xd3, 0x3b, + 0x60, 0x6e, 0x4a, 0x05, 0xc8, 0x6e, 0x4a, 0x01, 0xaf, 0x27, 0x5e, 0xd5, 0xe6, 0xbf, 0xd4, 0xe0, + 0xf4, 0xd0, 0x65, 0xfe, 0x2e, 0x8c, 0xb0, 0x5c, 0x87, 0x14, 0xd9, 0x70, 0xa4, 0x50, 0xdc, 0x31, + 0x5b, 0x3b, 0xaf, 0x5c, 0xa2, 0xc3, 0x49, 0xb3, 0xba, 0x8e, 0x41, 0xe4, 0xba, 0x8e, 0x41, 0x48, + 0xb1, 0xdb, 0xb6, 0x3f, 0x7e, 0xe5, 0x12, 0x1d, 0x54, 0x9a, 0x29, 0xa1, 0x00, 0x59, 0x09, 0x05, + 0x94, 0xfb, 0x69, 0xc8, 0x05, 0x95, 0x98, 0xb4, 0xf7, 0xb5, 0x43, 0xed, 0xfd, 0x6b, 0x50, 0x30, + 0xb0, 0xe1, 0x77, 0xdb, 0x66, 0x93, 0x3a, 0xb1, 0x88, 0x22, 0x39, 0x16, 0x46, 0x15, 0x9c, 0xc2, + 0x3f, 0x15, 0x41, 0xa1, 0x65, 0xc8, 0xf2, 0x8a, 0xe5, 0x80, 0x06, 0x90, 0x09, 0xe6, 0x71, 0x02, + 0x26, 0x7b, 0x9c, 0x80, 0xa1, 0x1a, 0x00, 0x6b, 0x03, 0xac, 0x63, 0x4f, 0xe7, 0xb5, 0x53, 0x51, + 0x9d, 0xc1, 0xad, 0x00, 0xcf, 0x0a, 0xfa, 0x90, 0x5e, 0x2e, 0xe8, 0x43, 0x28, 0xfa, 0x00, 0xa0, + 0xa3, 0x9b, 0x16, 0xe3, 0xe3, 0x85, 0x52, 0x79, 0x58, 0x28, 0x5b, 0x0f, 0x28, 0x99, 0xf4, 0x90, + 0x53, 0x96, 0x1e, 0x42, 0x49, 0xd9, 0xcd, 0x1b, 0x17, 0xc5, 0x34, 0x8d, 0x0b, 0x0b, 0xc3, 0x44, + 0x73, 0xb1, 0xb3, 0xa4, 0xf4, 0xe6, 0x2c, 0x92, 0x4c, 0x21, 0x85, 0x2c, 0x5b, 0xdb, 0xdc, 0xc6, + 0x9e, 0xd9, 0xc1, 0x74, 0xa3, 0xf2, 0x65, 0x13, 0x30, 0x79, 0xd9, 0x04, 0x0c, 0xbd, 0x0a, 0xa0, + 0x7b, 0xeb, 0xb6, 0xeb, 0xdd, 0xb2, 0x9a, 0x98, 0x96, 0x3e, 0x59, 0x36, 0xfc, 0x10, 0x2a, 0x0f, + 0x3f, 0x84, 0xa2, 0x37, 0x20, 0xdf, 0xe5, 0x47, 0x6d, 0xa3, 0x8d, 0x69, 0x69, 0x93, 0x65, 0x99, + 0x81, 0x04, 0x96, 0x78, 0x65, 0x6a, 0x74, 0x15, 0xa6, 0x9a, 0xb6, 0xd5, 0xf4, 0x1d, 0x07, 0x5b, + 0xcd, 0x83, 0x4d, 0x7d, 0x1b, 0xd3, 0x32, 0x26, 0xcb, 0x5c, 0x25, 0x82, 0x92, 0x5d, 0x25, 0x82, + 0x42, 0x2f, 0x43, 0x2e, 0x68, 0x03, 0xd1, 0x4a, 0x25, 0xc7, 0x3b, 0x0a, 0x02, 0x28, 0x31, 0x87, + 0x94, 0x64, 0xf0, 0xa6, 0x7b, 0x85, 0x3b, 0x1d, 0xa6, 0xd5, 0x07, 0x1f, 0xbc, 0x04, 0x96, 0x07, + 0x2f, 0x81, 0x23, 0x81, 0x74, 0x72, 0xb4, 0x40, 0x5a, 0xfe, 0x85, 0x06, 0x33, 0x71, 0xde, 0x12, + 0xf1, 0x5c, 0xed, 0xb1, 0x78, 0xee, 0x7b, 0x90, 0xed, 0xda, 0x46, 0xdd, 0xed, 0xe2, 0x26, 0x0f, + 0x4e, 0x11, 0xbf, 0xdd, 0xb0, 0x8d, 0xcd, 0x2e, 0x6e, 0xfe, 0xad, 0xe9, 0xed, 0xac, 0xec, 0xd9, + 0xa6, 0x71, 0xc3, 0x74, 0xb9, 0x83, 0x75, 0x19, 0x46, 0xc9, 0x42, 0x32, 0x1c, 0x58, 0xcd, 0x42, + 0x9a, 0x69, 0x29, 0xff, 0x32, 0x09, 0x85, 0xa8, 0x87, 0x7e, 0x9f, 0xa6, 0x82, 0xee, 0x40, 0xc6, + 0x64, 0x45, 0x0e, 0x4f, 0x52, 0xfe, 0x4a, 0x0a, 0xdf, 0x95, 0xb0, 0x49, 0x5a, 0xd9, 0x7b, 0xb1, + 0xc2, 0xab, 0x21, 0xba, 0x04, 0x54, 0x32, 0xe7, 0x54, 0x25, 0x73, 0x20, 0xaa, 0x41, 0xc6, 0xc5, + 0xce, 0x9e, 0xd9, 0xc4, 0x3c, 0x0e, 0x95, 0x64, 0xc9, 0x4d, 0xdb, 0xc1, 0x44, 0xe6, 0x26, 0x23, + 0x09, 0x65, 0x72, 0x1e, 0x55, 0x26, 0x07, 0xa2, 0xf7, 0x20, 0xd7, 0xb4, 0xad, 0x6d, 0xb3, 0xb5, + 0xae, 0x77, 0x79, 0x24, 0x3a, 0x1b, 0x27, 0xf5, 0xb2, 0x20, 0xe2, 0x8d, 0x1b, 0xf1, 0x19, 0x69, + 0xdc, 0x04, 0x54, 0xa1, 0x41, 0xff, 0x94, 0x02, 0x08, 0x8d, 0x83, 0x5e, 0x83, 0x3c, 0xde, 0xc7, + 0x4d, 0xdf, 0xb3, 0x1d, 0x71, 0x24, 0xf0, 0x3e, 0xa8, 0x00, 0x2b, 0x31, 0x1c, 0x42, 0x28, 0xd9, + 0x93, 0x96, 0xde, 0xc1, 0x6e, 0x57, 0x6f, 0x8a, 0x06, 0x2a, 0x1d, 0x4c, 0x00, 0x94, 0xf7, 0x64, + 0x00, 0x44, 0x7f, 0x0d, 0x29, 0xda, 0x72, 0x65, 0xbd, 0x53, 0xd4, 0xef, 0x95, 0x26, 0x2d, 0xb5, + 0xd9, 0x4a, 0xf1, 0xe8, 0x2d, 0x98, 0xd8, 0x0d, 0x1c, 0x8f, 0x8c, 0x2d, 0x45, 0x19, 0x68, 0xf6, + 0x18, 0x22, 0x94, 0xd1, 0x8d, 0xcb, 0x70, 0xb4, 0x0d, 0x79, 0xdd, 0xb2, 0x6c, 0x8f, 0x1e, 0x37, + 0xa2, 0x9f, 0x7a, 0x71, 0x98, 0x9b, 0x56, 0x56, 0x42, 0x5a, 0x96, 0x82, 0xd1, 0x38, 0x21, 0x49, + 0x90, 0xe3, 0x84, 0x04, 0x46, 0x35, 0x48, 0xb7, 0xf5, 0x06, 0x6e, 0x8b, 0xf8, 0xfe, 0xf4, 0x50, + 0x15, 0x37, 0x28, 0x19, 0x93, 0x4e, 0x4f, 0x77, 0xc6, 0x27, 0x9f, 0xee, 0x0c, 0x32, 0xbf, 0x0d, + 0x85, 0xe8, 0x78, 0x46, 0xcb, 0x55, 0x2e, 0xca, 0xb9, 0x4a, 0xee, 0xa1, 0xd9, 0x91, 0x0e, 0x79, + 0x69, 0x50, 0xc7, 0xa1, 0xa2, 0xfc, 0x1f, 0x1a, 0xcc, 0xc4, 0xed, 0x5d, 0xb4, 0x2e, 0xed, 0x78, + 0x8d, 0xf7, 0x85, 0x62, 0x5c, 0x9d, 0xf3, 0x0e, 0xd9, 0xea, 0xe1, 0x46, 0xaf, 0xc2, 0xa4, 0x65, + 0x1b, 0xb8, 0xae, 0x13, 0x05, 0x6d, 0xd3, 0xf5, 0x8a, 0x09, 0xda, 0x6f, 0xa7, 0xfd, 0x24, 0x82, + 0x59, 0x11, 0x08, 0x89, 0x7b, 0x42, 0x41, 0x94, 0xff, 0x4f, 0x83, 0xa9, 0x48, 0xbb, 0xf7, 0xc8, + 0xf9, 0x92, 0x9c, 0xe5, 0x24, 0x46, 0xcc, 0x72, 0xd4, 0xa3, 0x27, 0x39, 0xe2, 0xd1, 0xf3, 0xf3, + 0x04, 0xe4, 0xa5, 0xfa, 0xfd, 0xc8, 0x23, 0xbf, 0x0b, 0x53, 0xfc, 0x28, 0x35, 0xad, 0x16, 0xab, + 0xf3, 0x12, 0xbc, 0x19, 0x35, 0x70, 0x27, 0xb3, 0x66, 0x37, 0x36, 0x03, 0x5a, 0x5a, 0xe6, 0xd1, + 0x5e, 0xa1, 0xab, 0xc0, 0x24, 0x15, 0x93, 0x2a, 0x06, 0xdd, 0x81, 0x39, 0xbf, 0x4b, 0xaa, 0xdf, + 0xba, 0xcb, 0x6f, 0x37, 0xea, 0x96, 0xdf, 0x69, 0x60, 0x36, 0xfb, 0x31, 0x56, 0x0f, 0x31, 0x0a, + 0x71, 0xfd, 0x71, 0x93, 0xe2, 0xe5, 0x7a, 0x28, 0x0e, 0x1f, 0x59, 0xcb, 0xd4, 0x88, 0x6b, 0x79, + 0x0d, 0xd0, 0x60, 0xdf, 0x5f, 0xb1, 0xa5, 0x36, 0x9a, 0x2d, 0xcb, 0xff, 0xaf, 0x41, 0x21, 0xda, + 0xce, 0xff, 0x1e, 0x39, 0xd5, 0x7f, 0x6b, 0x90, 0x0b, 0x3a, 0xfa, 0x47, 0x1e, 0xf7, 0x73, 0x90, + 0x76, 0xb0, 0xee, 0xda, 0x16, 0x0f, 0x1e, 0x34, 0x0a, 0x32, 0x88, 0x1c, 0x05, 0x19, 0xe4, 0x90, + 0x23, 0xbe, 0x0d, 0xe3, 0xcc, 0x5c, 0x6f, 0x9b, 0x6d, 0x0f, 0x3b, 0xe8, 0x0a, 0xa4, 0x5d, 0x4f, + 0xf7, 0xb0, 0x5b, 0xd4, 0x16, 0x93, 0x17, 0x26, 0x97, 0xe7, 0x06, 0x5b, 0xfe, 0x04, 0xcd, 0xc6, + 0xc2, 0x28, 0xe5, 0xb1, 0x30, 0x48, 0xf9, 0x1f, 0x34, 0x18, 0x97, 0x6f, 0x36, 0x1e, 0x8f, 0xd8, + 0x47, 0x5b, 0x90, 0xf2, 0xff, 0x04, 0x83, 0x68, 0x3f, 0x1e, 0x3f, 0xfa, 0x36, 0xec, 0xf1, 0x47, + 0x8d, 0x19, 0x24, 0xe8, 0xa4, 0x1f, 0x75, 0xd0, 0xad, 0xb0, 0xfb, 0x44, 0x62, 0x87, 0x4b, 0x03, + 0xfd, 0xa8, 0xdd, 0x27, 0x7a, 0x1c, 0x28, 0xec, 0xf2, 0x71, 0xa0, 0x20, 0x0e, 0x39, 0xdf, 0x4f, + 0xd3, 0x74, 0xbe, 0xe1, 0x5d, 0xcb, 0x93, 0xee, 0xd6, 0x45, 0x72, 0xbc, 0xe4, 0x23, 0xe4, 0x78, + 0xcf, 0x43, 0x86, 0x1e, 0xaa, 0x41, 0xfa, 0x45, 0x1d, 0x84, 0x80, 0xd4, 0xbb, 0x6e, 0x06, 0x79, + 0x40, 0x14, 0x1f, 0x3b, 0x62, 0x14, 0xaf, 0xc3, 0xe9, 0x1d, 0xdd, 0xad, 0x8b, 0x73, 0xc7, 0xa8, + 0xeb, 0x5e, 0x3d, 0x88, 0x80, 0x69, 0x5a, 0xd7, 0xd1, 0xee, 0xf1, 0x8e, 0xee, 0x6e, 0x0a, 0x9a, + 0x15, 0x6f, 0x63, 0x30, 0x1e, 0xce, 0xc5, 0x53, 0xa0, 0x2d, 0x98, 0x8d, 0x17, 0x9e, 0xa1, 0x23, + 0xa7, 0x97, 0x1b, 0xee, 0x03, 0x25, 0x4f, 0xc7, 0xa0, 0xd1, 0x67, 0x1a, 0x14, 0x49, 0x96, 0xe3, + 0xe0, 0x8f, 0x7c, 0xd3, 0xc1, 0x1d, 0x62, 0xb1, 0xba, 0xbd, 0x87, 0x9d, 0xb6, 0x7e, 0xc0, 0xef, + 0x09, 0xcf, 0x0d, 0x9e, 0xa6, 0x1b, 0xb6, 0x51, 0x93, 0x18, 0xd8, 0xd4, 0xba, 0x2a, 0xf0, 0x16, + 0x13, 0x22, 0x4f, 0x2d, 0x9e, 0x22, 0xe2, 0xc6, 0x70, 0xa8, 0x8e, 0x60, 0x7e, 0xb4, 0x8e, 0xe0, + 0x5a, 0x2a, 0x9b, 0x2d, 0xe4, 0xca, 0xbf, 0x4f, 0xc0, 0xa4, 0x7a, 0x75, 0xf8, 0xc4, 0x37, 0xc1, + 0x40, 0xd0, 0x48, 0x7e, 0x2b, 0x41, 0x23, 0x75, 0xa8, 0xd5, 0x1e, 0x1b, 0x6d, 0xb5, 0xcb, 0xbf, + 0x4b, 0xc0, 0x84, 0x72, 0x7b, 0xfa, 0xe3, 0x32, 0x1f, 0xc7, 0x32, 0xff, 0x4b, 0x02, 0xe6, 0xe2, + 0x87, 0x7c, 0x2c, 0xad, 0x90, 0x6b, 0x40, 0x8a, 0x9a, 0xeb, 0x61, 0xbe, 0x3d, 0x3b, 0xd0, 0x09, + 0xa1, 0xcb, 0x25, 0x2a, 0xa2, 0x81, 0x0b, 0x5e, 0xc1, 0x8e, 0xee, 0x40, 0xde, 0x94, 0xae, 0x92, + 0x93, 0x71, 0x37, 0x7e, 0xf2, 0x05, 0x32, 0x6b, 0x8d, 0x0d, 0xb9, 0x36, 0x96, 0x45, 0x55, 0xd3, + 0x90, 0x22, 0x05, 0x41, 0x79, 0x0f, 0x32, 0x7c, 0x38, 0xe8, 0x25, 0xc8, 0xd1, 0xb3, 0x82, 0x56, + 0xf7, 0x5a, 0xb8, 0xb4, 0x04, 0x18, 0x79, 0x4e, 0x95, 0x15, 0x30, 0xf4, 0x0a, 0x00, 0x09, 0x8f, + 0xfc, 0x94, 0x48, 0xd0, 0x58, 0x4b, 0xbb, 0x08, 0x5d, 0xdb, 0x18, 0x38, 0x1a, 0x72, 0x01, 0xb0, + 0xfc, 0x55, 0x02, 0xf2, 0xf2, 0xe5, 0xf5, 0xa1, 0x94, 0x7f, 0x02, 0xa2, 0xc3, 0x53, 0xd7, 0x0d, + 0x83, 0xfc, 0x8b, 0x45, 0x32, 0xb1, 0x34, 0x74, 0x91, 0xc4, 0xff, 0x57, 0x04, 0x07, 0xab, 0xe7, + 0xe9, 0x03, 0x1d, 0x33, 0x82, 0x92, 0xb4, 0x16, 0xa2, 0xb8, 0xf9, 0x5d, 0x98, 0x8d, 0x15, 0x25, + 0x57, 0xe1, 0x63, 0x8f, 0xab, 0x0a, 0xff, 0x2a, 0x0d, 0xb3, 0xb1, 0x8f, 0x06, 0x9e, 0x78, 0xc4, + 0x50, 0x77, 0x50, 0xf2, 0xb1, 0xec, 0xa0, 0x7f, 0xd4, 0xe2, 0x2c, 0xcb, 0x6e, 0x0c, 0x5f, 0x1b, + 0xe1, 0x25, 0xc5, 0xe3, 0xb2, 0xb1, 0xea, 0x96, 0x63, 0x87, 0xda, 0x13, 0xe9, 0x51, 0xf7, 0x04, + 0x7a, 0x81, 0x35, 0x54, 0xa8, 0x2e, 0x76, 0x83, 0x27, 0x22, 0x44, 0x44, 0x55, 0x86, 0x83, 0xd0, + 0x5b, 0x30, 0x21, 0x38, 0x58, 0x1b, 0x2f, 0x1b, 0xf6, 0xd8, 0x38, 0x4d, 0xb4, 0x93, 0x37, 0x2e, + 0xc3, 0x23, 0x51, 0x38, 0x77, 0xa8, 0x28, 0x0c, 0x23, 0x5e, 0x36, 0x7e, 0xab, 0xfb, 0xe5, 0x0f, + 0x09, 0x98, 0x8a, 0xbc, 0x19, 0xfa, 0xf1, 0x6c, 0x3d, 0x8e, 0xb3, 0xf5, 0xa7, 0x1a, 0xe4, 0x82, + 0xa7, 0x71, 0x47, 0x2e, 0x0d, 0x57, 0x20, 0x8d, 0xd9, 0xf3, 0x2c, 0x16, 0xc6, 0xa7, 0x23, 0xcf, + 0x67, 0x09, 0x8e, 0x3f, 0x98, 0x8d, 0xbc, 0xc8, 0xaa, 0x71, 0xc6, 0x43, 0x16, 0x7d, 0x3f, 0x49, + 0x88, 0xa2, 0x2f, 0x9c, 0xc9, 0x13, 0x75, 0x96, 0x70, 0x25, 0x92, 0x8f, 0x67, 0x25, 0x8e, 0xd7, + 0x0d, 0xfe, 0x1d, 0x60, 0x8c, 0x8e, 0x09, 0x2d, 0x43, 0xd6, 0xc3, 0x4e, 0xc7, 0xb4, 0xf4, 0x36, + 0x5d, 0xba, 0x2c, 0xe3, 0x16, 0x30, 0x99, 0x5b, 0xc0, 0xd0, 0x0e, 0x4c, 0x85, 0xad, 0x7f, 0x2a, + 0x26, 0xfe, 0xdd, 0xf0, 0x3b, 0x2a, 0x11, 0xbb, 0x86, 0x8c, 0x70, 0xaa, 0x0f, 0x7f, 0x22, 0x48, + 0x64, 0xc0, 0x64, 0xd3, 0xb6, 0x3c, 0xdd, 0xb4, 0xb0, 0xc3, 0x14, 0x25, 0xe3, 0xde, 0x4d, 0x5e, + 0x56, 0x68, 0x58, 0x2f, 0x54, 0xe5, 0x53, 0xdf, 0x4d, 0xaa, 0x38, 0xf4, 0x21, 0x4c, 0x88, 0x22, + 0x9c, 0x29, 0x49, 0xc5, 0xbd, 0x9b, 0x5c, 0x95, 0x49, 0xd8, 0x06, 0x57, 0xb8, 0xd4, 0x77, 0x93, + 0x0a, 0x0a, 0xb5, 0xa1, 0xd0, 0xb5, 0x8d, 0x2d, 0x8b, 0x97, 0x9e, 0x7a, 0xa3, 0x8d, 0xf9, 0x7d, + 0xd3, 0xc2, 0x40, 0xb2, 0xa9, 0x50, 0xb1, 0x43, 0x30, 0xca, 0xab, 0xbe, 0x44, 0x8e, 0x62, 0xd1, + 0x07, 0x30, 0xde, 0xc6, 0xba, 0x8b, 0x57, 0xf7, 0xbb, 0xa6, 0x83, 0x8d, 0xf8, 0x77, 0xc3, 0x37, + 0x24, 0x0a, 0x76, 0x04, 0xc9, 0x3c, 0xea, 0x73, 0x29, 0x19, 0x43, 0xac, 0xdf, 0xd1, 0xf7, 0x6b, + 0xbe, 0xe5, 0xae, 0xee, 0xf3, 0x37, 0xa0, 0x99, 0x38, 0xeb, 0xaf, 0xab, 0x44, 0xcc, 0xfa, 0x11, + 0x4e, 0xd5, 0xfa, 0x11, 0x24, 0xba, 0x41, 0x4f, 0x58, 0x66, 0x12, 0xf6, 0x7e, 0x78, 0x6e, 0x60, + 0xb5, 0x98, 0x35, 0x58, 0x3b, 0x96, 0x7f, 0x29, 0x42, 0x03, 0x09, 0xdc, 0x06, 0x74, 0xda, 0x35, + 0xec, 0xf9, 0x8e, 0x85, 0x0d, 0xde, 0x12, 0x18, 0xb4, 0x81, 0x42, 0x15, 0xd8, 0x40, 0x81, 0x0e, + 0xd8, 0x40, 0xc1, 0x12, 0x9f, 0xea, 0xda, 0xc6, 0x6d, 0xb6, 0x65, 0xbc, 0xe0, 0x41, 0xf1, 0x99, + 0x01, 0x55, 0x21, 0x09, 0xf3, 0x29, 0x85, 0x4b, 0xf5, 0x29, 0x05, 0x85, 0x3e, 0x81, 0x99, 0xc8, + 0x7b, 0x4b, 0xb6, 0x52, 0xf9, 0xb8, 0xeb, 0xdc, 0xb5, 0x18, 0x4a, 0xd6, 0x1f, 0x8a, 0x93, 0xa1, + 0xa8, 0x8d, 0xd5, 0x42, 0xb4, 0xb7, 0x74, 0xab, 0xb5, 0x66, 0x37, 0x54, 0xaf, 0x1e, 0x8f, 0xd3, + 0x7e, 0x35, 0x86, 0x92, 0x69, 0x8f, 0x93, 0xa1, 0x6a, 0x8f, 0xa3, 0x08, 0xde, 0x56, 0x92, 0x14, + 0x34, 0x78, 0x83, 0x1c, 0xf7, 0xb6, 0x92, 0x11, 0x48, 0x6f, 0x2b, 0x19, 0x20, 0xe6, 0x6d, 0x25, + 0xa7, 0xcc, 0x8a, 0x16, 0x6d, 0xf9, 0x4b, 0x0d, 0xa6, 0x22, 0x11, 0x0c, 0xbd, 0x09, 0xc1, 0x93, + 0xb9, 0xdb, 0x07, 0x5d, 0x51, 0xfa, 0x28, 0x4f, 0xec, 0x08, 0x3c, 0xee, 0x89, 0x1d, 0x81, 0xa3, + 0x1b, 0x00, 0xc1, 0xd9, 0xff, 0xa0, 0xa3, 0x86, 0xe6, 0xdd, 0x21, 0xa5, 0x9c, 0x77, 0x87, 0xd0, + 0xf2, 0xbd, 0x14, 0x64, 0xc5, 0x16, 0x38, 0x96, 0xd2, 0x78, 0x09, 0x32, 0x1d, 0xec, 0xd2, 0x47, + 0x76, 0x89, 0x30, 0xc3, 0xe5, 0x20, 0x39, 0xc3, 0xe5, 0x20, 0x35, 0x01, 0x4f, 0x1e, 0x2a, 0x01, + 0x4f, 0x8d, 0x9c, 0x80, 0x63, 0xfa, 0xdc, 0x45, 0x0a, 0xe4, 0xe2, 0xd6, 0xf9, 0xc1, 0xa7, 0x83, + 0x78, 0x0c, 0x23, 0x33, 0x46, 0x1e, 0xc3, 0xc8, 0x28, 0xb4, 0x0b, 0x27, 0xa5, 0x9b, 0x71, 0xde, + 0xbf, 0x27, 0x21, 0x75, 0x72, 0xf8, 0xdb, 0xa2, 0x1a, 0xa5, 0x62, 0x81, 0x63, 0x37, 0x02, 0x95, + 0x2b, 0x98, 0x28, 0x8e, 0x38, 0x98, 0x81, 0x1b, 0x7e, 0x6b, 0x9d, 0x2f, 0x7b, 0x26, 0x74, 0x30, + 0x19, 0x2e, 0x3b, 0x98, 0x0c, 0xa7, 0xad, 0x40, 0x75, 0xbe, 0xc7, 0xe2, 0x18, 0x2f, 0x41, 0x0e, + 0xef, 0x9b, 0x5e, 0xbd, 0x69, 0x1b, 0x98, 0xb7, 0x11, 0xa8, 0x9d, 0x09, 0xf0, 0xb2, 0x6d, 0x28, + 0x76, 0x16, 0x30, 0xd9, 0x9b, 0x92, 0x23, 0x79, 0x53, 0x78, 0x5d, 0x92, 0x1a, 0xe1, 0xba, 0x24, + 0xd6, 0x4e, 0xb9, 0xe3, 0xb1, 0x53, 0xf9, 0xeb, 0x04, 0x14, 0xa2, 0xe7, 0xc4, 0x77, 0x63, 0x0b, + 0xaa, 0xbb, 0x29, 0x39, 0xf2, 0x6e, 0x7a, 0x0b, 0x26, 0x48, 0x22, 0xa9, 0x7b, 0x1e, 0xff, 0x4d, + 0x40, 0x8a, 0x66, 0x83, 0x2c, 0xb6, 0xf9, 0xd6, 0x8a, 0x80, 0x2b, 0xb1, 0x4d, 0x82, 0x0f, 0xb8, + 0xee, 0xd8, 0x23, 0xba, 0xee, 0x67, 0x09, 0x98, 0x50, 0xce, 0xc3, 0x1f, 0x5e, 0x48, 0x2b, 0x4f, + 0xc1, 0x84, 0x92, 0x66, 0x96, 0x3f, 0x67, 0x7e, 0xa6, 0x9e, 0x7e, 0x3f, 0xbc, 0x75, 0x99, 0x84, + 0x71, 0x39, 0x5f, 0x2d, 0x57, 0x61, 0x2a, 0x92, 0x5e, 0xca, 0x13, 0xd0, 0x46, 0x99, 0x40, 0x79, + 0x0e, 0x66, 0xe2, 0xb2, 0xa2, 0xf2, 0x55, 0x98, 0x89, 0xcb, 0x57, 0x1e, 0x5d, 0xc1, 0x9b, 0xfc, + 0x7d, 0x08, 0xcb, 0x2c, 0x1e, 0x9d, 0xff, 0xbf, 0x52, 0xa2, 0x29, 0x12, 0xfe, 0xa2, 0xe6, 0x7d, + 0x28, 0x74, 0xc5, 0x47, 0xfd, 0xa1, 0xb5, 0x3b, 0x2d, 0x84, 0x02, 0xfa, 0xb5, 0x48, 0xe9, 0x3a, + 0xa9, 0x62, 0x54, 0xd9, 0xbc, 0x9a, 0x4e, 0x8c, 0x28, 0xbb, 0x16, 0x29, 0xab, 0x27, 0x55, 0x0c, + 0xfa, 0x7b, 0x38, 0x29, 0x5e, 0xaa, 0xee, 0x61, 0x31, 0xf0, 0xe4, 0x50, 0xe1, 0xec, 0x07, 0x40, + 0x01, 0x43, 0x74, 0xe4, 0x53, 0x11, 0x54, 0x44, 0x3c, 0x1f, 0x7b, 0x6a, 0x54, 0xf1, 0xd1, 0xc1, + 0x4f, 0x45, 0x50, 0x68, 0x03, 0x66, 0xa2, 0xab, 0x2e, 0x95, 0xdb, 0xa5, 0x7e, 0xaf, 0x74, 0x46, + 0x5d, 0x4b, 0xb5, 0xee, 0x3e, 0x39, 0x80, 0x54, 0x25, 0x4a, 0x05, 0x7c, 0x3a, 0x46, 0x62, 0x6d, + 0xb0, 0x92, 0x3f, 0x39, 0x80, 0x2c, 0x7f, 0xa1, 0xc1, 0x54, 0xe4, 0x77, 0x54, 0xe8, 0x0a, 0x64, + 0xe9, 0x0f, 0x9d, 0x1f, 0xec, 0x25, 0xd4, 0x0f, 0x29, 0x9d, 0xb2, 0x0a, 0x19, 0x0e, 0x42, 0x2f, + 0x43, 0x2e, 0xf8, 0xb9, 0x15, 0x7f, 0xfe, 0xc2, 0xf6, 0xac, 0x00, 0x2a, 0x7b, 0x56, 0x00, 0xcb, + 0xff, 0x94, 0x80, 0xd3, 0x43, 0x7f, 0x63, 0xf5, 0xc4, 0x1b, 0x36, 0x87, 0xea, 0x3b, 0x45, 0xba, + 0x2d, 0xa9, 0x11, 0xbb, 0x2d, 0x5f, 0x68, 0x30, 0x17, 0xff, 0x1b, 0xac, 0x23, 0x77, 0xe0, 0xd4, + 0x69, 0x24, 0x46, 0x7f, 0x65, 0x34, 0x2e, 0xff, 0x5c, 0xea, 0xc8, 0xc3, 0xb8, 0x08, 0x63, 0x5d, + 0xdb, 0x6e, 0xbb, 0xfc, 0x11, 0x20, 0x25, 0xa5, 0x00, 0x99, 0x94, 0x02, 0x0e, 0xd9, 0xf0, 0xfb, + 0xb3, 0x26, 0x62, 0x61, 0xf8, 0xab, 0xb0, 0x1f, 0x90, 0x0b, 0x3d, 0xfb, 0x02, 0x64, 0xc5, 0x13, + 0x27, 0x04, 0x90, 0x7e, 0x77, 0x6b, 0x75, 0x6b, 0xf5, 0x4a, 0xe1, 0x04, 0xca, 0x43, 0x66, 0x63, + 0xf5, 0xe6, 0x95, 0xeb, 0x37, 0xaf, 0x16, 0x34, 0xf2, 0x51, 0xdb, 0xba, 0x79, 0x93, 0x7c, 0x24, + 0x9e, 0xbd, 0x21, 0xbf, 0x24, 0xe7, 0xd5, 0xc5, 0x38, 0x64, 0x57, 0xba, 0x5d, 0x7a, 0xcc, 0x31, + 0xde, 0xd5, 0x3d, 0x93, 0x9c, 0x4d, 0x05, 0x0d, 0x65, 0x20, 0x79, 0xeb, 0xd6, 0x7a, 0x21, 0x81, + 0x66, 0xa0, 0x70, 0x05, 0xeb, 0x46, 0xdb, 0xb4, 0xb0, 0x38, 0x5b, 0x0b, 0xc9, 0xea, 0xdd, 0x9f, + 0xdd, 0x5f, 0xd0, 0xbe, 0xbe, 0xbf, 0xa0, 0xfd, 0xe6, 0xfe, 0x82, 0x76, 0xef, 0x9b, 0x85, 0x13, + 0x5f, 0x7f, 0xb3, 0x70, 0xe2, 0x57, 0xdf, 0x2c, 0x9c, 0x78, 0xff, 0x05, 0xe9, 0x6f, 0x50, 0xb0, + 0xf5, 0xeb, 0x3a, 0x36, 0x39, 0xf2, 0xf8, 0xd7, 0x52, 0xf4, 0xaf, 0x6e, 0xfc, 0x67, 0xe2, 0xec, + 0x0a, 0xfd, 0xdc, 0x60, 0x74, 0x95, 0xeb, 0x76, 0x85, 0x01, 0xe8, 0x1f, 0x4e, 0x70, 0x1b, 0x69, + 0xfa, 0x07, 0x12, 0x5e, 0xfa, 0x4b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, 0xfd, 0xd0, 0x85, 0xb0, + 0x43, 0x00, 0x00, } func (m *EventSequence) Marshal() (dAtA []byte, err error) { @@ -4853,16 +4853,18 @@ func (m *ResourceUtilisation) MarshalToSizedBuffer(dAtA []byte) (int, error) { for k := range m.TotalCumulativeUsage { v := m.TotalCumulativeUsage[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintEvents(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintEvents(dAtA, i, uint64(len(k))) @@ -4877,16 +4879,18 @@ func (m *ResourceUtilisation) MarshalToSizedBuffer(dAtA []byte) (int, error) { for k := range m.MaxResourcesForPeriod { v := m.MaxResourcesForPeriod[k] baseI := i - { - size, err := (&v).MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintEvents(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintEvents(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x12 } - i-- - dAtA[i] = 0x12 i -= len(k) copy(dAtA[i:], k) i = encodeVarintEvents(dAtA, i, uint64(len(k))) @@ -8116,8 +8120,12 @@ func (m *ResourceUtilisation) Size() (n int) { for k, v := range m.MaxResourcesForPeriod { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovEvents(uint64(len(k))) + 1 + l + sovEvents(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovEvents(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovEvents(uint64(len(k))) + l n += mapEntrySize + 1 + sovEvents(uint64(mapEntrySize)) } } @@ -8125,8 +8133,12 @@ func (m *ResourceUtilisation) Size() (n int) { for k, v := range m.TotalCumulativeUsage { _ = k _ = v - l = v.Size() - mapEntrySize := 1 + len(k) + sovEvents(uint64(len(k))) + 1 + l + sovEvents(uint64(l)) + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovEvents(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovEvents(uint64(len(k))) + l n += mapEntrySize + 1 + sovEvents(uint64(mapEntrySize)) } } @@ -10660,10 +10672,10 @@ func (m *ResourceUtilisation) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MaxResourcesForPeriod == nil { - m.MaxResourcesForPeriod = make(map[string]resource.Quantity) + m.MaxResourcesForPeriod = make(map[string]*resource.Quantity) } var mapkey string - mapvalue := &resource.Quantity{} + var mapvalue *resource.Quantity for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -10757,7 +10769,7 @@ func (m *ResourceUtilisation) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.MaxResourcesForPeriod[mapkey] = *mapvalue + m.MaxResourcesForPeriod[mapkey] = mapvalue iNdEx = postIndex case 5: if wireType != 2 { @@ -10789,10 +10801,10 @@ func (m *ResourceUtilisation) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.TotalCumulativeUsage == nil { - m.TotalCumulativeUsage = make(map[string]resource.Quantity) + m.TotalCumulativeUsage = make(map[string]*resource.Quantity) } var mapkey string - mapvalue := &resource.Quantity{} + var mapvalue *resource.Quantity for iNdEx < postIndex { entryPreIndex := iNdEx var wire uint64 @@ -10886,7 +10898,7 @@ func (m *ResourceUtilisation) Unmarshal(dAtA []byte) error { iNdEx += skippy } } - m.TotalCumulativeUsage[mapkey] = *mapvalue + m.TotalCumulativeUsage[mapkey] = mapvalue iNdEx = postIndex case 6: if wireType != 2 { diff --git a/pkg/armadaevents/events.proto b/pkg/armadaevents/events.proto index a3741729757..be48b2b9e49 100644 --- a/pkg/armadaevents/events.proto +++ b/pkg/armadaevents/events.proto @@ -113,8 +113,8 @@ message ResourceUtilisation { Uuid run_id = 1; Uuid job_id = 2; KubernetesResourceInfo resource_info = 3; - map max_resources_for_period = 4 [(gogoproto.nullable) = false]; - map total_cumulative_usage = 5 [(gogoproto.nullable) = false]; + map max_resources_for_period = 4; + map total_cumulative_usage = 5; // This is a string representation of the job_id. Eventually we will retire the job_id field and just use strings string job_id_str = 6; string run_id_str = 7; diff --git a/pkg/client/domain/watch.go b/pkg/client/domain/watch.go index 610c06db0ac..221a2b4f8b4 100644 --- a/pkg/client/domain/watch.go +++ b/pkg/client/domain/watch.go @@ -171,7 +171,7 @@ func updateJobInfo(info *JobInfo, event api.Event) { if isLifeCycleEvent(event) && !isPodEvent(event) { if info.LastUpdate.After(eventTs) { if submitEvent, ok := event.(*api.JobSubmittedEvent); ok { - info.Job = &submitEvent.Job + info.Job = submitEvent.Job } // skipping event as it is out of time order return @@ -182,7 +182,7 @@ func updateJobInfo(info *JobInfo, event api.Event) { switch typed := event.(type) { case *api.JobSubmittedEvent: info.Status = Submitted - info.Job = &typed.Job + info.Job = typed.Job for len(info.PodStatus) < len(typed.Job.PodSpecs) { info.PodStatus = append(info.PodStatus, Submitted) info.PodLastUpdated = append(info.PodLastUpdated, time.Time{}) @@ -222,7 +222,7 @@ func updateJobInfo(info *JobInfo, event api.Event) { case *api.JobIngressInfoEvent: // NOOP case *api.JobUtilisationEvent: - info.MaxUsedResources.Max(typed.MaxResourcesForPeriod) + info.MaxUsedResources.Max(armadaresource.FromProtoMap(typed.MaxResourcesForPeriod)) } } diff --git a/pkg/client/domain/watch_test.go b/pkg/client/domain/watch_test.go index 346f5732d82..e98f05bb0fa 100644 --- a/pkg/client/domain/watch_test.go +++ b/pkg/client/domain/watch_test.go @@ -59,7 +59,7 @@ func TestWatchContext_ProcessEvent_SubmittedEventAddsJobToJobInfo(t *testing.T) MaxUsedResources: armadaresource.ComputeResources{}, } - watchContext.ProcessEvent(&api.JobSubmittedEvent{JobId: "1", Job: job}) + watchContext.ProcessEvent(&api.JobSubmittedEvent{JobId: "1", Job: &job}) result := watchContext.GetJobInfo("1") assert.Equal(t, expected, result) @@ -216,7 +216,7 @@ func TestWatchContext_EventsOutOfOrder(t *testing.T) { ) assert.Equal(t, map[JobStatus]int{Succeeded: 1}, watchContext.stateSummary) - watchContext.ProcessEvent(&api.JobSubmittedEvent{JobId: "1", Job: job, Created: protoutil.ToTimestamp(now.Add(-2 * time.Second))}) + watchContext.ProcessEvent(&api.JobSubmittedEvent{JobId: "1", Job: &job, Created: protoutil.ToTimestamp(now.Add(-2 * time.Second))}) assert.Equal( t, &JobInfo{ @@ -234,6 +234,7 @@ func TestWatchContext_EventsOutOfOrder(t *testing.T) { func TestWatchContext_UtilisationEvent(t *testing.T) { watchContext := NewWatchContext() + oneCpu := resource.MustParse("1") watchContext.ProcessEvent(&api.JobUtilisationEvent{ JobId: "job1", JobSetId: "", @@ -241,8 +242,8 @@ func TestWatchContext_UtilisationEvent(t *testing.T) { Created: types.TimestampNow(), ClusterId: "", KubernetesId: "", - MaxResourcesForPeriod: armadaresource.ComputeResources{ - "cpu": resource.MustParse("1"), + MaxResourcesForPeriod: map[string]*resource.Quantity{ + "cpu": &oneCpu, }, }) assert.Equal(t, resource.MustParse("1"), watchContext.GetJobInfo("job1").MaxUsedResources["cpu"]) diff --git a/pkg/client/queue/queue.go b/pkg/client/queue/queue.go index 4e3689029a1..e7bace8740c 100644 --- a/pkg/client/queue/queue.go +++ b/pkg/client/queue/queue.go @@ -3,6 +3,7 @@ package queue import ( "fmt" + armadamaps "github.com/armadaproject/armada/internal/common/maps" "github.com/armadaproject/armada/pkg/api" ) @@ -14,7 +15,7 @@ type Queue struct { } // NewQueue returns new Queue using the in parameter. Error is returned if -// any of the queue fields has corresponding value in in that is invalid. +// any of the queue fields has corresponding value that is invalid. func NewQueue(in *api.Queue) (Queue, error) { if in == nil { return Queue{}, fmt.Errorf("queue is nil") @@ -38,20 +39,31 @@ func NewQueue(in *api.Queue) (Queue, error) { permissions = append(permissions, perm) } + resourceLimitsByPriorityClassName := make(map[string]api.PriorityClassResourceLimits, len(in.ResourceLimitsByPriorityClassName)) + for k, v := range in.ResourceLimitsByPriorityClassName { + if v != nil { + resourceLimitsByPriorityClassName[k] = *v + } + } + return Queue{ Name: in.Name, PriorityFactor: priorityFactor, Permissions: permissions, - ResourceLimitsByPriorityClassName: in.ResourceLimitsByPriorityClassName, + ResourceLimitsByPriorityClassName: resourceLimitsByPriorityClassName, }, nil } // ToAPI transforms Queue to *api.Queue structure func (q Queue) ToAPI() *api.Queue { rv := &api.Queue{ - Name: q.Name, - PriorityFactor: float64(q.PriorityFactor), - ResourceLimitsByPriorityClassName: q.ResourceLimitsByPriorityClassName, + Name: q.Name, + PriorityFactor: float64(q.PriorityFactor), + ResourceLimitsByPriorityClassName: armadamaps.MapValues( + q.ResourceLimitsByPriorityClassName, + func(p api.PriorityClassResourceLimits) *api.PriorityClassResourceLimits { + return &p + }), } for _, permission := range q.Permissions { rv.Permissions = append(rv.Permissions, permission.ToAPI()) diff --git a/pkg/client/queue/queue_test.go b/pkg/client/queue/queue_test.go index 9808ad45887..bcad7b610fa 100644 --- a/pkg/client/queue/queue_test.go +++ b/pkg/client/queue/queue_test.go @@ -5,6 +5,8 @@ import ( "reflect" "testing" "testing/quick" + + "github.com/armadaproject/armada/pkg/api" ) func TestQueue(t *testing.T) { @@ -37,6 +39,30 @@ func TestQueueMarshalUnmarshal(t *testing.T) { return false } + // json.Unmarshal will unmarshall empty maps to nil + // TODO: refactor these tests/code so this nonsense is not necessary + newResourceLimits := make(map[string]api.PriorityClassResourceLimits, len(queue2.ResourceLimitsByPriorityClassName)) + for k1, v := range queue2.ResourceLimitsByPriorityClassName { + if v.MaximumResourceFractionByPool == nil { + v.MaximumResourceFractionByPool = map[string]*api.PriorityClassPoolResourceLimits{} + } + for k, v2 := range v.MaximumResourceFractionByPool { + if v2 != nil && v2.MaximumResourceFraction == nil { + v.MaximumResourceFractionByPool[k] = &api.PriorityClassPoolResourceLimits{ + MaximumResourceFraction: map[string]float64{}, + } + } + if v2 != nil && v2.MaximumResourceFraction == nil { + v2.MaximumResourceFraction = map[string]float64{} + } + } + if v.MaximumResourceFraction == nil { + v.MaximumResourceFraction = map[string]float64{} + } + newResourceLimits[k1] = v + } + queue2.ResourceLimitsByPriorityClassName = newResourceLimits + return reflect.DeepEqual(queue1, queue2) } diff --git a/testsuite/performance/jobservice/fakearmada/event_server.go b/testsuite/performance/jobservice/fakearmada/event_server.go index a74585eaeee..f2f5676291c 100644 --- a/testsuite/performance/jobservice/fakearmada/event_server.go +++ b/testsuite/performance/jobservice/fakearmada/event_server.go @@ -53,7 +53,7 @@ var messageScript = []*scriptedMessage{ JobSetId: request.Id, Queue: request.Queue, Created: types.TimestampNow(), - Job: api.Job{ + Job: &api.Job{ Id: "fake_job_id", ClientId: "", Queue: request.Queue,