This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
     new 80a0eb7  SCB-1059 Should not show the shared microservices by default 
(#528)
80a0eb7 is described below

commit 80a0eb7a76407198c2d2fb54009dfa1cdf09cfd3
Author: little-cui <[email protected]>
AuthorDate: Wed Jan 23 15:48:02 2019 +0800

    SCB-1059 Should not show the shared microservices by default (#528)
---
 frontend/app/apiList/apiList.js                    |   6 +-
 .../serviceCenter/controllers/schemaCtrl.js        |   9 +-
 .../serviceCenter/controllers/serviceInfoCtrl.js   |  19 +-
 .../serviceCenter/controllers/servicesListCtrl.js  |  38 +-
 frontend/app/scripts/scRouterConfig.js             |  12 +-
 server/core/proto/services.pb.go                   | 434 +++++++++++----------
 server/core/proto/services.proto                   |   2 +
 server/govern/controller_v4.go                     |  33 +-
 server/govern/service.go                           |  43 +-
 server/plugin/pkg/registry/etcd/common.go          |   4 +-
 10 files changed, 319 insertions(+), 281 deletions(-)

diff --git a/frontend/app/apiList/apiList.js b/frontend/app/apiList/apiList.js
index 8e36cbb..1258f10 100644
--- a/frontend/app/apiList/apiList.js
+++ b/frontend/app/apiList/apiList.js
@@ -19,10 +19,6 @@ angular.module('serviceCenter')
        .constant('apiConstant', {
             // v4 api's
                api : {
-            microservice: {
-                url: 'v4/default/registry/microservices',
-                method: 'GET'
-            },
             instances: {
                 url: 
'v4/default/registry/microservices/{{serviceId}}/instances',
                 method: 'GET'
@@ -44,7 +40,7 @@ angular.module('serviceCenter')
                 method: 'GET'
             },
             allServices: {
-                url: 
'v4/default/govern/microservices?options=instances,dependencies',
+                url: 
'v4/default/govern/microservices?options=instances,dependencies&withShared=true',
                 method: 'GET'
             },
             deleteService: {
diff --git 
a/frontend/app/scripts/modules/serviceCenter/controllers/schemaCtrl.js 
b/frontend/app/scripts/modules/serviceCenter/controllers/schemaCtrl.js
index cd21f13..0f37c95 100644
--- a/frontend/app/scripts/modules/serviceCenter/controllers/schemaCtrl.js
+++ b/frontend/app/scripts/modules/serviceCenter/controllers/schemaCtrl.js
@@ -26,10 +26,11 @@ angular.module('serviceCenter.sc')
             var addresses = [];
             var instances = [];
             var promises = [];
-            if (servicesList && servicesList.data && 
servicesList.data.services) {
-                servicesList.data.services.forEach(function(services) {
-                    if (services.serviceId == serviceId) {
-                        $scope.schemaName = services.schemas || [];
+            if (servicesList && servicesList.data && 
servicesList.data.allServicesDetail) {
+                
servicesList.data.allServicesDetail.forEach(function(serviceDetail) {
+                    var service = serviceDetail.microService;
+                    if (service.serviceId == serviceId) {
+                        $scope.schemaName = service.schemas || [];
                     }
                 });
             }
diff --git 
a/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js 
b/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js
index 4070bc9..6d2769b 100644
--- a/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js
+++ b/frontend/app/scripts/modules/serviceCenter/controllers/serviceInfoCtrl.js
@@ -20,16 +20,17 @@ angular.module('serviceCenter.sc')
         '$stateParams','serviceInfo' ,function($scope, httpService, 
commonService, $q, apiConstant, $state, $stateParams, serviceInfo){
 
                        var serviceId = $stateParams.serviceId;
-                       if(serviceInfo && serviceInfo.data && 
serviceInfo.data.services){
-                               
serviceInfo.data.services.forEach(function(services){
-                       if(services.serviceId == serviceId){
+                       if(serviceInfo && serviceInfo.data && 
serviceInfo.data.allServicesDetail){
+                               
serviceInfo.data.allServicesDetail.forEach(function(serviceDetail){
+                                       var service = 
serviceDetail.microService;
+                       if(service.serviceId == serviceId){
                            $scope.serviceDetail = {
-                               serviceName: services.serviceName,
-                               status: services.status,
-                               appId: services.appId,
-                               version: services.version,
-                               createdAt: 
commonService.timeFormat(services.timestamp),
-                               serviceId: services.serviceId
+                               serviceName: service.serviceName,
+                               status: service.status,
+                               appId: service.appId,
+                               version: service.version,
+                               createdAt: 
commonService.timeFormat(service.timestamp),
+                               serviceId: service.serviceId
                            };
                        }
                });
diff --git 
a/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js 
b/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js
index 56edfe5..53c1bcc 100644
--- a/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js
+++ b/frontend/app/scripts/modules/serviceCenter/controllers/servicesListCtrl.js
@@ -127,15 +127,15 @@ angular.module('serviceCenter.sc', [])
                 if ($stateParams.status) {
                     filter = $stateParams.status;
                 }
-                var url = apiConstant.api.microservice.url;
-                var method = apiConstant.api.microservice.method;
+                var url = apiConstant.api.allServices.url;
+                var method = apiConstant.api.allServices.method;
 
                 httpService.apiRequest(url, method).then(function(response) {
-                    if (response && response.data && response.data.services) {
+                    if (response && response.data && 
response.data.allServicesDetail) {
                         $scope.services = [];
                         $scope.servicesCopy = [];
-                        response.data.services.forEach(function(service) {
-                            processService(service);
+                        
response.data.allServicesDetail.forEach(function(serviceDetail) {
+                            processService(serviceDetail);
                         });
 
                         if (filter) {
@@ -160,41 +160,25 @@ angular.module('serviceCenter.sc', [])
             var serviceRefresh = $interval(function(){
                 $scope.getAllServices();
             }, 10000);
-     
+
             $scope.$on('$destroy', function(){
                 $interval.cancel(serviceRefresh);
             })
 
-            function processService(service) {
-                var instanceApi = apiConstant.api.instances.url;
-                var instanceUrl = instanceApi.replace("{{serviceId}}", 
service.serviceId);
-                var instanceMethod = apiConstant.api.instances.method;
-                var headers = {
-                    "X-ConsumerId": service.serviceId
-                };
-
+            function processService(serviceDetail) {
+                var service = serviceDetail.microService;
+                serviceDetail.instances = serviceDetail.instances || [];
                 var servicesList = {
                     serviceName: service.serviceName,
                     status: service.status,
                     appId: service.appId,
                     version: service.version,
                     createdAt: commonService.timeFormat(service.timestamp),
-                    instances: 0,
+                    instances: serviceDetail.instances.length,
                     operation: '',
                     serviceId: service.serviceId,
-                    disableBtn: false
+                    disableBtn: serviceDetail.instances.length > 0
                 };
-
-                httpService.apiRequest(instanceUrl, instanceMethod, null, 
headers, null).then(function(resp) {
-                    if (resp && resp.data && resp.data.instances) {
-                        servicesList.instances = resp.data.instances.length;
-                        if (servicesList.instances > 0) {
-                            servicesList.disableBtn = true;
-                        }
-                    }
-                }, (error) => {
-                    servicesList.disableBtn = false;
-                });
                 $scope.services.push(servicesList);
                 $scope.servicesCopy.push(servicesList);
             }
diff --git a/frontend/app/scripts/scRouterConfig.js 
b/frontend/app/scripts/scRouterConfig.js
index e07ea22..c111c04 100644
--- a/frontend/app/scripts/scRouterConfig.js
+++ b/frontend/app/scripts/scRouterConfig.js
@@ -57,11 +57,11 @@ angular.module('serviceCenter.router', [])
                         $(".loader").show();
                         var serviceId = $stateParams.serviceId;
                         var deferred = $q.defer();
-                        var url = apiConstant.api.microservice.url;
-                        var method = apiConstant.api.microservice.method;
+                        var url = apiConstant.api.allServices.url;
+                        var method = apiConstant.api.allServices.method;
                         httpService.apiRequest(url, method, null, null, 
null).then(function(response) {
                             $(".loader").hide();
-                            if (response && response.data && 
response.data.services) {
+                            if (response && response.data && 
response.data.allServicesDetail) {
                                 deferred.resolve(response);
                             } else {
                                 deferred.resolve(response);
@@ -119,11 +119,11 @@ angular.module('serviceCenter.router', [])
                     servicesList: ['$q', 'httpService', 'apiConstant', 
function($q, httpService, apiConstant) {
                         $(".loader").show();
                         var deferred = $q.defer();
-                        var url = apiConstant.api.microservice.url;
-                        var method = apiConstant.api.microservice.method;
+                        var url = apiConstant.api.allServices.url;
+                        var method = apiConstant.api.allServices.method;
                         httpService.apiRequest(url, method, null, null, 
null).then(function(response) {
                             $(".loader").hide();
-                            if (response && response.data && 
response.data.services) {
+                            if (response && response.data && 
response.data.allServicesDetail) {
                                 deferred.resolve(response);
                             } else {
                                 deferred.resolve(response);
diff --git a/server/core/proto/services.pb.go b/server/core/proto/services.pb.go
index a53e46d..b7ad422 100644
--- a/server/core/proto/services.pb.go
+++ b/server/core/proto/services.pb.go
@@ -410,6 +410,7 @@ type GetServicesInfoRequest struct {
        AppId       string   `protobuf:"bytes,2,opt,name=appId" 
json:"appId,omitempty"`
        ServiceName string   `protobuf:"bytes,3,opt,name=serviceName" 
json:"serviceName,omitempty"`
        CountOnly   bool     `protobuf:"varint,4,opt,name=countOnly" 
json:"countOnly,omitempty"`
+       WithShared  bool     `protobuf:"varint,5,opt,name=withShared" 
json:"withShared,omitempty"`
 }
 
 func (m *GetServicesInfoRequest) Reset()                    { *m = 
GetServicesInfoRequest{} }
@@ -445,6 +446,13 @@ func (m *GetServicesInfoRequest) GetCountOnly() bool {
        return false
 }
 
+func (m *GetServicesInfoRequest) GetWithShared() bool {
+       if m != nil {
+               return m.WithShared
+       }
+       return false
+}
+
 type GetServicesInfoResponse struct {
        Response          *Response        
`protobuf:"bytes,1,opt,name=response" json:"response,omitempty"`
        AllServicesDetail []*ServiceDetail 
`protobuf:"bytes,2,rep,name=allServicesDetail" 
json:"allServicesDetail,omitempty"`
@@ -2764,6 +2772,7 @@ func (m *DelServicesResponse) GetServices() 
[]*DelServicesRspInfo {
 
 type GetAppsRequest struct {
        Environment string `protobuf:"bytes,1,opt,name=environment" 
json:"environment,omitempty"`
+       WithShared  bool   `protobuf:"varint,2,opt,name=withShared" 
json:"withShared,omitempty"`
 }
 
 func (m *GetAppsRequest) Reset()                    { *m = GetAppsRequest{} }
@@ -2778,6 +2787,13 @@ func (m *GetAppsRequest) GetEnvironment() string {
        return ""
 }
 
+func (m *GetAppsRequest) GetWithShared() bool {
+       if m != nil {
+               return m.WithShared
+       }
+       return false
+}
+
 type GetAppsResponse struct {
        Response *Response `protobuf:"bytes,1,opt,name=response" 
json:"response,omitempty"`
        AppIds   []string  `protobuf:"bytes,2,rep,name=appIds" 
json:"appIds,omitempty"`
@@ -4251,212 +4267,214 @@ var _GovernServiceCtrl_serviceDesc = grpc.ServiceDesc{
 func init() { proto1.RegisterFile("services.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-       // 3309 bytes of a gzipped FileDescriptorProto
-       0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x3b, 
0x4b, 0x6f, 0xdc, 0xc8,
-       0xd1, 0xe0, 0x68, 0x46, 0x33, 0x53, 0x7a, 0x58, 0x6a, 0x4b, 0x16, 0x4d, 
0xbf, 0xe4, 0xde, 0xfd,
-       0xbe, 0x35, 0xb0, 0xfb, 0x69, 0xd7, 0xda, 0xf7, 0xc3, 0x1f, 0x56, 0x96, 
0x6c, 0x59, 0x96, 0x1d,
-       0x7b, 0x39, 0xde, 0x35, 0xb2, 0x41, 0x90, 0xa5, 0x66, 0x5a, 0x23, 0xc6, 
0x1c, 0x92, 0x21, 0x39,
-       0xf2, 0x0e, 0x10, 0x6c, 0x10, 0x2c, 0x02, 0xe4, 0x92, 0x1c, 0x72, 0x09, 
0x90, 0xe4, 0x94, 0x5b,
-       0xf2, 0x07, 0x72, 0x08, 0x82, 0xdc, 0x03, 0xe4, 0x16, 0x20, 0xa7, 0xfd, 
0x07, 0x39, 0xe7, 0x1c,
-       0xf4, 0x83, 0x64, 0x37, 0xd9, 0x33, 0x1a, 0x51, 0xde, 0x9c, 0x86, 0xdd, 
0x5d, 0x5d, 0x5d, 0x5d,
-       0x5d, 0x55, 0x5d, 0x8f, 0x1e, 0x58, 0x8c, 0x49, 0x74, 0xec, 0x76, 0x49, 
0xbc, 0x11, 0x46, 0x41,
-       0x12, 0xa0, 0x06, 0xfb, 0xc1, 0xdf, 0x87, 0x95, 0x87, 0x41, 0xcf, 0x3d, 
0x1c, 0x75, 0xba, 0x47,
-       0x64, 0xe0, 0xc4, 0x36, 0xf9, 0xd1, 0x90, 0xc4, 0x09, 0xba, 0x0c, 0x6d, 
0x31, 0x61, 0xaf, 0x67,
-       0x1a, 0xeb, 0xc6, 0x8d, 0xb6, 0x9d, 0x77, 0xa0, 0x57, 0xa0, 0x19, 0x73, 
0x78, 0xb3, 0xb6, 0x3e,
-       0x73, 0x63, 0x6e, 0x73, 0x81, 0x63, 0xdd, 0xe0, 0x58, 0xec, 0x74, 0x14, 
0x7f, 0x06, 0xb3, 0xbc,
-       0x0b, 0x59, 0xd0, 0xe2, 0x9d, 0x19, 0xbe, 0xac, 0x8d, 0x4c, 0x68, 0xc6, 
0xc3, 0xc1, 0xc0, 0x89,
-       0x46, 0x66, 0x8d, 0x0d, 0xa5, 0x4d, 0x74, 0x01, 0x66, 0x39, 0x94, 0x39, 
0xc3, 0x06, 0x44, 0x0b,
-       0xef, 0xc0, 0x6a, 0x81, 0xec, 0x38, 0x0c, 0xfc, 0x98, 0xa0, 0x57, 0xa1, 
0x15, 0x89, 0x6f, 0xb6,
-       0xcc, 0xdc, 0xe6, 0x39, 0x41, 0x5a, 0x0a, 0x62, 0x67, 0x00, 0xf8, 0x11, 
0x9c, 0xbf, 0x47, 0x9c,
-       0x28, 0x39, 0x20, 0x4e, 0xd2, 0x21, 0x49, 0xba, 0xf7, 0xf7, 0xa0, 0xed, 
0xfa, 0x71, 0xe2, 0xf8,
-       0x5d, 0x12, 0x9b, 0x06, 0xdb, 0x9f, 0x25, 0x90, 0xc8, 0xe0, 0x77, 0x3c, 
0x32, 0x20, 0x7e, 0x62,
-       0xe7, 0xc0, 0xb8, 0xa3, 0x22, 0x14, 0x10, 0x27, 0x30, 0xf3, 0x2a, 0x40, 
0x8a, 0x61, 0xaf, 0x27,
-       0x18, 0x20, 0xf5, 0xe0, 0xe7, 0xb0, 0xa2, 0x52, 0x59, 0x61, 0xab, 0x68, 
0x53, 0xde, 0x13, 0x3f,
-       0xb3, 0x15, 0x01, 0xbd, 0x27, 0xfa, 0xef, 0x1d, 0xd8, 0xb1, 0xb2, 0x9b, 
0x01, 0x2c, 0x28, 0x63,
-       0x67, 0xdb, 0x07, 0x1d, 0x27, 0x51, 0xf4, 0x90, 0xc4, 0xb1, 0xd3, 0x27, 
0xe2, 0x3c, 0xa5, 0x1e,
-       0xbc, 0x0d, 0xed, 0x4e, 0xd2, 0xe1, 0xe8, 0xd0, 0x0a, 0x34, 0xba, 0xc1, 
0xd0, 0x4f, 0xd8, 0x32,
-       0x33, 0x36, 0x6f, 0xa0, 0x75, 0x98, 0x0b, 0x7c, 0xcf, 0xf5, 0xc9, 0x36, 
0x1b, 0xab, 0xb1, 0x31,
-       0xb9, 0x0b, 0xdf, 0x03, 0xe8, 0x24, 0x29, 0xd5, 0x63, 0xb0, 0xbc, 0x0c, 
0x0b, 0xec, 0xe3, 0xf6,
-       0x68, 0x27, 0x18, 0x38, 0xae, 0x2f, 0xf0, 0xa8, 0x9d, 0xf8, 0x0a, 0x34, 
0x3a, 0xc9, 0x56, 0x18,
-       0xea, 0x91, 0xe0, 0x5f, 0x18, 0x74, 0x25, 0x27, 0x71, 0xe3, 0xc4, 0xed, 
0xc6, 0xe8, 0x35, 0x68,
-       0xa5, 0x0a, 0x26, 0x0e, 0x63, 0x29, 0x55, 0x89, 0x74, 0x4f, 0x76, 0x06, 
0x81, 0x5e, 0x57, 0x4f,
-       0x83, 0x82, 0x2f, 0x67, 0xe0, 0x29, 0xf5, 0xd2, 0x51, 0xa0, 0x75, 0xa8, 
0x3b, 0x61, 0x18, 0x33,
-       0xae, 0xcd, 0x6d, 0xce, 0x67, 0xb0, 0x5b, 0x61, 0x68, 0xb3, 0x11, 0xfc, 
0x73, 0x03, 0x2e, 0xec,
-       0x92, 0x74, 0xad, 0x78, 0xcf, 0x3f, 0x0c, 0x52, 0x79, 0x36, 0xa1, 0x19, 
0x84, 0x89, 0x1b, 0xf8,
-       0x5c, 0x9a, 0xdb, 0x76, 0xda, 0xa4, 0x5b, 0x73, 0xc2, 0x30, 0x3b, 0x2d, 
0xde, 0xa0, 0x5c, 0x16,
-       0x94, 0x7e, 0xc7, 0x19, 0xa4, 0x27, 0x25, 0x77, 0x51, 0x41, 0x60, 0x5c, 
0x78, 0xe4, 0x7b, 0x23,
-       0xb3, 0xbe, 0x6e, 0xdc, 0x68, 0xd9, 0x79, 0x07, 0xfe, 0x8b, 0x01, 0x6b, 
0x25, 0x52, 0xaa, 0x08,
-       0xed, 0x6d, 0x58, 0x76, 0x3c, 0x2f, 0xc5, 0xb3, 0x43, 0x12, 0xc7, 0xf5, 
0x0a, 0xc2, 0x2b, 0x06,
-       0xf9, 0x98, 0x5d, 0x06, 0x47, 0x37, 0x01, 0xe2, 0xec, 0x98, 0x04, 0xff, 
0x72, 0x5e, 0xa7, 0x03,
-       0xb6, 0x04, 0x84, 0xff, 0x6e, 0xc0, 0xb9, 0x87, 0x6e, 0x37, 0x0a, 0x04, 
0xaa, 0x7d, 0xc2, 0x0c,
-       0x51, 0x42, 0x7c, 0x47, 0x48, 0x41, 0xdb, 0x16, 0x2d, 0xca, 0xdb, 0x30, 
0x0a, 0x7e, 0x48, 0xba,
-       0x49, 0x6a, 0xba, 0x44, 0x33, 0xe7, 0xed, 0xcc, 0x04, 0xde, 0xd6, 0xcb, 
0xbc, 0x35, 0xa1, 0x79,
-       0x4c, 0xa2, 0xd8, 0x0d, 0x7c, 0xb3, 0xc1, 0x31, 0x8a, 0x26, 0x9d, 0x4b, 
0xfc, 0x63, 0x37, 0x0a,
-       0x7c, 0x6a, 0x55, 0xcc, 0x59, 0x3e, 0x57, 0xea, 0x62, 0x6b, 0x7a, 0xae, 
0x13, 0x9b, 0x4d, 0xb1,
-       0x26, 0x6d, 0xe0, 0xdf, 0xcf, 0xc2, 0xbc, 0xbc, 0x9f, 0x13, 0xf4, 0xb8, 
0xaa, 0x50, 0x48, 0x84,
-       0xd7, 0x4b, 0x84, 0xf7, 0x48, 0xdc, 0x8d, 0x5c, 0x26, 0x76, 0x62, 0x5b, 
0x72, 0x17, 0x5d, 0xd3,
-       0x23, 0xc7, 0xc4, 0x13, 0x9b, 0xe2, 0x0d, 0x76, 0x2f, 0x88, 0x6b, 0xa6, 
0xc9, 0x05, 0x57, 0x34,
-       0xd1, 0x0d, 0x68, 0x84, 0x4e, 0x72, 0x14, 0x9b, 0xc0, 0xa4, 0x01, 0xa9, 
0xd2, 0xf0, 0xd8, 0x49,
-       0x8e, 0x6c, 0x0e, 0xc0, 0x6e, 0x90, 0xc4, 0x49, 0x86, 0xb1, 0xd9, 0x12, 
0x37, 0x08, 0x6b, 0xa1,
-       0x6d, 0x80, 0x30, 0x0a, 0x42, 0x12, 0x25, 0x2e, 0x89, 0xcd, 0x36, 0x43, 
0xf3, 0x92, 0x40, 0x23,
-       0x33, 0x6b, 0xe3, 0x71, 0x06, 0x75, 0xc7, 0x4f, 0xa2, 0x91, 0x2d, 0x4d, 
0xa3, 0x8c, 0x4c, 0xdc,
-       0x01, 0x89, 0x13, 0x67, 0x10, 0x9a, 0x73, 0x9c, 0x91, 0x59, 0x07, 0x7a, 
0x0b, 0xda, 0x61, 0x14,
-       0x1c, 0xbb, 0x3d, 0x12, 0xc5, 0xe6, 0x3c, 0x5b, 0xe1, 0x82, 0x66, 0x85, 
0x7d, 0x32, 0xb2, 0x73,
-       0xc0, 0xfc, 0x0c, 0x17, 0xa4, 0x33, 0xa4, 0xe4, 0x3e, 0xb8, 0xdd, 0x49, 
0x22, 0x27, 0x21, 0xfd,
-       0x91, 0xb9, 0x38, 0x9e, 0xdc, 0x1c, 0x4a, 0x90, 0x9b, 0x77, 0x20, 0x0c, 
0xf3, 0x83, 0xa0, 0xf7,
-       0x24, 0xa3, 0xf8, 0x1c, 0x5b, 0x41, 0xe9, 0x2b, 0x0a, 0xd9, 0x52, 0x59, 
0xc8, 0xae, 0x02, 0x44,
-       0xa4, 0xef, 0xc6, 0x09, 0x89, 0x6e, 0x8f, 0xcc, 0x65, 0x6e, 0xc7, 0xf3, 
0x1e, 0xf4, 0x0e, 0xb4,
-       0x0f, 0x23, 0x67, 0x40, 0x9e, 0x07, 0xd1, 0x33, 0x13, 0x31, 0x85, 0x33, 
0x05, 0xa5, 0x77, 0x69,
-       0xff, 0xd3, 0x20, 0x7a, 0x26, 0x98, 0x3a, 0xb2, 0x73, 0x50, 0xeb, 0x16, 
0x9c, 0x2b, 0xf0, 0x1a,
-       0x2d, 0xc1, 0xcc, 0x33, 0x32, 0x12, 0x22, 0x4a, 0x3f, 0x29, 0x77, 0x8e, 
0x1d, 0x6f, 0x48, 0x52,
-       0xe1, 0x64, 0x8d, 0x0f, 0x6a, 0xef, 0x19, 0x74, 0x7a, 0x61, 0xef, 0xa7, 
0x99, 0x8e, 0xb7, 0x60,
-       0xb9, 0x44, 0x1d, 0x42, 0x50, 0xf7, 0xa9, 0xb4, 0x73, 0x0c, 0xec, 0x5b, 
0x16, 0xf3, 0x9a, 0x22,
-       0xe6, 0xf8, 0x1b, 0x03, 0xe6, 0x52, 0x5b, 0x3f, 0xf4, 0x08, 0x15, 0xbd, 
0x68, 0xe8, 0xe5, 0x3a,
-       0x26, 0x5a, 0xd4, 0x15, 0xa2, 0x5f, 0x4f, 0x46, 0x61, 0x4a, 0x47, 0xd6, 
0xa6, 0x12, 0xe5, 0x24,
-       0x49, 0xe4, 0x1e, 0x0c, 0x93, 0x54, 0xc9, 0xf2, 0x0e, 0x66, 0x6d, 0x9c, 
0x24, 0x21, 0x51, 0xa6,
-       0x62, 0xa2, 0x39, 0x85, 0x8a, 0x29, 0xb2, 0x3a, 0x5b, 0x94, 0xd5, 0xa2, 
0x68, 0x34, 0xcb, 0xa2,
-       0x81, 0x7f, 0x69, 0xc0, 0x85, 0xad, 0x5e, 0xef, 0x51, 0xf4, 0x69, 0xd8, 
0x73, 0x12, 0x22, 0x6f,
-       0x55, 0xde, 0x92, 0x31, 0x69, 0x4b, 0xb5, 0x09, 0x5b, 0x9a, 0x99, 0xb8, 
0xa5, 0x7a, 0x69, 0x4b,
-       0xf8, 0x77, 0x39, 0xc3, 0xa9, 0xca, 0xd3, 0xe3, 0xa2, 0x4a, 0x9f, 0x1e, 
0x17, 0xfd, 0x46, 0x1f,
-       0x41, 0x4b, 0x28, 0xec, 0x48, 0x5c, 0x1d, 0xeb, 0x65, 0x63, 0x91, 0x2a, 
0xb9, 0xd0, 0x99, 0x6c,
-       0x86, 0xf5, 0x21, 0x2c, 0x28, 0x43, 0xa7, 0x12, 0xa9, 0xf7, 0xa0, 0x95, 
0xdd, 0x7b, 0x08, 0xea,
-       0xdd, 0xa0, 0xc7, 0x99, 0xd3, 0xb0, 0xd9, 0x37, 0xdd, 0xfa, 0x40, 0x78, 
0x43, 0x42, 0x92, 0x44,
-       0x13, 0xff, 0xd3, 0x80, 0xf3, 0xbb, 0x24, 0xb9, 0xf3, 0x25, 0xd5, 0x29, 
0xea, 0x0a, 0x88, 0x9b,
-       0x1c, 0x41, 0x3d, 0xc9, 0x59, 0xcc, 0xbe, 0xbf, 0x05, 0x73, 0xad, 0x5c, 
0x0f, 0x8d, 0xe2, 0xf5,
-       0x20, 0x3b, 0xf2, 0xb3, 0x05, 0x47, 0xbe, 0x60, 0x3c, 0x9a, 0x25, 0xe3, 
0x81, 0x7f, 0x6d, 0xc0,
-       0x8a, 0xba, 0xb3, 0x2a, 0x8e, 0x81, 0x42, 0x61, 0x6d, 0x12, 0x85, 0x33, 
0xe3, 0x43, 0x8d, 0xba,
-       0x12, 0x6a, 0xe0, 0x3f, 0xd4, 0x60, 0x65, 0x3b, 0x22, 0x92, 0x60, 0x0b, 
0xa6, 0xff, 0x1f, 0x34,
-       0x05, 0x6e, 0x41, 0xd8, 0x79, 0x8d, 0xdd, 0xb5, 0x53, 0x18, 0xf4, 0x26, 
0x34, 0xa8, 0xe8, 0xa7,
-       0x5e, 0xf6, 0x15, 0x01, 0xac, 0x57, 0x1c, 0x9b, 0xc3, 0xa2, 0xf7, 0xa1, 
0x9e, 0x38, 0x7d, 0xea,
-       0x9f, 0xd0, 0x39, 0xff, 0x23, 0xe6, 0xe8, 0xc8, 0xd9, 0x78, 0xe2, 0xf4, 
0xc5, 0x4d, 0xc4, 0xa6,
-       0xa0, 0xf7, 0x65, 0x5f, 0xb2, 0xce, 0xe6, 0x5f, 0xd2, 0x10, 0xa8, 0xf1, 
0x2a, 0xad, 0x77, 0xa1,
-       0x9d, 0x61, 0x3b, 0x95, 0x64, 0x1f, 0xc0, 0x6a, 0x81, 0xb6, 0x17, 0x7e, 
0x8a, 0xf8, 0x3e, 0xac,
-       0xec, 0x10, 0x8f, 0x94, 0x8e, 0xe3, 0x44, 0xe7, 0xe5, 0x30, 0x88, 0xba, 
0x9c, 0xe6, 0x96, 0xcd,
-       0x1b, 0x34, 0x5c, 0x2c, 0xe0, 0xaa, 0x12, 0x2e, 0xde, 0x84, 0xe5, 0xdc, 
0xad, 0x9d, 0x8a, 0x1c,
-       0x1c, 0x02, 0x92, 0xa7, 0x54, 0xe1, 0x92, 0x24, 0x7e, 0xb5, 0x93, 0xc5, 
0x0f, 0xaf, 0xc8, 0x2b,
-       0xa6, 0xe1, 0x3c, 0x8e, 0x99, 0x3d, 0xc9, 0x7b, 0xab, 0x10, 0xf2, 0xba, 
0x14, 0xe2, 0x70, 0xd9,
-       0xd6, 0x52, 0x92, 0x01, 0xe1, 0xbf, 0x19, 0x70, 0x51, 0x91, 0x78, 0x6a, 
0x4a, 0xa7, 0xcc, 0x30,
-       0x3c, 0x56, 0xdc, 0x33, 0xbe, 0xdc, 0x1b, 0x62, 0xb9, 0xb1, 0x38, 0x27, 
0xf9, 0x6a, 0x67, 0x74,
-       0x2f, 0xf0, 0x1e, 0x58, 0xba, 0x75, 0xab, 0xc8, 0xd1, 0x3b, 0x72, 0xa4, 
0x46, 0xad, 0x40, 0x3c,
-       0xad, 0x30, 0xad, 0x95, 0xe6, 0x55, 0x39, 0xc8, 0x1b, 0xaa, 0x85, 0x2a, 
0x38, 0xcf, 0x92, 0x59,
-       0xc2, 0x5f, 0x1b, 0x60, 0x96, 0x6d, 0xd6, 0x54, 0x07, 0x98, 0x3b, 0x3f, 
0x35, 0xc5, 0xf9, 0xb9,
-       0x09, 0x75, 0xfa, 0x25, 0x22, 0xb1, 0x13, 0xac, 0x23, 0x03, 0xc5, 0xf7, 
0x0a, 0x62, 0xc4, 0x89,
-       0xa8, 0xc2, 0xf9, 0x67, 0xcc, 0x81, 0x39, 0x35, 0xe7, 0x2b, 0xd9, 0x74, 
0xfc, 0x05, 0xac, 0x95,
-       0x16, 0xab, 0x72, 0x5c, 0x26, 0x34, 0x6d, 0xc6, 0x3b, 0xbe, 0x7c, 0xdb, 
0x4e, 0x9b, 0xb8, 0x03,
-       0x17, 0x55, 0xb3, 0x36, 0xfd, 0x8e, 0x4c, 0x68, 0x46, 0x2a, 0x52, 0xd1, 
0xa4, 0x82, 0xae, 0x43,
-       0x5a, 0x85, 0xdd, 0x6f, 0xc3, 0x6a, 0x2e, 0xb0, 0xf4, 0xa6, 0x99, 0x4e, 
0xce, 0xff, 0xac, 0xa4,
-       0x32, 0xf8, 0xbc, 0x2a, 0x8c, 0xfb, 0x50, 0x5c, 0xaa, 0xfc, 0xd0, 0x5e, 
0x11, 0x80, 0x7a, 0xcc,
-       0xc5, 0x6b, 0xb5, 0xfa, 0xdd, 0xf8, 0x03, 0x58, 0x53, 0x44, 0xe2, 0x89, 
0xd3, 0x9f, 0xee, 0x48,
-       0xc4, 0x22, 0x35, 0xcd, 0x22, 0x33, 0xd2, 0x22, 0x78, 0xb7, 0xa0, 0x93, 
0x6c, 0x81, 0x2a, 0xc7,
-       0xf3, 0x47, 0x03, 0x56, 0x73, 0x09, 0x9d, 0xfa, 0x7c, 0xd0, 0x07, 0x0a, 
0x5f, 0xff, 0x37, 0x57,
-       0x86, 0x32, 0xa6, 0x17, 0xc7, 0xd6, 0x3b, 0xb2, 0xea, 0x56, 0x96, 0x09, 
0xfc, 0x00, 0x4c, 0x45,
-       0xba, 0xa7, 0xdf, 0x35, 0x82, 0xfa, 0x33, 0x32, 0x4a, 0xd5, 0x85, 0x7d, 
0x53, 0xcb, 0xa4, 0xc1,
-       0x56, 0x85, 0xae, 0x11, 0xcc, 0xdd, 0x23, 0x8e, 0x97, 0x1c, 0x6d, 0x1f, 
0x91, 0xee, 0x33, 0xba,
-       0xd8, 0x20, 0x0d, 0x17, 0xda, 0x36, 0xfb, 0x66, 0xd1, 0x4d, 0x10, 0xf1, 
0x3c, 0x53, 0xc3, 0x66,
-       0xdf, 0xd4, 0xd5, 0x75, 0xfd, 0x84, 0x44, 0xc7, 0x8e, 0xc7, 0x84, 0xa4, 
0x61, 0x67, 0x6d, 0xca,
-       0x4b, 0x16, 0xdf, 0x31, 0x47, 0xb7, 0x61, 0xf3, 0x06, 0xe5, 0xf9, 0x30, 
0xf2, 0x84, 0x5b, 0x4f,
-       0x3f, 0xf1, 0xd7, 0x75, 0x58, 0xd1, 0x79, 0x8a, 0x85, 0x84, 0xae, 0x51, 
0x4a, 0xe8, 0x4e, 0xf6,
-       0xc2, 0x2f, 0x43, 0x9b, 0xf8, 0xbd, 0x30, 0x70, 0xfd, 0x84, 0xfb, 0xb5, 
0x6d, 0x3b, 0xef, 0xa0,
-       0x84, 0x1f, 0x05, 0x71, 0x22, 0x25, 0xc1, 0xb2, 0xb6, 0x94, 0xb2, 0x69, 
0x28, 0x29, 0x9b, 0x7d,
-       0xc5, 0x27, 0x98, 0x65, 0xd2, 0xf7, 0xea, 0x04, 0x57, 0x77, 0x62, 0xea, 
0xe6, 0x2d, 0x98, 0x3b,
-       0xca, 0x19, 0xce, 0x42, 0x95, 0xfc, 0x2a, 0x94, 0x8e, 0xc2, 0x96, 0xc1, 
0xd4, 0x20, 0xba, 0x55,
-       0x0c, 0xa2, 0x6f, 0xc1, 0x62, 0xcf, 0x49, 0x9c, 0x6d, 0x42, 0x8f, 0x60, 
0xcf, 0x3f, 0x0c, 0xcc,
-       0x36, 0x43, 0xbb, 0x2a, 0xd0, 0xee, 0x28, 0x83, 0x76, 0x01, 0xb8, 0x14, 
0x83, 0x83, 0x26, 0x3d,
-       0x23, 0x45, 0x6d, 0x73, 0x4a, 0xd4, 0x76, 0x56, 0xff, 0xe6, 0x00, 0x16, 
0x55, 0xf2, 0xb4, 0xc9,
-       0x0f, 0x7a, 0xab, 0x93, 0x7e, 0x9e, 0xfb, 0x10, 0x2d, 0xf4, 0x32, 0x2c, 
0x38, 0xc7, 0x8e, 0xeb,
-       0x39, 0x07, 0x1e, 0xf9, 0x3c, 0xf0, 0x53, 0x8b, 0xa5, 0x76, 0xe2, 0xa7, 
0xb0, 0xa6, 0x3b, 0xa7,
-       0x7d, 0x32, 0x3a, 0x9b, 0xac, 0x61, 0x1b, 0xd6, 0x6c, 0x91, 0x80, 0xca, 
0xe2, 0x1c, 0xa1, 0xd4,
-       0xef, 0x52, 0x0d, 0xe1, 0x5d, 0x42, 0x0b, 0x27, 0x46, 0x47, 0x19, 0x30, 
0xee, 0x83, 0x59, 0xc6,
-       0x59, 0xe5, 0x1a, 0x3a, 0xa9, 0xbe, 0xf3, 0x5d, 0xb8, 0xf8, 0xa9, 0x1f, 
0x8d, 0x21, 0xff, 0x6c,
-       0xa5, 0x23, 0xea, 0xb4, 0x6a, 0x50, 0x57, 0x31, 0x50, 0x8f, 0x61, 0x29, 
0xab, 0x42, 0xbd, 0x18,
-       0xe2, 0x3e, 0x86, 0x65, 0x09, 0x63, 0x15, 0x9a, 0xfe, 0x61, 0xc0, 0xca, 
0x5d, 0xd7, 0xef, 0xa5,
-       0x3b, 0xcb, 0x2c, 0xf9, 0x6b, 0xb0, 0xdc, 0x0d, 0xfc, 0x78, 0x38, 0x20, 
0x51, 0xa7, 0x40, 0x60,
-       0x79, 0xa0, 0x72, 0x06, 0x65, 0x1d, 0xe6, 0x84, 0xf2, 0x51, 0x1f, 0x29, 
0x4d, 0x50, 0x49, 0x5d,
-       0x2c, 0x5f, 0x43, 0x6f, 0xca, 0x06, 0xbf, 0x33, 0x58, 0xbc, 0x7e, 0x62, 
0x16, 0x1f, 0xff, 0x04,
-       0x56, 0x0b, 0xbb, 0xaa, 0x22, 0x76, 0xef, 0x97, 0x2b, 0x7e, 0x53, 0xe6, 
0x05, 0xf0, 0x9f, 0x0c,
-       0xe6, 0xb8, 0x3d, 0xf2, 0x49, 0x51, 0x1c, 0x4f, 0xc7, 0xd8, 0xd7, 0x60, 
0x39, 0xcd, 0x6b, 0x77,
-       0x0a, 0xca, 0x5b, 0x1e, 0x40, 0x1b, 0x80, 0xd2, 0xce, 0xbd, 0x5c, 0x6e, 
0x38, 0xdf, 0x35, 0x23,
-       0x19, 0x73, 0xeb, 0x39, 0x73, 0xf1, 0x57, 0xcc, 0x73, 0x54, 0x08, 0xaf, 
0xc2, 0x3b, 0xd9, 0x68,
-       0xd4, 0x4e, 0x63, 0x34, 0x7e, 0xc6, 0x13, 0x77, 0x67, 0x14, 0xc8, 0xd3, 
0xf1, 0x0d, 0x49, 0xb9,
-       0xa3, 0x9c, 0x0f, 0x2b, 0x2a, 0x19, 0xff, 0x65, 0x09, 0x8a, 0xe1, 0x12, 
0xf7, 0x51, 0xd3, 0xc1,
-       0x0e, 0xbb, 0xc2, 0x5f, 0x88, 0xe1, 0x90, 0xfc, 0x83, 0x19, 0xd9, 0x3f, 
0xc0, 0xfb, 0x70, 0x59,
-       0xbf, 0x68, 0x15, 0xdb, 0xf2, 0x2f, 0x23, 0x0d, 0xf8, 0x53, 0x6c, 0xa7, 
0xc8, 0x5e, 0x9c, 0xb4,
-       0x83, 0x4f, 0x14, 0x4f, 0x86, 0x27, 0xfd, 0x6e, 0x2a, 0xd9, 0x0d, 0xdd, 
0xa2, 0xdf, 0x66, 0x7a,
-       0xe3, 0x7e, 0xf1, 0xc0, 0xce, 0x90, 0xdf, 0xf8, 0x08, 0x56, 0x9e, 0x3a, 
0x49, 0xf7, 0xa8, 0x68,
-       0x3c, 0x5e, 0x86, 0x85, 0x98, 0x78, 0x87, 0x45, 0x05, 0x50, 0x3b, 0xf1, 
0x5f, 0x0d, 0x58, 0x2d,
-       0x4c, 0xaf, 0x22, 0xbc, 0x17, 0x60, 0xd6, 0xe9, 0x26, 0x92, 0xa7, 0xc2, 
0x5b, 0xe8, 0x06, 0x67,
-       0x0a, 0x4f, 0x3f, 0x8c, 0x2b, 0xc7, 0x31, 0x66, 0xc9, 0x46, 0xa0, 0x7e, 
0x1a, 0x23, 0xf0, 0x00,
-       0x96, 0x68, 0x90, 0xc9, 0x9f, 0xc2, 0x4c, 0x25, 0x2f, 0x72, 0xc6, 0xba, 
0xa6, 0x66, 0xac, 0x71,
-       0x87, 0x59, 0x94, 0x2d, 0xcf, 0x3b, 0x0d, 0xc2, 0xab, 0x00, 0xcf, 0xdd, 
0xe4, 0x88, 0x4f, 0x11,
-       0xb9, 0x50, 0xa9, 0x07, 0x7f, 0xc5, 0x53, 0x99, 0x02, 0x63, 0x45, 0xfe, 
0xc6, 0x39, 0xf6, 0xec,
-       0x65, 0x0e, 0x3b, 0x64, 0xf6, 0xd5, 0x11, 0x69, 0x76, 0xe1, 0x09, 0x2a, 
0x9d, 0xd8, 0x63, 0xf6,
-       0x49, 0xda, 0x54, 0x15, 0x12, 0xa6, 0x7e, 0x85, 0xf4, 0x08, 0xce, 0x8b, 
0x30, 0xed, 0x05, 0x9d,
-       0xc9, 0x76, 0x96, 0x9b, 0xae, 0x4e, 0x3e, 0xfe, 0xa9, 0x01, 0xe7, 0xe5, 
0x47, 0x4c, 0x67, 0x26,
-       0x6b, 0xdc, 0x6b, 0xa9, 0x09, 0x45, 0x8f, 0x6d, 0xf5, 0xf9, 0x57, 0xb5, 
0x8d, 0x3c, 0x65, 0xa1,
-       0xf9, 0x0e, 0x09, 0x89, 0xdf, 0x23, 0x7e, 0xd7, 0xcd, 0xaf, 0xbd, 0x5b, 
0x30, 0xdf, 0x93, 0xba,
-       0xc5, 0x63, 0xaa, 0x8b, 0x69, 0x79, 0x43, 0x5c, 0x7c, 0xd9, 0xcc, 0x91, 
0xad, 0x80, 0xe3, 0xbb,
-       0x2c, 0x83, 0xa6, 0x22, 0xae, 0x42, 0xe0, 0xe7, 0x70, 0x91, 0x97, 0x2b, 
0xbe, 0x05, 0x1a, 0x7f,
-       0x63, 0x00, 0x2a, 0x03, 0xa1, 0x4d, 0x68, 0xa5, 0xf7, 0xba, 0xa0, 0x6f, 
0x9c, 0xad, 0xc9, 0xe0,
-       0xd4, 0xf7, 0x02, 0xb5, 0x69, 0xdf, 0x0b, 0x58, 0xd0, 0x0a, 0x8e, 0x49, 
0x14, 0xb9, 0x3d, 0xee,
-       0xa4, 0xb6, 0xec, 0xac, 0x4d, 0xfd, 0x7f, 0xdd, 0xc6, 0xab, 0xf0, 0xd0, 
0x67, 0x9e, 0x95, 0x8e,
-       0x81, 0x27, 0x5a, 0xa2, 0xd8, 0x19, 0x10, 0xe9, 0xa5, 0x55, 0xcb, 0x96, 
0x7a, 0xa8, 0xcc, 0xfa,
-       0x41, 0x87, 0x78, 0x87, 0x82, 0x78, 0xd1, 0xc2, 0x3f, 0x06, 0x6b, 0x97, 
0x24, 0xdb, 0x81, 0x7f,
-       0x66, 0xd2, 0xd1, 0xcd, 0x32, 0x5f, 0xb5, 0x95, 0x8b, 0x1c, 0x4a, 0xac, 
0xfe, 0x38, 0x0a, 0x5e,
-       0xc8, 0xea, 0xe9, 0x09, 0x4f, 0x5e, 0x3d, 0x83, 0xc2, 0xbf, 0xaa, 0xc3, 
0x82, 0xf2, 0xb0, 0x09,
-       0xbd, 0x0b, 0xf3, 0x03, 0x09, 0x78, 0x52, 0x21, 0x52, 0x01, 0x3c, 0x83, 
0x0f, 0x87, 0x5e, 0x87,
-       0x39, 0x61, 0x59, 0xfc, 0xc3, 0x20, 0xf5, 0x52, 0x0a, 0x26, 0x56, 0x86, 
0xc8, 0xeb, 0x0a, 0xf5,
-       0x13, 0xea, 0x0a, 0xea, 0x89, 0x34, 0xa6, 0x39, 0x11, 0x95, 0x8d, 0xb3, 
0xd3, 0xb0, 0x11, 0x6d,
-       0x0a, 0xc7, 0xb8, 0xc9, 0xa0, 0xaf, 0xea, 0x5e, 0x8c, 0x95, 0xaa, 0xa9, 
0x9b, 0xb0, 0x22, 0xf3,
-       0xef, 0x33, 0x1e, 0xcc, 0xc5, 0x66, 0x8b, 0x39, 0xd7, 0xda, 0x31, 0xf4, 
0x2a, 0x34, 0xd9, 0xeb,
-       0xb1, 0x6e, 0x2c, 0xf2, 0x3d, 0x9a, 0xf7, 0x65, 0x29, 0x44, 0xf5, 0x04, 
0xe8, 0x73, 0x30, 0xf3,
-       0xd4, 0xb5, 0x78, 0xef, 0x56, 0x49, 0x20, 0x37, 0x8a, 0x05, 0x45, 0xfd, 
0x5b, 0xba, 0xac, 0xa2,
-       0x78, 0x1f, 0xd0, 0x0e, 0xf1, 0x0a, 0x15, 0x45, 0xa6, 0xd7, 0xa9, 0x92, 
0xa7, 0xef, 0x0a, 0xa5,
-       0x9e, 0x31, 0x85, 0x58, 0x5b, 0xc5, 0x15, 0x87, 0x2c, 0xd3, 0xa4, 0xbe, 
0x0c, 0x35, 0x8a, 0x2f,
-       0x43, 0x4f, 0x48, 0xfe, 0x8c, 0xd8, 0xed, 0x7e, 0xb6, 0xda, 0xe6, 0xdb, 
0xa5, 0xda, 0x66, 0x7a,
-       0x01, 0x94, 0xc9, 0x95, 0x2a, 0x9c, 0x9b, 0xb0, 0x48, 0xdd, 0x98, 0x30, 
0x8f, 0x0b, 0x0a, 0xd1,
-       0xbd, 0x51, 0x8e, 0xee, 0x3f, 0x83, 0x73, 0xd9, 0x9c, 0xaa, 0x8e, 0x6d, 
0x18, 0xe6, 0x85, 0x1b,
-       0xd1, 0xda, 0xfc, 0x66, 0x31, 0x7b, 0x0c, 0xb3, 0x9d, 0x44, 0x1e, 0xfa, 
0x18, 0x1a, 0xe4, 0x4b,
-       0x37, 0x4e, 0x90, 0x95, 0x17, 0x3e, 0x8a, 0x0f, 0x4a, 0xac, 0x4b, 0xda, 
0x31, 0xb1, 0xd2, 0x36,
-       0xcc, 0x76, 0xd9, 0xed, 0x81, 0x2e, 0x4d, 0x78, 0x90, 0x60, 0x5d, 0xd6, 
0x0f, 0xe6, 0x48, 0x7a,
-       0xcc, 0x55, 0xca, 0x90, 0xe8, 0xaa, 0xfa, 0x19, 0x12, 0x7d, 0x99, 0xfe, 
0x16, 0xcc, 0xf6, 0x59,
-       0x58, 0x8f, 0xcc, 0x52, 0x15, 0x27, 0xc5, 0x70, 0x51, 0x33, 0x22, 0xa6, 
0xef, 0xc0, 0x5c, 0x3f,
-       0xaf, 0x7e, 0xa3, 0x32, 0x64, 0x7a, 0x7c, 0x96, 0xa5, 0x1b, 0x12, 0x58, 
0x9e, 0xc2, 0xd2, 0x90,
-       0x85, 0x48, 0x79, 0x9c, 0x85, 0xd6, 0x4f, 0x2a, 0x49, 0x5b, 0xd7, 0x27, 
0x40, 0x08, 0xc4, 0xf7,
-       0xa0, 0xe9, 0xf4, 0x7a, 0x2c, 0x61, 0x74, 0xa5, 0x54, 0x4c, 0x91, 0x6b, 
0x7a, 0xd6, 0xd5, 0x71,
-       0xc3, 0x39, 0xa6, 0x3e, 0x49, 0x14, 0x4c, 0xfa, 0x4a, 0x73, 0x86, 0x69, 
0x5c, 0x41, 0xf9, 0x11,
-       0x00, 0xdf, 0x2c, 0x43, 0x76, 0x4d, 0xb7, 0x09, 0xa9, 0x16, 0x6c, 0xad, 
0x8f, 0x07, 0x10, 0x08,
-       0x3f, 0x01, 0xe0, 0x72, 0xc0, 0x10, 0xae, 0x6b, 0x8f, 0x5b, 0x26, 0xf0, 
0xfa, 0x04, 0x08, 0x81,
-       0xf2, 0x2e, 0xe3, 0x1b, 0xb5, 0xa6, 0xe8, 0xf2, 0xa4, 0x22, 0x94, 0x75, 
0x65, 0xcc, 0x68, 0x8e,
-       0xa7, 0x4f, 0x12, 0x05, 0x8f, 0xb6, 0x6c, 0x69, 0x5d, 0x99, 0x58, 0x42, 
0x44, 0x0f, 0xa0, 0xcd,
-       0x79, 0xf6, 0xc4, 0xe9, 0xa3, 0xab, 0x3a, 0x8e, 0xe4, 0xb5, 0x40, 0xeb, 
0xda, 0xd8, 0xf1, 0xfc,
-       0x04, 0x38, 0xc3, 0x18, 0x61, 0xd7, 0x74, 0xec, 0x90, 0x69, 0x5b, 0x1f, 
0x0f, 0x90, 0xbd, 0xa6,
-       0x5e, 0xe8, 0xa7, 0x31, 0x1f, 0x33, 0xbb, 0x6b, 0xd2, 0x76, 0xe4, 0x08, 
0xc4, 0x32, 0xcb, 0x03,
-       0x02, 0xc7, 0x3e, 0x2c, 0xf5, 0xa5, 0xb8, 0x8d, 0xa1, 0x91, 0x74, 0xa6, 
0x18, 0xa5, 0xca, 0xf6,
-       0xa5, 0x1c, 0xec, 0xed, 0x52, 0xcf, 0x3b, 0x8f, 0xa2, 0x32, 0x44, 0x9a, 
0x58, 0xcd, 0xba, 0xa4,
-       0x1d, 0xcb, 0x11, 0x0d, 0xa4, 0x28, 0x26, 0x43, 0xa4, 0x89, 0xae, 0x32, 
0x44, 0xda, 0xb0, 0xe7,
-       0x3e, 0x2c, 0xc8, 0x88, 0x62, 0xa4, 0x83, 0x8e, 0x8b, 0x36, 0x4b, 0xff, 
0x4f, 0x94, 0x2f, 0xe0,
-       0x9a, 0xa3, 0x06, 0x2f, 0x77, 0x83, 0x48, 0x76, 0x55, 0x62, 0x59, 0xdb, 
0x35, 0x8e, 0xb5, 0xac,
-       0xed, 0x5a, 0x37, 0xd4, 0x05, 0xdc, 0x2d, 0x79, 0xf7, 0xa5, 0x45, 0xd6, 
0x15, 0xf3, 0xac, 0x5b,
-       0xe7, 0xfa, 0x04, 0x08, 0xb1, 0xd4, 0xf7, 0x60, 0xad, 0xcf, 0xfc, 0x61, 
0xe6, 0x8d, 0xc9, 0x20,
-       0xb2, 0xa1, 0x99, 0x84, 0x7c, 0x82, 0x3b, 0xcd, 0x91, 0x97, 0x82, 0xa8, 
0xd3, 0x21, 0x1f, 0x17,
-       0x29, 0xec, 0xc2, 0x62, 0x4f, 0x56, 0x89, 0xdc, 0xfc, 0x97, 0x9d, 0x1a, 
0xcb, 0xd2, 0x0d, 0x71,
-       0x44, 0x9b, 0xbf, 0x9d, 0x85, 0xf3, 0x05, 0x6f, 0x99, 0xdd, 0xb3, 0xfb, 
0xf4, 0xf2, 0xe6, 0x15,
-       0x96, 0x4c, 0xe9, 0xc7, 0x14, 0xa3, 0x32, 0xa5, 0x1f, 0x5b, 0x58, 0xfa, 
0x04, 0x60, 0x98, 0x15,
-       0x6c, 0xf2, 0xdb, 0x65, 0x5c, 0x79, 0x28, 0xbf, 0x5d, 0xc6, 0x57, 0x79, 
0xfe, 0x1f, 0xda, 0x47,
-       0x69, 0x99, 0x25, 0x53, 0xf9, 0x62, 0x29, 0x27, 0x53, 0xf9, 0x72, 0x45, 
0x66, 0x0b, 0xea, 0x87,
-       0xae, 0xdf, 0xcb, 0x54, 0x41, 0x57, 0x70, 0xc9, 0x54, 0x41, 0x5f, 0xb7, 
0xd8, 0x85, 0xf9, 0xbe,
-       0x94, 0x8d, 0x96, 0x2d, 0x46, 0x09, 0xd3, 0x25, 0xed, 0x98, 0x40, 0xf4, 
0x10, 0x16, 0xfb, 0x4a,
-       0x7a, 0x5f, 0x36, 0xd8, 0xe5, 0x72, 0x85, 0x6c, 0xb0, 0x75, 0x35, 0x81, 
0xa7, 0x30, 0xcf, 0x0d,
-       0x36, 0x4f, 0x14, 0x23, 0xac, 0x4d, 0xc1, 0x2a, 0xa9, 0x6b, 0xeb, 0xa5, 
0x89, 0x30, 0x02, 0xb1,
-       0x03, 0xe6, 0xb0, 0x94, 0x4d, 0x15, 0x2e, 0xc3, 0xf5, 0x13, 0xf3, 0xbc, 
0x16, 0x9e, 0x04, 0x92,
-       0xf9, 0x34, 0x8d, 0xe7, 0x4e, 0xd2, 0x3d, 0xca, 0xce, 0x45, 0x97, 0x72, 
0xcd, 0xce, 0x45, 0x9b,
-       0x50, 0x7d, 0xc3, 0xa0, 0x27, 0x73, 0x24, 0xfd, 0xb7, 0x0c, 0xe9, 0xfe, 
0xe7, 0x56, 0x3c, 0x19,
-       0xdd, 0x9f, 0xd1, 0x36, 0xff, 0x6d, 0xc0, 0xf2, 0x6e, 0x70, 0x4c, 0x22, 
0x5f, 0xf6, 0x41, 0x1f,
-       0xb2, 0xeb, 0x42, 0x0d, 0x65, 0xc7, 0x7b, 0x70, 0xd7, 0x4a, 0x23, 0x85, 
0x30, 0xe7, 0x31, 0x9c,
-       0xeb, 0xab, 0xff, 0x2b, 0xd2, 0xb8, 0x39, 0xf2, 0x5f, 0x9f, 0x34, 0x6e, 
0x8e, 0xfa, 0x77, 0xa4,
-       0x8f, 0x19, 0xc6, 0xad, 0x30, 0xf4, 0xdc, 0xae, 0xc3, 0xff, 0x13, 0xb5, 
0x2a, 0x5d, 0x59, 0xb9,
-       0x63, 0x6f, 0x5d, 0x28, 0x76, 0x73, 0x0c, 0xb7, 0xdf, 0x80, 0x57, 0xba, 
0xc1, 0x60, 0xe3, 0x68,
-       0xe8, 0x3c, 0x27, 0xee, 0x46, 0xe8, 0x38, 0xf1, 0x46, 0x37, 0x26, 0x1b, 
0x22, 0x44, 0xe0, 0x5a,
-       0x19, 0x8d, 0x36, 0x9c, 0xd0, 0xfd, 0x9c, 0xff, 0xe5, 0xf2, 0x60, 0x96, 
0xfd, 0xbc, 0xf9, 0x9f,
-       0x00, 0x00, 0x00, 0xff, 0xff, 0x3b, 0x0a, 0x35, 0x24, 0x92, 0x39, 0x00, 
0x00,
+       // 3330 bytes of a gzipped FileDescriptorProto
+       0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x3b, 
0x4b, 0x6f, 0x1c, 0xc7,
+       0xd1, 0x98, 0xe5, 0x2e, 0x77, 0xb7, 0xf8, 0x10, 0xd9, 0x22, 0xc5, 0xd1, 
0xea, 0x45, 0xb5, 0xfd,
+       0x7d, 0x16, 0x60, 0x7f, 0xb4, 0x45, 0xbf, 0x1f, 0xfa, 0x60, 0x8a, 0x94, 
0x28, 0x8a, 0x52, 0x24,
+       0xcf, 0xca, 0x16, 0xe2, 0x20, 0x88, 0x87, 0xbb, 0xcd, 0xdd, 0x89, 0x66, 
0x67, 0x26, 0x33, 0xb3,
+       0x94, 0x17, 0x08, 0x1c, 0x04, 0x46, 0x8e, 0xc9, 0x21, 0x97, 0x00, 0x49, 
0x4e, 0x39, 0x25, 0xf9,
+       0x03, 0x39, 0x04, 0x41, 0xee, 0x01, 0x72, 0x0b, 0x90, 0x93, 0xff, 0x41, 
0xce, 0x39, 0x07, 0xfd,
+       0x98, 0x99, 0xee, 0x99, 0xde, 0x07, 0x87, 0x72, 0x4e, 0x3b, 0xdd, 0x5d, 
0x5d, 0x5d, 0x5d, 0x55,
+       0x5d, 0x5d, 0x8f, 0x5e, 0x58, 0x8e, 0x48, 0x78, 0xe2, 0x74, 0x48, 0xb4, 
0x15, 0x84, 0x7e, 0xec,
+       0xa3, 0x1a, 0xfb, 0xc1, 0xdf, 0x87, 0xb5, 0x87, 0x7e, 0xd7, 0x39, 0x1e, 
0xb5, 0x3b, 0x7d, 0x32,
+       0xb0, 0x23, 0x8b, 0xfc, 0x68, 0x48, 0xa2, 0x18, 0x5d, 0x86, 0xa6, 0x98, 
0x70, 0xd0, 0x35, 0x8d,
+       0x4d, 0xe3, 0x46, 0xd3, 0xca, 0x3a, 0xd0, 0x2b, 0x50, 0x8f, 0x38, 0xbc, 
0x59, 0xd9, 0x9c, 0xbb,
+       0xb1, 0xb0, 0xbd, 0xc4, 0xb1, 0x6e, 0x71, 0x2c, 0x56, 0x32, 0x8a, 0x3f, 
0x83, 0x79, 0xde, 0x85,
+       0x5a, 0xd0, 0xe0, 0x9d, 0x29, 0xbe, 0xb4, 0x8d, 0x4c, 0xa8, 0x47, 0xc3, 
0xc1, 0xc0, 0x0e, 0x47,
+       0x66, 0x85, 0x0d, 0x25, 0x4d, 0x74, 0x01, 0xe6, 0x39, 0x94, 0x39, 0xc7, 
0x06, 0x44, 0x0b, 0xef,
+       0xc1, 0x7a, 0x8e, 0xec, 0x28, 0xf0, 0xbd, 0x88, 0xa0, 0x57, 0xa1, 0x11, 
0x8a, 0x6f, 0xb6, 0xcc,
+       0xc2, 0xf6, 0x39, 0x41, 0x5a, 0x02, 0x62, 0xa5, 0x00, 0xf8, 0x11, 0x9c, 
0xbf, 0x47, 0xec, 0x30,
+       0x3e, 0x22, 0x76, 0xdc, 0x26, 0x71, 0xb2, 0xf7, 0xf7, 0xa0, 0xe9, 0x78, 
0x51, 0x6c, 0x7b, 0x1d,
+       0x12, 0x99, 0x06, 0xdb, 0x5f, 0x4b, 0x20, 0x91, 0xc1, 0xef, 0xb8, 0x64, 
0x40, 0xbc, 0xd8, 0xca,
+       0x80, 0x71, 0x5b, 0x45, 0x28, 0x20, 0xa6, 0x30, 0xf3, 0x2a, 0x40, 0x82, 
0xe1, 0xa0, 0x2b, 0x18,
+       0x20, 0xf5, 0xe0, 0xe7, 0xb0, 0xa6, 0x52, 0x59, 0x62, 0xab, 0x68, 0x5b, 
0xde, 0x13, 0x97, 0xd9,
+       0x9a, 0x80, 0x3e, 0x10, 0xfd, 0xf7, 0x8e, 0xac, 0x48, 0xd9, 0xcd, 0x00, 
0x96, 0x94, 0xb1, 0xb3,
+       0xed, 0x83, 0x8e, 0x93, 0x30, 0x7c, 0x48, 0xa2, 0xc8, 0xee, 0x11, 0x21, 
0x4f, 0xa9, 0x07, 0xef,
+       0x42, 0xb3, 0x1d, 0xb7, 0x39, 0x3a, 0xb4, 0x06, 0xb5, 0x8e, 0x3f, 0xf4, 
0x62, 0xb6, 0xcc, 0x9c,
+       0xc5, 0x1b, 0x68, 0x13, 0x16, 0x7c, 0xcf, 0x75, 0x3c, 0xb2, 0xcb, 0xc6, 
0x2a, 0x6c, 0x4c, 0xee,
+       0xc2, 0xf7, 0x00, 0xda, 0x71, 0x42, 0xf5, 0x18, 0x2c, 0x2f, 0xc3, 0x12, 
0xfb, 0xb8, 0x3d, 0xda,
+       0xf3, 0x07, 0xb6, 0xe3, 0x09, 0x3c, 0x6a, 0x27, 0xbe, 0x02, 0xb5, 0x76, 
0xbc, 0x13, 0x04, 0x7a,
+       0x24, 0xf8, 0xe7, 0x06, 0x5d, 0xc9, 0x8e, 0x9d, 0x28, 0x76, 0x3a, 0x11, 
0x7a, 0x0d, 0x1a, 0xc9,
+       0x01, 0x13, 0xc2, 0x58, 0x49, 0x8e, 0x44, 0xb2, 0x27, 0x2b, 0x85, 0x40, 
0xaf, 0xab, 0xd2, 0xa0,
+       0xe0, 0xab, 0x29, 0x78, 0x42, 0xbd, 0x24, 0x0a, 0xb4, 0x09, 0x55, 0x3b, 
0x08, 0x22, 0xc6, 0xb5,
+       0x85, 0xed, 0xc5, 0x14, 0x76, 0x27, 0x08, 0x2c, 0x36, 0x82, 0x7f, 0x6f, 
0xc0, 0x85, 0x7d, 0x92,
+       0xac, 0x15, 0x1d, 0x78, 0xc7, 0x7e, 0xa2, 0xcf, 0x26, 0xd4, 0xfd, 0x20, 
0x76, 0x7c, 0x8f, 0x6b,
+       0x73, 0xd3, 0x4a, 0x9a, 0x74, 0x6b, 0x76, 0x10, 0xa4, 0xd2, 0xe2, 0x0d, 
0xca, 0x65, 0x41, 0xe9,
+       0x77, 0xec, 0x41, 0x22, 0x29, 0xb9, 0x8b, 0x2a, 0x02, 0xe3, 0xc2, 0x23, 
0xcf, 0x1d, 0x99, 0xd5,
+       0x4d, 0xe3, 0x46, 0xc3, 0xca, 0x3a, 0xa8, 0xa0, 0x9f, 0x3b, 0x71, 0xbf, 
0xdd, 0xb7, 0x43, 0xd2,
+       0x35, 0x6b, 0x6c, 0x58, 0xea, 0xc1, 0x7f, 0x31, 0x60, 0xa3, 0x40, 0x6a, 
0x19, 0xa5, 0xbe, 0x0d,
+       0xab, 0xb6, 0xeb, 0x26, 0x78, 0xf6, 0x48, 0x6c, 0x3b, 0x6e, 0x4e, 0xb9, 
0xc5, 0x20, 0x1f, 0xb3,
+       0x8a, 0xe0, 0xe8, 0x26, 0x40, 0x94, 0x8a, 0x51, 0xf0, 0x37, 0x93, 0x45, 
0x32, 0x60, 0x49, 0x40,
+       0xf8, 0xef, 0x06, 0x9c, 0x7b, 0xe8, 0x74, 0x42, 0x5f, 0xa0, 0x3a, 0x24, 
0xcc, 0x50, 0xc5, 0xc4,
+       0xb3, 0x85, 0x96, 0x34, 0x2d, 0xd1, 0xa2, 0xbc, 0x0f, 0x42, 0xff, 0x87, 
0xa4, 0x13, 0x27, 0xa6,
+       0x4d, 0x34, 0x33, 0xde, 0xcf, 0x4d, 0xe0, 0x7d, 0xb5, 0xc8, 0x7b, 0x13, 
0xea, 0x27, 0x24, 0x8c,
+       0x1c, 0xdf, 0x63, 0xac, 0x6d, 0x5a, 0x49, 0x93, 0xce, 0x25, 0xde, 0x89, 
0x13, 0xfa, 0x1e, 0xb5,
+       0x3a, 0xe6, 0x3c, 0x9f, 0x2b, 0x75, 0xb1, 0x35, 0x5d, 0xc7, 0x8e, 0xcc, 
0xba, 0x58, 0x93, 0x36,
+       0xf0, 0xef, 0xe6, 0x61, 0x51, 0xde, 0xcf, 0x94, 0x73, 0x5e, 0x56, 0x69, 
0x24, 0xc2, 0xab, 0x05,
+       0xc2, 0xbb, 0x24, 0xea, 0x84, 0x0e, 0x53, 0x4b, 0xb1, 0x2d, 0xb9, 0x8b, 
0xae, 0xe9, 0x92, 0x13,
+       0xe2, 0x8a, 0x4d, 0xf1, 0x06, 0xbb, 0x37, 0xc4, 0x35, 0x54, 0xe7, 0x8a, 
0x2d, 0x9a, 0xe8, 0x06,
+       0xd4, 0x02, 0x3b, 0xee, 0x47, 0x26, 0x30, 0x6d, 0x40, 0xaa, 0x36, 0x3c, 
0xb6, 0xe3, 0xbe, 0xc5,
+       0x01, 0xd8, 0x0d, 0x13, 0xdb, 0xf1, 0x30, 0x32, 0x1b, 0xe2, 0x86, 0x61, 
0x2d, 0xb4, 0x0b, 0x10,
+       0x84, 0x7e, 0x40, 0xc2, 0xd8, 0x21, 0x91, 0xd9, 0x64, 0x68, 0x5e, 0x12, 
0x68, 0x64, 0x66, 0x6d,
+       0x3d, 0x4e, 0xa1, 0xee, 0x78, 0x71, 0x38, 0xb2, 0xa4, 0x69, 0x94, 0x91, 
0xb1, 0x33, 0x20, 0x51,
+       0x6c, 0x0f, 0x02, 0x73, 0x81, 0x33, 0x32, 0xed, 0x40, 0x6f, 0x41, 0x33, 
0x08, 0xfd, 0x13, 0xa7,
+       0x4b, 0xc2, 0xc8, 0x5c, 0x64, 0x2b, 0x5c, 0xd0, 0xac, 0x70, 0x48, 0x46, 
0x56, 0x06, 0x98, 0xc9,
+       0x70, 0x49, 0x92, 0x21, 0x25, 0xf7, 0xc1, 0xed, 0x76, 0x1c, 0xda, 0x31, 
0xe9, 0x8d, 0xcc, 0xe5,
+       0xf1, 0xe4, 0x66, 0x50, 0x82, 0xdc, 0xac, 0x03, 0x61, 0x58, 0x1c, 0xf8, 
0xdd, 0x27, 0x29, 0xc5,
+       0xe7, 0xd8, 0x0a, 0x4a, 0x5f, 0x5e, 0xc9, 0x56, 0x8a, 0x4a, 0x76, 0x15, 
0x20, 0x24, 0x3d, 0x27,
+       0x8a, 0x49, 0x78, 0x7b, 0x64, 0xae, 0x72, 0x3b, 0x9f, 0xf5, 0xa0, 0x77, 
0xa0, 0x79, 0x1c, 0xda,
+       0x03, 0xf2, 0xdc, 0x0f, 0x9f, 0x99, 0x88, 0x1d, 0x38, 0x53, 0x50, 0x7a, 
0x97, 0xf6, 0x3f, 0xf5,
+       0xc3, 0x67, 0x82, 0xa9, 0x23, 0x2b, 0x03, 0x6d, 0xdd, 0x82, 0x73, 0x39, 
0x5e, 0xa3, 0x15, 0x98,
+       0x7b, 0x46, 0x46, 0x42, 0x45, 0xe9, 0x27, 0xe5, 0xce, 0x89, 0xed, 0x0e, 
0x49, 0xa2, 0x9c, 0xac,
+       0xf1, 0x41, 0xe5, 0x3d, 0x83, 0x4e, 0xcf, 0xed, 0xfd, 0x34, 0xd3, 0xf1, 
0x0e, 0xac, 0x16, 0xa8,
+       0x43, 0x08, 0xaa, 0x1e, 0xd5, 0x76, 0x8e, 0x81, 0x7d, 0xcb, 0x6a, 0x5e, 
0x51, 0xd4, 0x1c, 0x7f,
+       0x63, 0xc0, 0x42, 0x72, 0x17, 0x0c, 0x5d, 0x42, 0x55, 0x2f, 0x1c, 0xba, 
0xd9, 0x19, 0x13, 0x2d,
+       0xea, 0x2a, 0xd1, 0xaf, 0x27, 0xa3, 0x20, 0xa1, 0x23, 0x6d, 0x53, 0x8d, 
0xb2, 0xe3, 0x38, 0x74,
+       0x8e, 0x86, 0x71, 0x72, 0xc8, 0xb2, 0x0e, 0x66, 0x6d, 0xec, 0x38, 0x26, 
0x61, 0x7a, 0xc4, 0x44,
+       0x73, 0x86, 0x23, 0xa6, 0xe8, 0xea, 0x7c, 0x5e, 0x57, 0xf3, 0xaa, 0x51, 
0x2f, 0xaa, 0x06, 0xfe,
+       0x85, 0x01, 0x17, 0x76, 0xba, 0xdd, 0x47, 0xe1, 0xa7, 0x41, 0xd7, 0x8e, 
0x89, 0xbc, 0x55, 0x79,
+       0x4b, 0xc6, 0xa4, 0x2d, 0x55, 0x26, 0x6c, 0x69, 0x6e, 0xe2, 0x96, 0xaa, 
0x85, 0x2d, 0xe1, 0xdf,
+       0x66, 0x0c, 0xa7, 0x47, 0x9e, 0x8a, 0x8b, 0x1e, 0xfa, 0x44, 0x5c, 0xf4, 
0x1b, 0x7d, 0x04, 0x0d,
+       0x71, 0x60, 0x47, 0xe2, 0xea, 0xd8, 0x2c, 0x1a, 0x8b, 0xe4, 0x90, 0x8b, 
0x33, 0x93, 0xce, 0x68,
+       0x7d, 0x08, 0x4b, 0xca, 0xd0, 0xa9, 0x54, 0xea, 0x3d, 0x68, 0xa4, 0xf7, 
0x1e, 0x82, 0x6a, 0xc7,
+       0xef, 0x72, 0xe6, 0xd4, 0x2c, 0xf6, 0x4d, 0xb7, 0x3e, 0x10, 0xde, 0x92, 
0xd0, 0x24, 0xd1, 0xc4,
+       0xff, 0x34, 0xe0, 0xfc, 0x3e, 0x89, 0xef, 0x7c, 0x49, 0xcf, 0x14, 0x75, 
0x15, 0xc4, 0x4d, 0x8f,
+       0xa0, 0x1a, 0x67, 0x2c, 0x66, 0xdf, 0xdf, 0x82, 0xb9, 0x56, 0xae, 0x87, 
0x5a, 0xfe, 0x7a, 0x90,
+       0x1d, 0xfd, 0xf9, 0x9c, 0xa3, 0x9f, 0x33, 0x1e, 0xf5, 0x82, 0xf1, 0xc0, 
0xbf, 0x32, 0x60, 0x4d,
+       0xdd, 0x59, 0x19, 0xc7, 0x40, 0xa1, 0xb0, 0x32, 0x89, 0xc2, 0xb9, 0xf1, 
0xa1, 0x48, 0x55, 0x09,
+       0x45, 0xf0, 0x1f, 0x2a, 0xb0, 0xb6, 0x1b, 0x12, 0x49, 0xb1, 0x05, 0xd3, 
0xff, 0x0f, 0xea, 0x02,
+       0xb7, 0x20, 0xec, 0xbc, 0xc6, 0xee, 0x5a, 0x09, 0x0c, 0x7a, 0x13, 0x6a, 
0x54, 0xf5, 0x13, 0x2f,
+       0xfc, 0x8a, 0x00, 0xd6, 0x1f, 0x1c, 0x8b, 0xc3, 0xa2, 0xf7, 0xa1, 0x1a, 
0xdb, 0x3d, 0xea, 0x9f,
+       0xd0, 0x39, 0xff, 0x23, 0xe6, 0xe8, 0xc8, 0xd9, 0x7a, 0x62, 0xf7, 0xc4, 
0x4d, 0xc4, 0xa6, 0xa0,
+       0xf7, 0x65, 0x5f, 0xb3, 0xca, 0xe6, 0x5f, 0xd2, 0x10, 0xa8, 0xf1, 0x3a, 
0x5b, 0xef, 0x42, 0x33,
+       0xc5, 0x76, 0x2a, 0xcd, 0x3e, 0x82, 0xf5, 0x1c, 0x6d, 0x2f, 0x5c, 0x8a, 
0xf8, 0x3e, 0xac, 0xed,
+       0x11, 0x97, 0x14, 0xc4, 0x31, 0xd5, 0x79, 0x39, 0xf6, 0xc3, 0x0e, 0xa7, 
0xb9, 0x61, 0xf1, 0x06,
+       0x0d, 0x27, 0x73, 0xb8, 0xca, 0x84, 0x93, 0x37, 0x61, 0x35, 0x73, 0x6b, 
0x67, 0x22, 0x07, 0x07,
+       0x80, 0xe4, 0x29, 0x65, 0xb8, 0x24, 0xa9, 0x5f, 0x65, 0xba, 0xfa, 0xe1, 
0x35, 0x79, 0xc5, 0x24,
+       0xdc, 0xc7, 0x11, 0xb3, 0x27, 0x59, 0x6f, 0x19, 0x42, 0x5e, 0x97, 0x42, 
0x20, 0xae, 0xdb, 0x5a,
+       0x4a, 0x52, 0x20, 0xfc, 0x37, 0x03, 0x2e, 0x2a, 0x1a, 0x4f, 0x4d, 0xe9, 
0x8c, 0x19, 0x88, 0xc7,
+       0x8a, 0x7b, 0xc6, 0x97, 0x7b, 0x43, 0x2c, 0x37, 0x16, 0xe7, 0x24, 0x5f, 
0xed, 0x8c, 0xee, 0x05,
+       0x3e, 0x80, 0x96, 0x6e, 0xdd, 0x32, 0x7a, 0xf4, 0x8e, 0x1c, 0xc9, 0x51, 
0x2b, 0x10, 0xcd, 0xaa,
+       0x4c, 0x1b, 0x85, 0x79, 0x65, 0x04, 0x79, 0x43, 0xb5, 0x50, 0x39, 0xe7, 
0x59, 0x32, 0x4b, 0xf8,
+       0x6b, 0x03, 0xcc, 0xa2, 0xcd, 0x9a, 0x49, 0x80, 0x99, 0xf3, 0x53, 0x51, 
0x9c, 0x9f, 0x9b, 0x50,
+       0xa5, 0x5f, 0x22, 0x12, 0x9b, 0x62, 0x1d, 0x19, 0x28, 0xbe, 0x97, 0x53, 
0x23, 0x4e, 0x44, 0x19,
+       0xce, 0x3f, 0x63, 0x0e, 0xcc, 0xa9, 0x39, 0x5f, 0xca, 0xa6, 0xe3, 0x2f, 
0x60, 0xa3, 0xb0, 0x58,
+       0x19, 0x71, 0x99, 0x50, 0xb7, 0x18, 0xef, 0xf8, 0xf2, 0x4d, 0x2b, 0x69, 
0xe2, 0x36, 0x5c, 0x54,
+       0xcd, 0xda, 0xec, 0x3b, 0x32, 0xa1, 0x1e, 0xaa, 0x48, 0x45, 0x93, 0x2a, 
0xba, 0x0e, 0x69, 0x19,
+       0x76, 0xbf, 0x0d, 0xeb, 0x99, 0xc2, 0xd2, 0x9b, 0x66, 0x36, 0x3d, 0xff, 
0xb3, 0x92, 0xea, 0xe0,
+       0xf3, 0xca, 0x30, 0xee, 0x43, 0x71, 0xa9, 0x72, 0xa1, 0xbd, 0x22, 0x00, 
0xf5, 0x98, 0xf3, 0xd7,
+       0x6a, 0xf9, 0xbb, 0xf1, 0x07, 0xb0, 0xa1, 0xa8, 0xc4, 0x13, 0xbb, 0x37, 
0x9b, 0x48, 0xc4, 0x22,
+       0x15, 0xcd, 0x22, 0x73, 0xd2, 0x22, 0x78, 0x3f, 0x77, 0x26, 0xd9, 0x02, 
0x65, 0xc4, 0xf3, 0x47,
+       0x03, 0xd6, 0x33, 0x0d, 0x9d, 0x59, 0x3e, 0xe8, 0x03, 0x85, 0xaf, 0xff, 
0x9b, 0x1d, 0x86, 0x22,
+       0xa6, 0x17, 0xc7, 0xd6, 0x3b, 0xf2, 0xd1, 0x2d, 0xad, 0x13, 0xf8, 0x01, 
0x98, 0x8a, 0x76, 0xcf,
+       0xbe, 0x6b, 0x04, 0xd5, 0x67, 0x64, 0x94, 0x1c, 0x17, 0xf6, 0x4d, 0x2d, 
0x93, 0x06, 0x5b, 0x19,
+       0xba, 0x46, 0xb0, 0x70, 0x8f, 0xd8, 0x6e, 0xdc, 0xdf, 0xed, 0x93, 0xce, 
0x33, 0xba, 0xd8, 0x20,
+       0x09, 0x17, 0x9a, 0x16, 0xfb, 0x66, 0xd1, 0x8d, 0x1f, 0xf2, 0x3c, 0x53, 
0xcd, 0x62, 0xdf, 0xd4,
+       0xd5, 0x75, 0xbc, 0x98, 0x84, 0x27, 0xb6, 0xcb, 0x94, 0xa4, 0x66, 0xa5, 
0x6d, 0xca, 0x4b, 0x16,
+       0xdf, 0x31, 0x47, 0xb7, 0x66, 0xf1, 0x06, 0xe5, 0xf9, 0x30, 0x74, 0x85, 
0x5b, 0x4f, 0x3f, 0xf1,
+       0xd7, 0x55, 0x58, 0xd3, 0x79, 0x8a, 0xb9, 0x84, 0xaf, 0x51, 0x48, 0xf8, 
0x4e, 0xf6, 0xc2, 0x2f,
+       0x43, 0x93, 0x78, 0xdd, 0xc0, 0x77, 0xbc, 0x98, 0xfb, 0xb5, 0x4d, 0x2b, 
0xeb, 0xa0, 0x84, 0xf7,
+       0xfd, 0x28, 0x96, 0x92, 0x60, 0x69, 0x5b, 0x4a, 0xd9, 0xd4, 0x94, 0x94, 
0xcd, 0xa1, 0xe2, 0x13,
+       0xcc, 0x33, 0xed, 0x7b, 0x75, 0x82, 0xab, 0x3b, 0x31, 0x75, 0xf3, 0x16, 
0x2c, 0xf4, 0x33, 0x86,
+       0xb3, 0x50, 0x25, 0xbb, 0x0a, 0x25, 0x51, 0x58, 0x32, 0x98, 0x1a, 0x44, 
0x37, 0xf2, 0x41, 0xf4,
+       0x2d, 0x58, 0xee, 0xda, 0xb1, 0xbd, 0x4b, 0xa8, 0x08, 0x0e, 0xbc, 0x63, 
0xdf, 0x6c, 0x32, 0xb4,
+       0xeb, 0x02, 0xed, 0x9e, 0x32, 0x68, 0xe5, 0x80, 0x0b, 0x31, 0x38, 0x68, 
0xd2, 0x33, 0x52, 0xd4,
+       0xb6, 0xa0, 0x44, 0x6d, 0x67, 0xf5, 0x6f, 0x8e, 0x60, 0x59, 0x25, 0x4f, 
0x9b, 0xfc, 0xa0, 0xb7,
+       0x3a, 0xe9, 0x65, 0xb9, 0x0f, 0xd1, 0x42, 0x2f, 0xc3, 0x92, 0x7d, 0x62, 
0x3b, 0xae, 0x7d, 0xe4,
+       0x92, 0xcf, 0x7d, 0x2f, 0xb1, 0x58, 0x6a, 0x27, 0x7e, 0x0a, 0x1b, 0x3a, 
0x39, 0x1d, 0x92, 0xd1,
+       0xd9, 0x74, 0x0d, 0x5b, 0xb0, 0x61, 0x89, 0x04, 0x54, 0x1a, 0xe7, 0x88, 
0x43, 0xfd, 0x2e, 0x3d,
+       0x21, 0xbc, 0x4b, 0x9c, 0xc2, 0x89, 0xd1, 0x51, 0x0a, 0x8c, 0x7b, 0x60, 
0x16, 0x71, 0x96, 0xb9,
+       0x86, 0xa6, 0xd5, 0x7f, 0xbe, 0x0b, 0x17, 0x3f, 0xf5, 0xc2, 0x31, 0xe4, 
0x9f, 0xad, 0xb4, 0x44,
+       0x9d, 0x56, 0x0d, 0xea, 0x32, 0x06, 0xea, 0x31, 0xac, 0xa4, 0x55, 0xaa, 
0x17, 0x43, 0xdc, 0xc7,
+       0xb0, 0x2a, 0x61, 0x2c, 0x43, 0xd3, 0x3f, 0x0c, 0x58, 0xbb, 0xeb, 0x78, 
0xdd, 0x64, 0x67, 0xa9,
+       0x25, 0x7f, 0x0d, 0x56, 0x3b, 0xbe, 0x17, 0x0d, 0x07, 0x24, 0x6c, 0xe7, 
0x08, 0x2c, 0x0e, 0x94,
+       0xce, 0xa0, 0x6c, 0xc2, 0x82, 0x38, 0x7c, 0xd4, 0x47, 0x4a, 0x12, 0x54, 
0x52, 0x17, 0xcb, 0xd7,
+       0xd0, 0x9b, 0xb2, 0xc6, 0xef, 0x0c, 0x16, 0xaf, 0x4f, 0xcd, 0xe2, 0xe3, 
0x9f, 0xc0, 0x7a, 0x6e,
+       0x57, 0x65, 0xd4, 0xee, 0xfd, 0x62, 0x45, 0x70, 0xc6, 0xbc, 0x00, 0xfe, 
0x93, 0xc1, 0x1c, 0xb7,
+       0x47, 0x1e, 0xc9, 0xab, 0xe3, 0xe9, 0x18, 0xfb, 0x1a, 0xac, 0x26, 0x79, 
0xed, 0x76, 0xee, 0xf0,
+       0x16, 0x07, 0xd0, 0x16, 0xa0, 0xa4, 0xf3, 0x20, 0xd3, 0x1b, 0xce, 0x77, 
0xcd, 0x48, 0xca, 0xdc,
+       0x6a, 0xc6, 0x5c, 0xfc, 0x15, 0xf3, 0x1c, 0x15, 0xc2, 0xcb, 0xf0, 0x4e, 
0x36, 0x1a, 0x95, 0xd3,
+       0x18, 0x8d, 0x9f, 0xf1, 0xc4, 0xdd, 0x19, 0x15, 0xf2, 0x74, 0x7c, 0x43, 
0x52, 0xee, 0x28, 0xe3,
+       0xc3, 0x9a, 0x4a, 0xc6, 0x7f, 0x59, 0x83, 0x22, 0xb8, 0xc4, 0x7d, 0xd4, 
0x64, 0xb0, 0xcd, 0xae,
+       0xf0, 0x17, 0x62, 0x38, 0x24, 0xff, 0x60, 0x4e, 0xf6, 0x0f, 0xf0, 0x21, 
0x5c, 0xd6, 0x2f, 0x5a,
+       0xc6, 0xb6, 0xfc, 0xcb, 0x48, 0x02, 0xfe, 0x04, 0xdb, 0x29, 0xb2, 0x17, 
0xd3, 0x76, 0xf0, 0x89,
+       0xe2, 0xc9, 0xf0, 0xa4, 0xdf, 0x4d, 0x25, 0xbb, 0xa1, 0x5b, 0xf4, 0xdb, 
0x4c, 0x6f, 0xdc, 0xcf,
+       0x0b, 0xec, 0x0c, 0xf9, 0x8d, 0x8f, 0x60, 0xed, 0xa9, 0x1d, 0x77, 0xfa, 
0x79, 0xe3, 0xf1, 0x32,
+       0x2c, 0x45, 0xc4, 0x3d, 0xce, 0x1f, 0x00, 0xb5, 0x13, 0xff, 0xd5, 0x80, 
0xf5, 0xdc, 0xf4, 0x32,
+       0xca, 0x7b, 0x01, 0xe6, 0xed, 0x4e, 0x2c, 0x79, 0x2a, 0xbc, 0x85, 0x6e, 
0x70, 0xa6, 0xf0, 0xf4,
+       0xc3, 0xb8, 0x72, 0x1c, 0x63, 0x96, 0x6c, 0x04, 0xaa, 0xa7, 0x31, 0x02, 
0x0f, 0x60, 0x85, 0x06,
+       0x99, 0xfc, 0xa9, 0xcc, 0x4c, 0xfa, 0x22, 0x67, 0xac, 0x2b, 0x6a, 0xc6, 
0x1a, 0xb7, 0x99, 0x45,
+       0xd9, 0x71, 0xdd, 0xd3, 0x20, 0x4c, 0x4a, 0xf4, 0xfc, 0x6d, 0x4d, 0x45, 
0x2a, 0xd1, 0xf3, 0xf7,
+       0x35, 0x5f, 0xf1, 0x54, 0xa6, 0xc0, 0x58, 0x92, 0xbf, 0x51, 0x86, 0x3d, 
0x7d, 0xb9, 0xc3, 0x84,
+       0xcc, 0xbe, 0xda, 0x22, 0xcd, 0x2e, 0x3c, 0x41, 0xa5, 0x13, 0xbb, 0xcc, 
0x3e, 0x49, 0x9b, 0x2a,
+       0x43, 0xc2, 0xcc, 0xaf, 0x94, 0x1e, 0xc1, 0x79, 0x11, 0xa6, 0xbd, 0x20, 
0x99, 0xec, 0xa6, 0xb9,
+       0xe9, 0xf2, 0xe4, 0xe3, 0x9f, 0x1a, 0x70, 0x5e, 0x7e, 0xe4, 0x74, 0x66, 
0xb2, 0xc6, 0xbd, 0xa6,
+       0x9a, 0x50, 0xf4, 0xd8, 0x55, 0x9f, 0x87, 0x95, 0xdb, 0xc8, 0x53, 0x16, 
0x9a, 0xef, 0x91, 0x80,
+       0x78, 0x5d, 0xe2, 0x75, 0x9c, 0xec, 0xda, 0xbb, 0x05, 0x8b, 0x5d, 0xa9, 
0x5b, 0x3c, 0xb6, 0xba,
+       0x98, 0x94, 0x37, 0xc4, 0xc5, 0x97, 0xce, 0x1c, 0x59, 0x0a, 0x38, 0xbe, 
0xcb, 0x32, 0x68, 0x2a,
+       0xe2, 0x32, 0x04, 0x7e, 0x0e, 0x17, 0x79, 0xb9, 0xe2, 0x5b, 0xa0, 0xf1, 
0xd7, 0x06, 0xa0, 0x22,
+       0x10, 0xda, 0x86, 0x46, 0x72, 0xaf, 0x0b, 0xfa, 0xc6, 0xd9, 0x9a, 0x14, 
0x4e, 0x7d, 0x2f, 0x50,
+       0x99, 0xf5, 0xbd, 0x40, 0x0b, 0x1a, 0xfe, 0x09, 0x09, 0x43, 0xa7, 0xcb, 
0x9d, 0xd4, 0x86, 0x95,
+       0xb6, 0xa9, 0xff, 0xaf, 0xdb, 0x78, 0x19, 0x1e, 0x7a, 0xcc, 0xb3, 0xd2, 
0x31, 0x70, 0xaa, 0x25,
+       0x8a, 0xec, 0x01, 0x91, 0x5e, 0x62, 0x35, 0x2c, 0xa9, 0x87, 0xea, 0xac, 
0xe7, 0xb7, 0x89, 0x7b,
+       0x2c, 0x88, 0x17, 0x2d, 0xfc, 0x63, 0x68, 0xed, 0x93, 0x78, 0xd7, 0xf7, 
0xce, 0x4c, 0x3a, 0xba,
+       0x59, 0xe4, 0xab, 0xb6, 0x72, 0x91, 0x41, 0x89, 0xd5, 0x1f, 0x87, 0xfe, 
0x0b, 0x59, 0x3d, 0x91,
+       0xf0, 0xe4, 0xd5, 0x53, 0x28, 0xfc, 0xcb, 0x2a, 0x2c, 0x29, 0x0f, 0x9b, 
0xd0, 0xbb, 0xb0, 0x38,
+       0x90, 0x80, 0x27, 0x15, 0x22, 0x15, 0xc0, 0x33, 0xf8, 0x70, 0xe8, 0x75, 
0x58, 0x10, 0x96, 0xc5,
+       0x3b, 0xf6, 0x13, 0x2f, 0x25, 0x67, 0x62, 0x65, 0x88, 0xac, 0xae, 0x50, 
0x9d, 0x52, 0x57, 0x50,
+       0x25, 0x52, 0x9b, 0x45, 0x22, 0x2a, 0x1b, 0xe7, 0x67, 0x61, 0x23, 0xda, 
0x16, 0x8e, 0x71, 0x9d,
+       0x41, 0x5f, 0xd5, 0xbd, 0x18, 0x2b, 0x54, 0x53, 0xb7, 0x61, 0x4d, 0xe6, 
0xdf, 0x67, 0x3c, 0x98,
+       0x8b, 0xcc, 0x06, 0x73, 0xae, 0xb5, 0x63, 0xe8, 0x55, 0xa8, 0xb3, 0xd7, 
0x63, 0x9d, 0x48, 0xe4,
+       0x7b, 0x34, 0xef, 0xcb, 0x12, 0x88, 0xf2, 0x09, 0xd0, 0xe7, 0x60, 0x66, 
0xa9, 0x6b, 0xf1, 0xde,
+       0xad, 0x94, 0x42, 0x6e, 0xe5, 0x0b, 0x8a, 0xfa, 0xb7, 0x74, 0x69, 0x45, 
0xf1, 0x3e, 0xa0, 0x3d,
+       0xe2, 0xe6, 0x2a, 0x8a, 0xec, 0x5c, 0x27, 0x87, 0x3c, 0x79, 0x77, 0x28, 
0xf5, 0x8c, 0x29, 0xc4,
+       0x5a, 0x2a, 0xae, 0x28, 0x60, 0x99, 0x26, 0xf5, 0xe5, 0xa8, 0x91, 0x7f, 
0x39, 0x3a, 0x25, 0xf9,
+       0x33, 0x62, 0xb7, 0xfb, 0xd9, 0x6a, 0x9b, 0x6f, 0x17, 0x6a, 0x9b, 0xc9, 
0x05, 0x50, 0x24, 0x57,
+       0xaa, 0x70, 0x5a, 0xb0, 0x4c, 0xdd, 0x98, 0x20, 0x8b, 0x0b, 0x72, 0xd1, 
0xbd, 0xa1, 0x7d, 0x3e,
+       0x25, 0xbd, 0x9e, 0xac, 0x14, 0x5e, 0x4f, 0x7e, 0x06, 0xe7, 0x52, 0x9c, 
0x65, 0x1d, 0xdf, 0x20,
+       0xc8, 0x0a, 0x3b, 0xa2, 0xb5, 0xfd, 0xcd, 0x72, 0xfa, 0x58, 0x66, 0x37, 
0x0e, 0x5d, 0xf4, 0x31,
+       0xd4, 0xc8, 0x97, 0x4e, 0x14, 0xa3, 0x56, 0x56, 0x18, 0xc9, 0x3f, 0x38, 
0x69, 0x5d, 0xd2, 0x8e,
+       0x89, 0x95, 0x76, 0x61, 0xbe, 0xc3, 0x6e, 0x17, 0x74, 0x69, 0xc2, 0x83, 
0x85, 0xd6, 0x65, 0xfd,
+       0x60, 0x86, 0xa4, 0xcb, 0x5c, 0xa9, 0x14, 0x89, 0xae, 0xea, 0x9f, 0x22, 
0xd1, 0x97, 0xf1, 0x6f,
+       0xc1, 0x7c, 0x8f, 0x85, 0xfd, 0xc8, 0x2c, 0x54, 0x79, 0x12, 0x0c, 0x17, 
0x35, 0x23, 0x62, 0xfa,
+       0x1e, 0x2c, 0xf4, 0xb2, 0xea, 0x38, 0x2a, 0x42, 0x26, 0xe2, 0x6d, 0xb5, 
0x74, 0x43, 0x02, 0xcb,
+       0x53, 0x58, 0x19, 0xb2, 0x10, 0x2a, 0x8b, 0xc3, 0xd0, 0xe6, 0xb4, 0x92, 
0x75, 0xeb, 0xfa, 0x04,
+       0x08, 0x81, 0xf8, 0x1e, 0xd4, 0xed, 0x6e, 0x97, 0x25, 0x94, 0xae, 0x14, 
0x8a, 0x2d, 0x72, 0xcd,
+       0xaf, 0x75, 0x75, 0xdc, 0x70, 0x86, 0xa9, 0x47, 0x62, 0x05, 0x93, 0xbe, 
0x12, 0x9d, 0x62, 0x1a,
+       0x57, 0x70, 0x7e, 0x04, 0xc0, 0x37, 0xcb, 0x90, 0x5d, 0xd3, 0x6d, 0x42, 
0xaa, 0x15, 0xb7, 0x36,
+       0xc7, 0x03, 0x08, 0x84, 0x9f, 0x00, 0x70, 0x3d, 0x60, 0x08, 0x37, 0xb5, 
0xe2, 0x96, 0x09, 0xbc,
+       0x3e, 0x01, 0x42, 0xa0, 0xbc, 0xcb, 0xf8, 0x46, 0xad, 0x2d, 0xba, 0x3c, 
0xa9, 0x48, 0xd5, 0xba,
+       0x32, 0x66, 0x34, 0xc3, 0xd3, 0x23, 0xb1, 0x82, 0x47, 0x5b, 0xd6, 0x6c, 
0x5d, 0x99, 0x58, 0x62,
+       0x44, 0x0f, 0xa0, 0xc9, 0x79, 0xf6, 0xc4, 0xee, 0xa1, 0xab, 0x3a, 0x8e, 
0x64, 0xb5, 0xc2, 0xd6,
+       0xb5, 0xb1, 0xe3, 0x99, 0x04, 0x38, 0xc3, 0x18, 0x61, 0xd7, 0x74, 0xec, 
0x90, 0x69, 0xdb, 0x1c,
+       0x0f, 0x90, 0xbe, 0xb6, 0x5e, 0xea, 0x25, 0x31, 0x21, 0x33, 0xcb, 0x1b, 
0xd2, 0x76, 0xe4, 0x08,
+       0xa5, 0x65, 0x16, 0x07, 0x04, 0x8e, 0x43, 0x58, 0xe9, 0x49, 0x71, 0x1d, 
0x43, 0x23, 0x9d, 0x99,
+       0x7c, 0x14, 0x2b, 0xdb, 0x97, 0x62, 0x30, 0xb8, 0x4f, 0x3d, 0xf3, 0x2c, 
0xca, 0x4a, 0x11, 0x69,
+       0x62, 0xb9, 0xd6, 0x25, 0xed, 0x58, 0x86, 0x68, 0x20, 0x45, 0x39, 0x29, 
0x22, 0x4d, 0xf4, 0x95,
+       0x22, 0xd2, 0x86, 0x45, 0xf7, 0x61, 0x49, 0x46, 0x14, 0x21, 0x1d, 0x74, 
0x94, 0xb7, 0x59, 0xfa,
+       0x7f, 0xb2, 0x7c, 0x01, 0xd7, 0x6c, 0x35, 0xb8, 0xb9, 0xeb, 0x87, 0xb2, 
0x2b, 0x13, 0xc9, 0xa7,
+       0x5d, 0xe3, 0x78, 0xcb, 0xa7, 0x5d, 0xeb, 0xa6, 0x3a, 0x80, 0x3b, 0x05, 
0xef, 0xbf, 0xb0, 0xc8,
+       0xa6, 0x62, 0x9e, 0x75, 0xeb, 0x5c, 0x9f, 0x00, 0x21, 0x96, 0xfa, 0x1e, 
0x6c, 0xf4, 0x98, 0xbf,
+       0xcc, 0xbc, 0x35, 0x19, 0x44, 0x36, 0x34, 0x93, 0x90, 0x4f, 0x70, 0xb7, 
0x39, 0xf2, 0x42, 0x90,
+       0x75, 0x3a, 0xe4, 0xe3, 0x22, 0x89, 0x7d, 0x58, 0xee, 0xca, 0x47, 0x22, 
0x33, 0xff, 0x45, 0xa7,
+       0xa7, 0xd5, 0xd2, 0x0d, 0x71, 0x44, 0xdb, 0xbf, 0x99, 0x87, 0xf3, 0x39, 
0x6f, 0x9a, 0xdd, 0xb3,
+       0x87, 0xf4, 0xf2, 0xe6, 0x15, 0x98, 0xf4, 0xd0, 0x8f, 0x29, 0x56, 0xa5, 
0x87, 0x7e, 0x6c, 0xe1,
+       0xe9, 0x13, 0x80, 0x61, 0x5a, 0xd0, 0xc9, 0x6e, 0x97, 0x71, 0xe5, 0xa3, 
0xec, 0x76, 0x19, 0x5f,
+       0x05, 0xfa, 0x7f, 0x68, 0xf6, 0x93, 0x32, 0x4c, 0x7a, 0xe4, 0xf3, 0xa5, 
0x9e, 0xf4, 0xc8, 0x17,
+       0x2b, 0x36, 0x3b, 0x50, 0x3d, 0x76, 0xbc, 0x6e, 0x7a, 0x14, 0x74, 0x05, 
0x99, 0xf4, 0x28, 0xe8,
+       0xeb, 0x1a, 0xfb, 0xb0, 0xd8, 0x93, 0xb2, 0xd5, 0xb2, 0xc5, 0x28, 0x60, 
0xba, 0xa4, 0x1d, 0x13,
+       0x88, 0x1e, 0xc2, 0x72, 0x4f, 0x49, 0xff, 0xcb, 0x06, 0xbb, 0x58, 0xce, 
0x90, 0x0d, 0xb6, 0xae,
+       0x66, 0xf0, 0x14, 0x16, 0xb9, 0xc1, 0xe6, 0x89, 0x64, 0x84, 0xb5, 0x29, 
0x5a, 0x25, 0xb5, 0xdd,
+       0x7a, 0x69, 0x22, 0x8c, 0x40, 0x6c, 0x83, 0x39, 0x2c, 0x64, 0x5b, 0x85, 
0xcb, 0x70, 0x7d, 0x6a,
+       0x1e, 0xb8, 0x85, 0x27, 0x81, 0xa4, 0x3e, 0x4d, 0xed, 0xb9, 0x1d, 0x77, 
0xfa, 0xa9, 0x5c, 0x74,
+       0x29, 0xd9, 0x54, 0x2e, 0xda, 0x84, 0xeb, 0x1b, 0x06, 0x95, 0x4c, 0x5f, 
0xfa, 0x6f, 0x1a, 0xd2,
+       0xfd, 0x4f, 0x2e, 0x2f, 0x19, 0xdd, 0x9f, 0xd9, 0xb6, 0xff, 0x6d, 0xc0, 
0xea, 0xbe, 0x7f, 0x42,
+       0x42, 0x4f, 0xf6, 0x41, 0x1f, 0xb2, 0xeb, 0x42, 0x0d, 0x75, 0xc7, 0x7b, 
0x70, 0xd7, 0x0a, 0x23,
+       0xb9, 0x30, 0xe8, 0x31, 0x9c, 0xeb, 0xa9, 0xff, 0x3b, 0xd2, 0xb8, 0x39, 
0xf2, 0x5f, 0xa7, 0x34,
+       0x6e, 0x8e, 0xfa, 0x77, 0xa5, 0x8f, 0x19, 0xc6, 0x9d, 0x20, 0x70, 0x9d, 
0x8e, 0xcd, 0xff, 0x53,
+       0xb5, 0x2e, 0x5d, 0x59, 0x99, 0xe3, 0xdf, 0xba, 0x90, 0xef, 0xe6, 0x18, 
0x6e, 0xbf, 0x01, 0xaf,
+       0x74, 0xfc, 0xc1, 0x56, 0x7f, 0x68, 0x3f, 0x27, 0xce, 0x56, 0x60, 0xdb, 
0xd1, 0x56, 0x27, 0x22,
+       0x5b, 0x22, 0x84, 0xe0, 0xa7, 0x32, 0x1c, 0x6d, 0xd9, 0x81, 0xf3, 0x39, 
0xff, 0xcb, 0xe6, 0xd1,
+       0x3c, 0xfb, 0x79, 0xf3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x98, 0xc3, 
0x2f, 0x48, 0xd2, 0x39,
+       0x00, 0x00,
 }
diff --git a/server/core/proto/services.proto b/server/core/proto/services.proto
index 376a891..ff8f739 100644
--- a/server/core/proto/services.proto
+++ b/server/core/proto/services.proto
@@ -134,6 +134,7 @@ message GetServicesInfoRequest {
     string appId = 2;
     string serviceName = 3;
     bool countOnly = 4;
+    bool withShared = 5;
 }
 
 message GetServicesInfoResponse {
@@ -603,6 +604,7 @@ message DelServicesResponse {
 
 message GetAppsRequest {
     string environment = 1;
+    bool withShared = 2;
 }
 
 message GetAppsResponse {
diff --git a/server/govern/controller_v4.go b/server/govern/controller_v4.go
index 8d80925..758ea7a 100644
--- a/server/govern/controller_v4.go
+++ b/server/govern/controller_v4.go
@@ -21,6 +21,7 @@ import (
 
        "github.com/apache/servicecomb-service-center/pkg/log"
        "github.com/apache/servicecomb-service-center/pkg/rest"
+       "github.com/apache/servicecomb-service-center/pkg/util"
        "github.com/apache/servicecomb-service-center/server/core"
        pb "github.com/apache/servicecomb-service-center/server/core/proto"
        scerr "github.com/apache/servicecomb-service-center/server/error"
@@ -45,9 +46,14 @@ func (governService *GovernServiceControllerV4) 
URLPatterns() []rest.Route {
 
 // GetGraph 获取依赖连接图详细依赖关系
 func (governService *GovernServiceControllerV4) GetGraph(w 
http.ResponseWriter, r *http.Request) {
-       var graph Graph
+       var (
+               graph      Graph
+               withShared = util.StringTRUE(r.URL.Query().Get("withShared"))
+       )
        request := &pb.GetServicesRequest{}
        ctx := r.Context()
+       domainProject := util.ParseDomainProject(ctx)
+
        resp, err := core.ServiceAPI.GetServices(ctx, request)
        if err != nil {
                controller.WriteError(w, scerr.ErrInternal, err.Error())
@@ -57,12 +63,18 @@ func (governService *GovernServiceControllerV4) GetGraph(w 
http.ResponseWriter,
        if len(services) <= 0 {
                return
        }
-       nodes := make([]Node, len(services))
-       for index, service := range services {
-               nodes[index].Name = service.ServiceName
-               nodes[index].Id = service.ServiceId
-               nodes[index].AppID = service.AppId
-               nodes[index].Version = service.Version
+       nodes := make([]Node, 0, len(services))
+       for _, service := range services {
+               if !withShared && 
core.IsShared(pb.MicroServiceToKey(domainProject, service)) {
+                       continue
+               }
+
+               var node Node
+               node.Name = service.ServiceName
+               node.Id = service.ServiceId
+               node.AppID = service.AppId
+               node.Version = service.Version
+               nodes = append(nodes, node)
 
                proRequest := &pb.GetDependenciesRequest{
                        ServiceId:  service.ServiceId,
@@ -91,7 +103,7 @@ func (governService *GovernServiceControllerV4) GetGraph(w 
http.ResponseWriter,
                                continue
                        }
                        line := Line{}
-                       line.From = nodes[index]
+                       line.From = node
                        line.To.Name = child.ServiceName
                        line.To.Id = child.ServiceId
                        graph.Lines = append(graph.Lines, line)
@@ -123,6 +135,7 @@ func (governService *GovernServiceControllerV4) 
GetAllServicesInfo(w http.Respon
        request.Options = strings.Split(optsStr, ",")
        request.AppId = query.Get("appId")
        request.ServiceName = query.Get("serviceName")
+       request.WithShared = util.StringTRUE(query.Get("withShared"))
        countOnly := query.Get("countOnly")
        if countOnly != "0" && countOnly != "1" && strings.TrimSpace(countOnly) 
!= "" {
                controller.WriteError(w, scerr.ErrInvalidParams, "parameter 
countOnly must be 1 or 0")
@@ -141,7 +154,9 @@ func (governService *GovernServiceControllerV4) 
GetAllServicesInfo(w http.Respon
 func (governService *GovernServiceControllerV4) GetAllApplications(w 
http.ResponseWriter, r *http.Request) {
        request := &pb.GetAppsRequest{}
        ctx := r.Context()
-       request.Environment = r.URL.Query().Get("env")
+       query := r.URL.Query()
+       request.Environment = query.Get("env")
+       request.WithShared = util.StringTRUE(query.Get("withShared"))
        resp, _ := GovernServiceAPI.GetApplications(ctx, request)
 
        respInternal := resp.Response
diff --git a/server/govern/service.go b/server/govern/service.go
index 1403602..31b6552 100644
--- a/server/govern/service.go
+++ b/server/govern/service.go
@@ -63,7 +63,7 @@ func (governService *GovernService) GetServicesInfo(ctx 
context.Context, in *pb.
        var st *pb.Statistics
        if _, ok := optionMap["statistics"]; ok {
                var err error
-               st, err = statistics(ctx)
+               st, err = statistics(ctx, in.WithShared)
                if err != nil {
                        return &pb.GetServicesInfoResponse{
                                Response: pb.CreateResponse(scerr.ErrInternal, 
err.Error()),
@@ -89,6 +89,9 @@ func (governService *GovernService) GetServicesInfo(ctx 
context.Context, in *pb.
        allServiceDetails := make([]*pb.ServiceDetail, 0, len(services))
        domainProject := util.ParseDomainProject(ctx)
        for _, service := range services {
+               if !in.WithShared && 
apt.IsShared(pb.MicroServiceToKey(domainProject, service)) {
+                       continue
+               }
                if len(in.AppId) > 0 {
                        if in.AppId != service.AppId {
                                continue
@@ -210,6 +213,9 @@ func (governService *GovernService) GetApplications(ctx 
context.Context, in *pb.
        appMap := make(map[string]struct{}, l)
        for _, kv := range resp.Kvs {
                key := apt.GetInfoFromSvcIndexKV(kv.Key)
+               if !in.WithShared && apt.IsShared(key) {
+                       continue
+               }
                if _, ok := appMap[key.AppId]; ok {
                        continue
                }
@@ -352,7 +358,7 @@ func getServiceDetailUtil(ctx context.Context, 
serviceDetailOpt ServiceDetailOpt
        return serviceDetail, nil
 }
 
-func statistics(ctx context.Context) (*pb.Statistics, error) {
+func statistics(ctx context.Context, withShared bool) (*pb.Statistics, error) {
        result := &pb.Statistics{
                Services:  &pb.StService{},
                Instances: &pb.StInstance{},
@@ -376,6 +382,9 @@ func statistics(ctx context.Context) (*pb.Statistics, 
error) {
        svcIdToNonVerKey := make(map[string]string, respSvc.Count)
        for _, kv := range respSvc.Kvs {
                key := apt.GetInfoFromSvcIndexKV(kv.Key)
+               if !withShared && apt.IsShared(key) {
+                       continue
+               }
                if _, ok := app[key.AppId]; !ok {
                        app[key.AppId] = struct{}{}
                }
@@ -393,7 +402,7 @@ func statistics(ctx context.Context) (*pb.Statistics, 
error) {
 
        respGetInstanceCountByDomain := make(chan 
GetInstanceCountByDomainResponse, 1)
        gopool.Go(func(_ context.Context) {
-               getInstanceCountByDomain(ctx, respGetInstanceCountByDomain)
+               getInstanceCountByDomain(ctx, svcIdToNonVerKey, 
respGetInstanceCountByDomain)
        })
 
        // instance
@@ -414,11 +423,11 @@ func statistics(ctx context.Context) (*pb.Statistics, 
error) {
                if !ok {
                        continue
                }
+               result.Instances.Count++
                if _, ok := onlineServices[key]; !ok {
                        onlineServices[key] = struct{}{}
                }
        }
-       result.Instances.Count = respIns.Count
        result.Services.OnlineCount = int64(len(onlineServices))
 
        data := <-respGetInstanceCountByDomain
@@ -427,7 +436,7 @@ func statistics(ctx context.Context) (*pb.Statistics, 
error) {
                return nil, data.err
        }
        result.Instances.CountByDomain = data.countByDomain
-       return result, err
+       return result, nil
 }
 
 type GetInstanceCountByDomainResponse struct {
@@ -435,20 +444,30 @@ type GetInstanceCountByDomainResponse struct {
        countByDomain int64
 }
 
-func getInstanceCountByDomain(ctx context.Context, resp chan 
GetInstanceCountByDomainResponse) {
+func getInstanceCountByDomain(ctx context.Context, svcIdToNonVerKey 
map[string]string, resp chan GetInstanceCountByDomainResponse) {
        domainId := util.ParseDomain(ctx)
        key := apt.GetInstanceRootKey(domainId) + "/"
        instOpts := append([]registry.PluginOpOption{},
                registry.WithStrKey(key),
                registry.WithPrefix(),
-               registry.WithKeyOnly(),
-               registry.WithCountOnly())
+               registry.WithKeyOnly())
        respIns, err := backend.Store().Instance().Search(ctx, instOpts...)
+       ret := GetInstanceCountByDomainResponse{
+               err: err,
+       }
+
        if err != nil {
                log.Errorf(err, "get number of instances by domain[%s]", 
domainId)
+       } else {
+               for _, kv := range respIns.Kvs {
+                       serviceId, _, _ := apt.GetInfoFromInstKV(kv.Key)
+                       _, ok := svcIdToNonVerKey[serviceId]
+                       if !ok {
+                               continue
+                       }
+                       ret.countByDomain++
+               }
        }
-       resp <- GetInstanceCountByDomainResponse{
-               err:           err,
-               countByDomain: respIns.Count,
-       }
+
+       resp <- ret
 }
diff --git a/server/plugin/pkg/registry/etcd/common.go 
b/server/plugin/pkg/registry/etcd/common.go
index f89f2c8..6e4a1d0 100644
--- a/server/plugin/pkg/registry/etcd/common.go
+++ b/server/plugin/pkg/registry/etcd/common.go
@@ -26,7 +26,9 @@ const (
        healthCheckTimeout    = 5 * time.Second
        healthCheckRetryTimes = 3
 
-       maxRecvMsgSize = math.MaxInt64
+       // see github.com/coreos/etcd/clientv3/options.go
+       // maxSendMsgSize = 2MB
+       maxRecvMsgSize = math.MaxInt32
 )
 
 const (

Reply via email to