From a90b725ba83192ef512329151b279cdf3a7f1199 Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Mon, 7 Sep 2020 19:46:14 +0800 Subject: [PATCH] Add timestamp for key2segment message Signed-off-by: zhenshan.cao --- cmd/master.go | 27 --- go.mod | 24 +-- go.sum | 269 ----------------------------- master/config/config.go | 60 ++++--- master/server.go | 21 ++- pkg/master/README.md | 9 - pkg/master/common/config.go | 10 -- pkg/master/informer/informer.go | 5 - pkg/master/informer/pulsar.go | 58 ------- pkg/master/kv/etcd_kv.go | 136 --------------- pkg/master/kv/kv.go | 7 - pkg/master/mock/collection.go | 46 ----- pkg/master/mock/collection_test.go | 23 --- pkg/master/mock/mock.go | 5 - pkg/master/mock/pulsar.go | 45 ----- pkg/master/mock/segment.go | 74 -------- pkg/master/mock/segment_test.go | 54 ------ pkg/master/server.go | 53 ------ pkg/message/message.pb.go | 132 +++++++------- proto/message.proto | 3 +- 20 files changed, 126 insertions(+), 935 deletions(-) delete mode 100644 pkg/master/README.md delete mode 100644 pkg/master/common/config.go delete mode 100644 pkg/master/informer/informer.go delete mode 100644 pkg/master/informer/pulsar.go delete mode 100644 pkg/master/kv/etcd_kv.go delete mode 100644 pkg/master/kv/kv.go delete mode 100644 pkg/master/mock/collection.go delete mode 100644 pkg/master/mock/collection_test.go delete mode 100644 pkg/master/mock/mock.go delete mode 100644 pkg/master/mock/pulsar.go delete mode 100644 pkg/master/mock/segment.go delete mode 100644 pkg/master/mock/segment_test.go delete mode 100644 pkg/master/server.go diff --git a/cmd/master.go b/cmd/master.go index 8af21a7b58..e69de29bb2 100644 --- a/cmd/master.go +++ b/cmd/master.go @@ -1,27 +0,0 @@ -package main - -import ( - "github.com/czs007/suvlim/pkg/master" -) - -// func main() { -// ctx, cancel := context.WithCancel(context.Background()) -// defer cancel() -// cfg := config.NewConfig() -// s, err := server.CreateServer(ctx, cfg) -// if err != nil { -// panic(err) -// } -// err = s.Run() -// if err != nil { -// fmt.Println(err) -// } -// } - -func init() { - // go mock.FakePulsarProducer() -} -func main() { - //master.SegmentStatsController() - master.CollectionController() -} diff --git a/go.mod b/go.mod index 1a73f93763..4d020f262c 100644 --- a/go.mod +++ b/go.mod @@ -5,49 +5,31 @@ go 1.15 require ( code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48 // indirect github.com/BurntSushi/toml v0.3.1 - github.com/apache/pulsar-client-go v0.2.0 - github.com/apache/pulsar-client-go/oauth2 v0.0.0-20200825011529-c078454b47b6 // indirect github.com/apache/pulsar/pulsar-client-go v0.0.0-20200901051823-800681aaa9af github.com/coreos/etcd v3.3.25+incompatible // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f - github.com/danieljoos/wincred v1.1.0 // indirect github.com/docker/go-units v0.4.0 - github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.4.2 github.com/google/btree v1.0.0 - github.com/json-iterator/go v1.1.10 - github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d // indirect - github.com/klauspost/compress v1.10.11 // indirect github.com/minio/minio-go/v7 v7.0.5 github.com/opentracing/opentracing-go v1.2.0 - github.com/pierrec/lz4 v2.5.2+incompatible // indirect github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712 github.com/pingcap/errors v0.11.4 // indirect github.com/pingcap/log v0.0.0-20200828042413-fce0951f1463 github.com/pivotal-golang/bytefmt v0.0.0-20200131002437-cf55d5288a48 - github.com/prometheus/common v0.13.0 // indirect github.com/sirupsen/logrus v1.6.0 github.com/stretchr/testify v1.6.1 github.com/tikv/client-go v0.0.0-20200824032810-95774393107b github.com/tikv/pd v2.1.19+incompatible - github.com/yahoo/athenz v1.9.16 // indirect go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 go.uber.org/zap v1.15.0 - golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect - golang.org/x/net v0.0.0-20200904194848-62affa334b73 - golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect - golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f // indirect - google.golang.org/grpc v1.31.0 + golang.org/x/net v0.0.0-20200822124328-c89045814202 + google.golang.org/grpc v1.31.1 google.golang.org/grpc/examples v0.0.0-20200828165940-d8ef479ab79a // indirect - google.golang.org/protobuf v1.25.0 // indirect + google.golang.org/protobuf v1.25.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 sigs.k8s.io/yaml v1.2.0 // indirect ) replace go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.5 - -//replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200329194405-dd816f0735f8 -replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 - -replace github.com/coreos/etcd => github.com/ozonru/etcd v3.3.20-grpc1.27-origmodule+incompatible diff --git a/go.sum b/go.sum index 0098c9e92a..48350a535d 100644 --- a/go.sum +++ b/go.sum @@ -13,7 +13,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.63.0/go.mod h1:GmezbQc7T2snqkEXWfZ0sy0VfkB/ivI2DdtJL2DEmlg= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -34,71 +33,29 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48 h1:/EMHruHCFXR9xClkGV/t0rmHrdhX4+trQUcBqjwc9xE= code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/99designs/keyring v1.1.5 h1:wLv7QyzYpFIyMSwOADq1CLTF9KbjbBfcnfmOGJ64aO4= -github.com/99designs/keyring v1.1.5/go.mod h1:7hsVvt2qXgtadGevGJ4ujg+u8m6SpJ5TpHqTozIPqf0= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/zstd v1.4.6-0.20200617134701-89f69fb7df32 h1:/gZKpgSMydtrih81nvUhlkXpZIUfthKShSCVbRzBt9Y= -github.com/DataDog/zstd v1.4.6-0.20200617134701-89f69fb7df32/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/apache/pulsar v1.22.1-incubating-candidate-2 h1:L4EBghcly9NMPtMKm6g+rHCz+0SR9rPHy7ejbnHwsBs= github.com/apache/pulsar v2.6.1+incompatible h1:zzRPza6C/gbycCruI5JKhsOqbHXQ15gGwPj7W32RFoU= -github.com/apache/pulsar-client-go v0.2.0 h1:7teu0FaXzzKPjDdUNjA7dVYKFjCy6OVX5as6nUww4qk= -github.com/apache/pulsar-client-go v0.2.0/go.mod h1:POSPPmXv1RuoM7FzHaS3NurCSOopwin2ekGK2PcOgVM= -github.com/apache/pulsar-client-go/oauth2 v0.0.0-20200715083626-b9f8c5cedefb h1:E1P0FudxDdj2RhbveZC9i3PwukLCA/4XQSkBS/dw6/I= -github.com/apache/pulsar-client-go/oauth2 v0.0.0-20200715083626-b9f8c5cedefb/go.mod h1:0UtvvETGDdvXNDCHa8ZQpxl+w3HbdFtfYZvDHLgWGTY= -github.com/apache/pulsar-client-go/oauth2 v0.0.0-20200825011529-c078454b47b6 h1:GIp6buSqtcYSzgDZG6oL6dmm6l9e4ZldNEZna/d6+2M= -github.com/apache/pulsar-client-go/oauth2 v0.0.0-20200825011529-c078454b47b6/go.mod h1:0UtvvETGDdvXNDCHa8ZQpxl+w3HbdFtfYZvDHLgWGTY= github.com/apache/pulsar/pulsar-client-go v0.0.0-20200901051823-800681aaa9af h1:hE//BVq7iKVPkKwA9ZHGUF8DY/DhkzBGN7LGDmUpzC8= github.com/apache/pulsar/pulsar-client-go v0.0.0-20200901051823-800681aaa9af/go.mod h1:QdYxU2iG99VVU6cvoBRkCgkazfJSL9WwPZ20PZR6aUk= -github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4= -github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI= -github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= -github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.30.8/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= -github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= -github.com/boynton/repl v0.0.0-20170116235056-348863958e3e/go.mod h1:Crc/GCZ3NXDVCio7Yr0o+SSrytpcFhLmVCIzi0s49t4= -github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= -github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa v0.0.1 h1:r3ncXbtIiad9owWu22r8ryYogBEV9NbJykk8k6K+u0w= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coreos/bbolt v1.3.2 h1:wZwiHHUieZCquLkDL0B8UhzreNWsPHooDAG3q34zk0s= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.12+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -109,38 +66,21 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190212144455-93d5ec2c7f76 h1:FE783w8WFh+Rvg+7bZ5g8p7gP4SeVS4AoNwkvazlsBg= github.com/coreos/go-systemd v0.0.0-20190212144455-93d5ec2c7f76/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= -github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= -github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= -github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= -github.com/danieljoos/wincred v1.1.0 h1:3RNcEpBg4IhIChZdFRSdlQt1QjCp1sMAPIrOnm7Yf8g= -github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvsekhvalnov/jose2go v0.0.0-20180829124132-7f401d37b68a h1:mq+R6XEM6lJX5VlLyZIrUSP8tSuJp82xTK89hvBwJbU= -github.com/dvsekhvalnov/jose2go v0.0.0-20180829124132-7f401d37b68a/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= -github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b h1:HBah4D48ypg3J7Np4N+HY/ZR76fx3HEUGxDU6Uk39oQ= -github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= -github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= -github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/envoyproxy/data-plane-api v0.0.0-20200904023242-f4d8a28107ca h1:EvL1gA7uyPU2JVN93HbQwYOXyUjUJKYGStDN8eKD/Ss= @@ -149,34 +89,20 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= -github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= -github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v0.0.0-20180717141946-636bf0302bc9/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -206,7 +132,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -238,11 +163,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.0 h1:tOSd0UKHQd6urX6ApfOn4XdBMY6Sh1MfxV3kmaazO+U= github.com/gorilla/mux v1.7.0/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= @@ -254,45 +176,16 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.8.1/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= -github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= -github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= -github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= -github.com/jawher/mow.cli v1.1.0/go.mod h1:aNaQlc7ozF3vw6IJ2dHjp2ZFiA4ozMIYY6PyuRJwlUg= -github.com/jawher/mow.cli v1.2.0/go.mod h1:y+pcA3jBAdo/GIZx/0rFjw/K2bVEODP9rfZOfaiq8Ko= -github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -300,19 +193,9 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= -github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= -github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d h1:gVjhBCfVGl32RIBooOANzfw+0UqX8HU+yPlMv8vypcg= -github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d/go.mod h1:W6EbaYmb4RldPn0N3gvVHjY1wmU59kbymhW9NATWhwY= -github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03/go.mod h1:a8clEhrrGV/d76/f9r2I41BwANMihfZYV9C223vaxqE= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.10.8 h1:eLeJ3dr/Y9+XRfJT4l+8ZjmtB5RPJhucH2HeCV5+IZY= -github.com/klauspost/compress v1.10.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.10.11 h1:K9z59aO18Aywg2b/WSgBaUX99mHy2BES18Cr5lBKZHk= -github.com/klauspost/compress v1.10.11/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/cpuid v1.2.3/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid v1.3.1 h1:5JNjFYYQrZeKRJ0734q51WCEEn2huer72Dc7K+R/b6s= github.com/klauspost/cpuid v1.3.1/go.mod h1:bYW4mA6ZgKPob1/Dlai2LviZJO7KGI3uoWLd42rAQw4= @@ -322,37 +205,24 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxv github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linkedin/goavro v2.1.0+incompatible h1:DV2aUlj2xZiuxQyvag8Dy7zjY69ENjS66bWkSfdpddY= github.com/linkedin/goavro v2.1.0+incompatible/go.mod h1:bBCwI2eGYpUI/4820s67MElg9tdeLbINjLjiM2xZFYM= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/minio/md5-simd v1.1.0 h1:QPfiOqlZH+Cj9teu0t9b1nTBfPbyTl16Of5MeuShdK4= github.com/minio/md5-simd v1.1.0/go.mod h1:XpBqgZULrMYD3R+M28PcmP0CkI7PEMzB3U77ZrKZ0Gw= github.com/minio/minio-go/v7 v7.0.5 h1:I2NIJ2ojwJqD/YByemC1M59e1b4FW9kS7NlOar7HPV4= github.com/minio/minio-go/v7 v7.0.5/go.mod h1:TA0CQCjJZHM5SJj9IjqR0NmpmQJ6bCbXifAJ3mUU6Hw= github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKUJU= github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -361,53 +231,16 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/montanaflynn/stats v0.5.0 h1:2EkzeTSqBB4V4bJwWrt5gIIrZmpJBcoIRGS2kWLgzmk= github.com/montanaflynn/stats v0.5.0/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= -github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= -github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= -github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= -github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= -github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= -github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= -github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= -github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= -github.com/ozonru/etcd v3.3.20-grpc1.27-origmodule+incompatible/go.mod h1:iIubILNIN6Jq9h8uiSLrN9L1tuj3iSSFwz3R61skm/A= -github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/pierrec/lz4 v1.0.1 h1:w6GMGWSsCI04fTM8wQRdnW74MuJISakuUU0onU0TYB4= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= -github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= -github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= -github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pingcap/check v0.0.0-20190102082844-67f458068fc8/go.mod h1:B1+S9LNcuMyLH/4HMTViQOJevkGiik3wW2AN9zb2fNQ= github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712 h1:R8gStypOBmpnHEx1qi//SaqxJVI4inOqljg/Aj5/390= github.com/pingcap/check v0.0.0-20200212061837-5e12011dc712/go.mod h1:PYMCGwN0JHjoqGr3HrZoD+b8Tgx8bKnArhSq8YVzUMc= @@ -430,87 +263,48 @@ github.com/pivotal-golang/bytefmt v0.0.0-20200131002437-cf55d5288a48/go.mod h1:4 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= -github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= -github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.13.0 h1:vJlpe9wPgDRM1Z+7Wj3zUUjY1nr6/1jNKyl7llliccg= -github.com/prometheus/common v0.13.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/protocolbuffers/protobuf v3.13.0+incompatible h1:omZA3Tuq+U2kJ2uMuqMR9c1VO5qLEgZ19m9878fXNtg= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a h1:pa8hGb/2YqsZKovtsgrwcDH1RZhVbTKCjLp47XpqCDs= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= -github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tikv/client-go v0.0.0-20200824032810-95774393107b h1:VOG2GkM7RpRrT0St7HIIwCWrc3mVdf+DjcT8r2ucusI= @@ -525,25 +319,15 @@ github.com/ugorji/go/codec v0.0.0-20190204201341-e444a5086c43/go.mod h1:iT03XoTw github.com/unrolled/render v1.0.0 h1:XYtvhA3UkpB7PqkvhUFYmpKD55OudoIeygcfus4vcd4= github.com/unrolled/render v1.0.0/go.mod h1:tu82oB5W2ykJRVioYsB+IQKcft7ryBr7w12qMBUPyXg= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/yahoo/athenz v1.8.55 h1:xGhxN3yLq334APyn0Zvcc+aqu78Q7BBhYJevM3EtTW0= -github.com/yahoo/athenz v1.8.55/go.mod h1:G7LLFUH7Z/r4QAB7FfudfuA7Am/eCzO1GlzBhDL6Kv0= -github.com/yahoo/athenz v1.9.16 h1:2s8KtIxwAbcJIYySsfrT/t/WO0Ss5O7BPGUN/q8x2bg= -github.com/yahoo/athenz v1.9.16/go.mod h1:guj+0Ut6F33wj+OcSRlw69O0itsR7tVocv15F2wJnIo= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 h1:lWF4f9Nypl1ZqSb4gLeh/DGvBYVaUYHuiB93teOmwgc= go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200329194405-dd816f0735f8 h1:Z4rDOX67HLaG5Wijksq+0d1giSOblwNZZUXOxka/k6k= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200329194405-dd816f0735f8/go.mod h1:YoUyTScD3Vcv2RBm3eGVOq7i1ULiz3OuXoQFWOirmAM= -go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= -go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -563,24 +347,16 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -617,19 +393,16 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -644,22 +417,16 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up98WAHf3f/ulnJ62IyA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA= -golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 h1:ld7aEMNHoBnnDAX15v1T6z31v8HwR2A9FYOuAhWqkwc= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -668,14 +435,11 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -684,18 +448,11 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -707,14 +464,10 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 h1:B6caxRw+hozq68X2MY7jEpZh/cr4/aHLv9xU8Kkadrw= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f h1:Fqb3ao1hUmOR3GkUOg/Y+BadLwykBIzs5q8Ez2SbHyc= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -741,7 +494,6 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190808195139-e713427fea3f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -755,7 +507,6 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -775,13 +526,11 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200806022845-90696ccdc692 h1:fsn47thVa7Ar/TMyXYlZgOoT7M4+kRpb+KpSAqRQx1w= golang.org/x/tools v0.0.0-20200806022845-90696ccdc692/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -799,12 +548,10 @@ google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20181004005441-af9cb2a35e7f/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -812,7 +559,6 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -838,8 +584,6 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98 h1:LCO0fg4kb6WwkXQXRQQgUYsFeFb5taTX5WAx5O/Vt28= google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 h1:PDIOdWxZ8eRizhKa1AAvY53xsvLB1cWorMjslvY3VA8= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v0.0.0-20180607172857-7a6a684ca69e/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -847,15 +591,12 @@ google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.1 h1:SfXqXS5hkufcdZ/mHtYCh53P2b+92WQq/DZcKLgsFRs= google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= @@ -876,13 +617,10 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/linkedin/goavro.v1 v1.0.5 h1:BJa69CDh0awSsLUmZ9+BowBdokpduDZSM9Zk8oKHfN4= @@ -890,19 +628,13 @@ gopkg.in/linkedin/goavro.v1 v1.0.5/go.mod h1:Aw5GdAbizjOEl0kAMHV9iHmA8reZzW/OKuJ gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -919,4 +651,3 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/master/config/config.go b/master/config/config.go index 10ae04dd2e..2acad10295 100644 --- a/master/config/config.go +++ b/master/config/config.go @@ -18,9 +18,7 @@ import ( "encoding/json" "flag" "fmt" - "github.com/czs007/suvlim/util/grpcutil" - //"google.golang.org/grpc" "net/url" "os" @@ -39,8 +37,8 @@ import ( // Config is the pd server configuration. type Config struct { - flagSet *flag.FlagSet - Version bool `json:"-"` + flagSet *flag.FlagSet + Version bool `json:"-"` ConfigCheck bool `json:"-"` ClientUrls string `toml:"client-urls" json:"client-urls"` @@ -48,29 +46,31 @@ type Config struct { AdvertiseClientUrls string `toml:"advertise-client-urls" json:"advertise-client-urls"` AdvertisePeerUrls string `toml:"advertise-peer-urls" json:"advertise-peer-urls"` - Name string `toml:"name" json:"name"` - DataDir string `toml:"data-dir" json:"data-dir"` + + Name string `toml:"name" json:"name"` + DataDir string `toml:"data-dir" json:"data-dir"` EnableGRPCGateway bool `json:"enable-grpc-gateway"` InitialCluster string `toml:"initial-cluster" json:"initial-cluster"` InitialClusterState string `toml:"initial-cluster-state" json:"initial-cluster-state"` InitialClusterToken string `toml:"initial-cluster-token" json:"initial-cluster-token"` - LeaderLease int64 `toml:"lease" json:"lease"` - Log log.Config `toml:"log" json:"log"` - LogFileDeprecated string `toml:"log-file" json:"log-file,omitempty"` - LogLevelDeprecated string `toml:"log-level" json:"log-level,omitempty"` + + LeaderLease int64 `toml:"lease" json:"lease"` + Log log.Config `toml:"log" json:"log"` + LogFileDeprecated string `toml:"log-file" json:"log-file,omitempty"` + LogLevelDeprecated string `toml:"log-level" json:"log-level,omitempty"` PDServerCfg PDServerConfig `toml:"pd-server" json:"pd-server"` - TickInterval typeutil.Duration `toml:"tick-interval"` - ElectionInterval typeutil.Duration `toml:"election-interval"` + TickInterval typeutil.Duration `toml:"tick-interval"` + ElectionInterval typeutil.Duration `toml:"election-interval"` DisableStrictReconfigCheck bool // TsoSaveInterval is the interval to save timestamp. TsoSaveInterval typeutil.Duration `toml:"tso-save-interval" json:"tso-save-interval"` - PreVote bool `toml:"enable-prevote"` + PreVote bool `toml:"enable-prevote"` Security grpcutil.SecurityConfig `toml:"security" json:"security"` configFile string @@ -89,35 +89,35 @@ type Config struct { // NewConfig creates a new config. func NewConfig() *Config { cfg := &Config{} - cfg.HeartbeatStreamBindInterval = typeutil.NewDuration(defaultHeartbeatStreamRebindInterval) - cfg.TickInterval = typeutil.NewDuration(defaultTickInterval) - cfg.ElectionInterval = typeutil.NewDuration(defaultElectionInterval) cfg.flagSet = flag.NewFlagSet("pd", flag.ContinueOnError) fs := cfg.flagSet + fs.BoolVar(&cfg.Version, "V", false, "print version information and exit") fs.BoolVar(&cfg.Version, "version", false, "print version information and exit") fs.StringVar(&cfg.configFile, "config", "", "config file") fs.BoolVar(&cfg.ConfigCheck, "config-check", false, "check config file validity and exit") - fs.StringVar(&cfg.Name, "name", defaultName, "human-readable name for this pd member") + fs.StringVar(&cfg.Name, "name", "", "human-readable name for this pd member") - fs.StringVar(&cfg.DataDir, "data-dir", "/data/pd/data", "path to the data directory (default 'default.${name}')") + fs.StringVar(&cfg.DataDir, "data-dir", "", "path to the data directory (default 'default.${name}')") fs.StringVar(&cfg.ClientUrls, "client-urls", defaultClientUrls, "url for client traffic") - fs.StringVar(&cfg.AdvertiseClientUrls, "advertise-client-urls", defaultClientUrls, "advertise url for client traffic (default '${client-urls}')") + fs.StringVar(&cfg.AdvertiseClientUrls, "advertise-client-urls", "", "advertise url for client traffic (default '${client-urls}')") fs.StringVar(&cfg.PeerUrls, "peer-urls", defaultPeerUrls, "url for peer traffic") - fs.StringVar(&cfg.AdvertisePeerUrls, "advertise-peer-urls", defaultPeerUrls, "advertise url for peer traffic (default '${peer-urls}')") - fs.StringVar(&cfg.InitialCluster, "initial-cluster", "pd=http://127.0.0.1:12380", "initial cluster configuration for bootstrapping, e,g. pd=http://127.0.0.1:2380") - fs.StringVar(&cfg.InitialClusterState, "initial-cluster-start", defaultInitialClusterState, "initial cluster state") + fs.StringVar(&cfg.AdvertisePeerUrls, "advertise-peer-urls", "", "advertise url for peer traffic (default '${peer-urls}')") + fs.StringVar(&cfg.InitialCluster, "initial-cluster", "", "initial cluster configuration for bootstrapping, e,g. pd=http://127.0.0.1:2380") + fs.StringVar(&cfg.Log.Level, "L", "", "log level: debug, info, warn, error, fatal (default 'info')") fs.StringVar(&cfg.Log.File.Filename, "log-file", "", "log file path") + return cfg } + const ( - defaultLeaderLease = int64(3) + defaultLeaderLease = int64(3) defaultName = "pd" - defaultClientUrls = "http://127.0.0.1:12379,http://127.0.0.1:12378,http://127.0.0.1:12377" - defaultPeerUrls = "http://127.0.0.1:12380,http://127.0.0.1:12381,http://127.0.0.1:12382" + defaultClientUrls = "http://127.0.0.1:2379" + defaultPeerUrls = "http://127.0.0.1:2380" defaultInitialClusterState = embed.ClusterStateFlagNew defaultInitialClusterToken = "pd-cluster" @@ -131,7 +131,7 @@ const ( defaultHeartbeatStreamRebindInterval = time.Minute - defaultMaxResetTSGap = 24 * time.Hour + defaultMaxResetTSGap = 24 * time.Hour defaultEnableGRPCGateway = true defaultDisableErrorVerbose = true ) @@ -344,6 +344,7 @@ func (c *Config) Adjust(meta *toml.MetaData) error { adjustDuration(&c.TickInterval, defaultTickInterval) adjustDuration(&c.ElectionInterval, defaultElectionInterval) + if err := c.PDServerCfg.adjust(configMetaData.Child("pd-server")); err != nil { return err } @@ -388,6 +389,7 @@ func (c *Config) configFromFile(path string) (*toml.MetaData, error) { return &meta, errors.WithStack(err) } + // PDServerConfig is the configuration for pd server. type PDServerConfig struct { // MaxResetTSGap is the max gap to reset the tso. @@ -402,10 +404,11 @@ func (c *PDServerConfig) adjust(meta *configMetaData) error { // Clone returns a cloned PD server config. func (c *PDServerConfig) Clone() *PDServerConfig { return &PDServerConfig{ - MaxResetTSGap: c.MaxResetTSGap, + MaxResetTSGap: c.MaxResetTSGap, } } + // ParseUrls parse a string into multiple urls. // Export for api. func ParseUrls(s string) ([]url.URL, error) { @@ -504,11 +507,12 @@ func (c *Config) GenEmbedEtcdConfig() (*embed.Config, error) { cfg.PeerTLSInfo.CertFile = c.Security.CertPath cfg.PeerTLSInfo.KeyFile = c.Security.KeyPath cfg.PeerTLSInfo.AllowedCN = allowedCN - // cfg.ZapLoggerBuilder = embed.NewZapCoreLoggerBuilder(c.logger, c.logger.Core(), c.logProps.Syncer) + cfg.ZapLoggerBuilder = embed.NewZapCoreLoggerBuilder(c.logger, c.logger.Core(), c.logProps.Syncer) cfg.EnableGRPCGateway = c.EnableGRPCGateway cfg.EnableV2 = true cfg.Logger = "zap" var err error + cfg.LPUrls, err = ParseUrls(c.PeerUrls) if err != nil { return nil, err diff --git a/master/server.go b/master/server.go index af075a9b0e..2b16bbea67 100644 --- a/master/server.go +++ b/master/server.go @@ -20,9 +20,11 @@ import ( //"fmt" "math/rand" + "path" "github.com/czs007/suvlim/master/member" + "strconv" "strings" "sync" "sync/atomic" @@ -38,14 +40,13 @@ import ( "github.com/czs007/suvlim/master/config" "github.com/czs007/suvlim/master/id" "github.com/czs007/suvlim/master/meta" - "github.com/czs007/suvlim/util/logutil" "github.com/czs007/suvlim/util/typeutil" + "github.com/czs007/suvlim/util/logutil" //"github.com/czs007/suvlim/master/kv" "github.com/czs007/suvlim/master/tso" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/embed" - //"go.etcd.io/etcd/pkg/types" "go.uber.org/zap" "google.golang.org/grpc" @@ -124,6 +125,7 @@ type Server struct { func CreateServer(ctx context.Context, cfg *config.Config) (*Server, error) { log.Info("PD Config", zap.Reflect("config", cfg)) rand.Seed(time.Now().UnixNano()) + s := &Server{ cfg: cfg, persistOptions: config.NewPersistOptions(cfg), @@ -139,6 +141,7 @@ func CreateServer(ctx context.Context, cfg *config.Config) (*Server, error) { if err != nil { return nil, err } + etcdCfg.ServiceRegister = func(gs *grpc.Server) { pdpb.RegisterPDServer(gs, s) //diagnosticspb.RegisterDiagnosticsServer(gs, s) @@ -147,6 +150,7 @@ func CreateServer(ctx context.Context, cfg *config.Config) (*Server, error) { s.lg = cfg.GetZapLogger() s.logProps = cfg.GetZapLogProperties() + s.lg = cfg.GetZapLogger() s.logProps = cfg.GetZapLogProperties() return s, nil @@ -174,6 +178,7 @@ func (s *Server) startEtcd(ctx context.Context) error { //if err = etcdutil.CheckClusterID(etcd.Server.Cluster().ID(), urlMap, tlsConfig); err != nil { // return err //} + select { // Wait etcd until it is ready to use case <-etcd.Server.ReadyNotify(): @@ -228,6 +233,17 @@ func (s *Server) startServer(ctx context.Context) error { // It may lose accuracy if use float64 to store uint64. So we store the // cluster id in label. //metadataGauge.WithLabelValues(fmt.Sprintf("cluster%d", s.clusterID)).Set(0) + + s.rootPath = path.Join(pdRootPath, strconv.FormatUint(s.clusterID, 10)) + + s.idAllocator = id.NewAllocatorImpl(s.client, s.rootPath, s.member.MemberValue()) + + s.tsoAllocator = tso.NewGlobalTSOAllocator( + s.member.GetLeadership(), + s.rootPath, + s.cfg.TsoSaveInterval.Duration, + func() time.Duration { return s.persistOptions.GetMaxResetTSGap() }, + ) kvBase := kv.NewEtcdKVBase(s.client, s.rootPath) // path := filepath.Join(s.cfg.DataDir, "region-meta") @@ -319,6 +335,7 @@ func (s *Server) Run() error { if err := s.startEtcd(s.ctx); err != nil { return err } + if err := s.startServer(s.ctx); err != nil { return err } diff --git a/pkg/master/README.md b/pkg/master/README.md deleted file mode 100644 index 9daa0ed229..0000000000 --- a/pkg/master/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# How to start a master - -## Requirements - - -## Start from code - - -## Start with docker diff --git a/pkg/master/common/config.go b/pkg/master/common/config.go deleted file mode 100644 index 774073215c..0000000000 --- a/pkg/master/common/config.go +++ /dev/null @@ -1,10 +0,0 @@ -package common - -import "time" - -const ( - PULSAR_URL = "pulsar://localhost:16650" - PULSAR_MONITER_INTERVAL = 1 * time.Second - PULSAR_TOPIC = "monitor-topic" - ETCD_ROOT_PATH = "by-dev" -) diff --git a/pkg/master/informer/informer.go b/pkg/master/informer/informer.go deleted file mode 100644 index 496a57b3cd..0000000000 --- a/pkg/master/informer/informer.go +++ /dev/null @@ -1,5 +0,0 @@ -package informer - -type Informer interface { - Listener(key interface{}) (interface{}, error) -} diff --git a/pkg/master/informer/pulsar.go b/pkg/master/informer/pulsar.go deleted file mode 100644 index d46485829b..0000000000 --- a/pkg/master/informer/pulsar.go +++ /dev/null @@ -1,58 +0,0 @@ -package informer - -import ( - "context" - "fmt" - "log" - "time" - - "github.com/apache/pulsar-client-go/pulsar" - "github.com/czs007/suvlim/pkg/master/common" - "github.com/czs007/suvlim/pkg/master/mock" -) - -func NewPulsarClient() PulsarClient { - client, err := pulsar.NewClient(pulsar.ClientOptions{ - URL: common.PULSAR_URL, - OperationTimeout: 30 * time.Second, - ConnectionTimeout: 30 * time.Second, - }) - if err != nil { - log.Fatalf("Could not instantiate Pulsar client: %v", err) - } - - return PulsarClient{ - Client: client, - } -} - -type PulsarClient struct { - Client pulsar.Client -} - -func (pc PulsarClient) Listener(ssChan chan mock.SegmentStats) error { - consumer, err := pc.Client.Subscribe(pulsar.ConsumerOptions{ - Topic: common.PULSAR_TOPIC, - SubscriptionName: "my-sub", - Type: pulsar.Shared, - }) - if err != nil { - log.Fatal(err) - } - for i := 0; i < 10; i++ { - msg, err := consumer.Receive(context.TODO()) - if err != nil { - log.Fatal(err) - } - m, _ := mock.SegmentUnMarshal(msg.Payload()) - fmt.Printf("Received message msgId: %#v -- content: '%s'\n", - msg.ID(), m.SegementID) - ssChan <- m - consumer.Ack(msg) - } - - if err := consumer.Unsubscribe(); err != nil { - log.Fatal(err) - } - return nil -} diff --git a/pkg/master/kv/etcd_kv.go b/pkg/master/kv/etcd_kv.go deleted file mode 100644 index b45403484d..0000000000 --- a/pkg/master/kv/etcd_kv.go +++ /dev/null @@ -1,136 +0,0 @@ -package kv - -import ( - "context" - "path" - "time" - - "github.com/czs007/suvlim/errors" - "github.com/czs007/suvlim/util/etcdutil" - "github.com/pingcap/log" - "go.etcd.io/etcd/clientv3" - "go.uber.org/zap" -) - -const ( - requestTimeout = 10 * time.Second - slowRequestTime = 1 * time.Second -) - -var ( - errTxnFailed = errors.New("failed to commit transaction") -) - -type etcdKVBase struct { - client *clientv3.Client - rootPath string -} - -// NewEtcdKVBase creates a new etcd kv. -func NewEtcdKVBase(client *clientv3.Client, rootPath string) *etcdKVBase { - return &etcdKVBase{ - client: client, - rootPath: rootPath, - } -} - -func (kv *etcdKVBase) Load(key string) (string, error) { - key = path.Join(kv.rootPath, key) - - resp, err := etcdutil.EtcdKVGet(kv.client, key) - if err != nil { - return "", err - } - if n := len(resp.Kvs); n == 0 { - return "", nil - } else if n > 1 { - return "", errors.Errorf("load more than one kvs: key %v kvs %v", key, n) - } - return string(resp.Kvs[0].Value), nil -} - -func (kv *etcdKVBase) Save(key, value string) error { - key = path.Join(kv.rootPath, key) - - txn := NewSlowLogTxn(kv.client) - resp, err := txn.Then(clientv3.OpPut(key, value)).Commit() - if err != nil { - log.Error("save to etcd meet error", zap.String("key", key), zap.String("value", value)) - return errors.WithStack(err) - } - if !resp.Succeeded { - return errors.WithStack(errTxnFailed) - } - return nil -} - -func (kv *etcdKVBase) Remove(key string) error { - key = path.Join(kv.rootPath, key) - - txn := NewSlowLogTxn(kv.client) - resp, err := txn.Then(clientv3.OpDelete(key)).Commit() - if err != nil { - log.Error("remove from etcd meet error", zap.String("key", key)) - return errors.WithStack(err) - } - if !resp.Succeeded { - return errors.WithStack(errTxnFailed) - } - return nil -} - -// SlowLogTxn wraps etcd transaction and log slow one. -type SlowLogTxn struct { - clientv3.Txn - cancel context.CancelFunc -} - -// NewSlowLogTxn create a SlowLogTxn. -func NewSlowLogTxn(client *clientv3.Client) clientv3.Txn { - ctx, cancel := context.WithTimeout(client.Ctx(), requestTimeout) - return &SlowLogTxn{ - Txn: client.Txn(ctx), - cancel: cancel, - } -} - -// If takes a list of comparison. If all comparisons passed in succeed, -// the operations passed into Then() will be executed. Or the operations -// passed into Else() will be executed. -func (t *SlowLogTxn) If(cs ...clientv3.Cmp) clientv3.Txn { - return &SlowLogTxn{ - Txn: t.Txn.If(cs...), - cancel: t.cancel, - } -} - -// Then takes a list of operations. The Ops list will be executed, if the -// comparisons passed in If() succeed. -func (t *SlowLogTxn) Then(ops ...clientv3.Op) clientv3.Txn { - return &SlowLogTxn{ - Txn: t.Txn.Then(ops...), - cancel: t.cancel, - } -} - -// Commit implements Txn Commit interface. -func (t *SlowLogTxn) Commit() (*clientv3.TxnResponse, error) { - start := time.Now() - resp, err := t.Txn.Commit() - t.cancel() - - cost := time.Since(start) - if cost > slowRequestTime { - log.Warn("txn runs too slow", - zap.Error(err), - zap.Reflect("response", resp), - zap.Duration("cost", cost)) - } - //label := "success" - //if err != nil { - // label = "failed" - //} - //txnCounter.WithLabelValues(label).Inc() - //txnDuration.WithLabelValues(label).Observe(cost.Seconds()) - return resp, errors.WithStack(err) -} diff --git a/pkg/master/kv/kv.go b/pkg/master/kv/kv.go deleted file mode 100644 index 6a2ee82cf6..0000000000 --- a/pkg/master/kv/kv.go +++ /dev/null @@ -1,7 +0,0 @@ -package kv - -type Base interface { - Load(key string) (string, error) - Save(key, value string) error - Remove(key string) error -} diff --git a/pkg/master/mock/collection.go b/pkg/master/mock/collection.go deleted file mode 100644 index 4bd9e07d5d..0000000000 --- a/pkg/master/mock/collection.go +++ /dev/null @@ -1,46 +0,0 @@ -package mock - -import ( - "time" - - jsoniter "github.com/json-iterator/go" -) - -var json = jsoniter.ConfigCompatibleWithStandardLibrary - -type Collection struct { - ID uint64 `json:"id"` - Name string `json:"name"` - CreateTime time.Time `json:"creat_time"` - SegmentIDs []uint64 `json:"segment_ids"` - PartitionTags []string `json:"partition_tags"` -} - -func FakeCreateCollection(id uint64) Collection { - cl := Collection{ - ID: id, - Name: "test-collection", - CreateTime: time.Now(), - SegmentIDs: []uint64{uint64(10111)}, - PartitionTags: []string{"default"}, - } - return cl -} - -func Collection2JSON(c Collection) (string, error) { - b, err := json.Marshal(&c) - if err != nil { - return "", err - } - - return string(b), nil -} - -func JSON2Collection(s string) (Collection, error) { - var c Collection - err := json.Unmarshal([]byte(s), &c) - if err != nil { - return Collection{}, err - } - return c, nil -} diff --git a/pkg/master/mock/collection_test.go b/pkg/master/mock/collection_test.go deleted file mode 100644 index b37b5f2df9..0000000000 --- a/pkg/master/mock/collection_test.go +++ /dev/null @@ -1,23 +0,0 @@ -package mock - -import ( - "fmt" - "testing" - "time" -) - -var C = Collection{ - ID: uint64(11111), - Name: "test-collection", - CreateTime: time.Now(), - SegmentIDs: []uint64{uint64(10111)}, - PartitionTags: []string{"default"}, -} - -func TestCollection2JSON(t *testing.T) { - res, err := Collection2JSON(C) - if err != nil { - t.Error(err) - } - fmt.Println(res) -} diff --git a/pkg/master/mock/mock.go b/pkg/master/mock/mock.go deleted file mode 100644 index ecf4ee9bd4..0000000000 --- a/pkg/master/mock/mock.go +++ /dev/null @@ -1,5 +0,0 @@ -package mock - -func MockServer() { - -} diff --git a/pkg/master/mock/pulsar.go b/pkg/master/mock/pulsar.go deleted file mode 100644 index f7d8edadb8..0000000000 --- a/pkg/master/mock/pulsar.go +++ /dev/null @@ -1,45 +0,0 @@ -package mock - -import ( - "context" - "fmt" - "log" - "time" - - "github.com/apache/pulsar-client-go/pulsar" - "github.com/czs007/suvlim/pkg/master/common" -) - -func FakePulsarProducer() { - client, err := pulsar.NewClient(pulsar.ClientOptions{ - URL: common.PULSAR_URL, - OperationTimeout: 30 * time.Second, - ConnectionTimeout: 30 * time.Second, - }) - if err != nil { - log.Fatalf("Could not instantiate Pulsar client: %v", err) - } - - producer, err := client.CreateProducer(pulsar.ProducerOptions{ - Topic: common.PULSAR_TOPIC, - }) - testSegmentStats, _ := SegmentMarshal(SegmentStats{ - SegementID: uint64(1111), - MemorySize: uint64(333322), - MemoryRate: float64(0.13), - }) - for { - _, err = producer.Send(context.Background(), &pulsar.ProducerMessage{ - Payload: testSegmentStats, - }) - time.Sleep(1 * time.Second) - } - defer producer.Close() - - if err != nil { - fmt.Println("Failed to publish message", err) - } - fmt.Println("Published message") -} - -//TODO add a mock: memory increase diff --git a/pkg/master/mock/segment.go b/pkg/master/mock/segment.go deleted file mode 100644 index bbb7da45c5..0000000000 --- a/pkg/master/mock/segment.go +++ /dev/null @@ -1,74 +0,0 @@ -package mock - -import ( - "bytes" - "encoding/gob" - "time" -) - -type SegmentStats struct { - SegementID uint64 - MemorySize uint64 - MemoryRate float64 -} - -func SegmentMarshal(s SegmentStats) ([]byte, error) { - var nb bytes.Buffer - enc := gob.NewEncoder(&nb) - err := enc.Encode(s) - if err != nil { - return []byte{}, err - } - return nb.Bytes(), nil -} - -func SegmentUnMarshal(data []byte) (SegmentStats, error) { - var ss SegmentStats - dec := gob.NewDecoder(bytes.NewBuffer(data)) - err := dec.Decode(&ss) - if err != nil { - return SegmentStats{}, err - } - return ss, nil -} - -type Segment struct { - SegmentID uint64 `json:"segment_id"` - Collection Collection `json:"collection"` - PartitionTag string `json:"partition_tag"` - ChannelStart int `json:"channel_start"` - ChannelEnd int `json:"channel_end"` - OpenTimeStamp time.Time `json:"open_timestamp"` - CloseTimeStamp time.Time `json:"clost_timestamp"` -} - -func Segment2JSON(s Segment) (string, error) { - b, err := json.Marshal(&s) - if err != nil { - return "", err - } - - return string(b), nil -} - -func JSON2Segment(s string) (Segment, error) { - var c Segment - err := json.Unmarshal([]byte(s), &c) - if err != nil { - return Segment{}, err - } - return c, nil -} - -func FakeCreateSegment(id uint64, cl Collection, opentime time.Time, closetime time.Time) Segment { - seg := Segment{ - SegmentID: id, - Collection: cl, - PartitionTag: "default", - ChannelStart: 0, - ChannelEnd: 100, - OpenTimeStamp: opentime, - CloseTimeStamp: closetime, - } - return seg -} diff --git a/pkg/master/mock/segment_test.go b/pkg/master/mock/segment_test.go deleted file mode 100644 index 7336413994..0000000000 --- a/pkg/master/mock/segment_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package mock - -import ( - "fmt" - "testing" - "time" -) - -func TestSegmentMarshal(t *testing.T) { - s := SegmentStats{ - SegementID: uint64(12315), - MemorySize: uint64(233113), - MemoryRate: float64(0.13), - } - - data, err := SegmentMarshal(s) - if err != nil { - t.Error(err) - } - - ss, err := SegmentUnMarshal(data) - if err != nil { - t.Error(err) - } - if ss.MemoryRate != s.MemoryRate { - fmt.Println(ss.MemoryRate) - fmt.Println(s.MemoryRate) - t.Error("Error when marshal") - } -} - -var Ts = Segment{ - SegmentID: uint64(101111), - Collection: Collection{ - ID: uint64(11111), - Name: "test-collection", - CreateTime: time.Now(), - SegmentIDs: []uint64{uint64(10111)}, - PartitionTags: []string{"default"}, - }, - PartitionTag: "default", - ChannelStart: 1, - ChannelEnd: 100, - OpenTimeStamp: time.Now(), - CloseTimeStamp: time.Now().Add(1 * time.Hour), -} - -func TestSegment2JSON(t *testing.T) { - res, err := Segment2JSON(Ts) - if err != nil { - t.Error(err) - } - fmt.Println(res) -} diff --git a/pkg/master/server.go b/pkg/master/server.go deleted file mode 100644 index b37d1891a9..0000000000 --- a/pkg/master/server.go +++ /dev/null @@ -1,53 +0,0 @@ -package master - -import ( - "fmt" - "time" - - "github.com/czs007/suvlim/pkg/master/common" - "github.com/czs007/suvlim/pkg/master/informer" - "github.com/czs007/suvlim/pkg/master/kv" - "github.com/czs007/suvlim/pkg/master/mock" - "go.etcd.io/etcd/clientv3" -) - -func SegmentStatsController() { - ssChan := make(chan mock.SegmentStats, 10) - defer close(ssChan) - ssClient := informer.NewPulsarClient() - go ssClient.Listener(ssChan) - for { - select { - case ss := <-ssChan: - fmt.Println(ss) - case <-time.After(5 * time.Second): - fmt.Println("timeout") - return - } - } -} - -func GRPCServer() { - -} - -func CollectionController() { - cli, _ := clientv3.New(clientv3.Config{ - Endpoints: []string{"127.0.0.1:12379"}, - DialTimeout: 5 * time.Second, - }) - defer cli.Close() - kvbase := kv.NewEtcdKVBase(cli, common.ETCD_ROOT_PATH) - c := mock.FakeCreateCollection(uint64(3333)) - s := mock.FakeCreateSegment(uint64(11111), c, time.Now(), time.Unix(1<<63-1, 0)) - collectionData, _ := mock.Collection2JSON(c) - segmentData, _ := mock.Segment2JSON(s) - kvbase.Save("test-collection", collectionData) - kvbase.Save("test-segment", segmentData) - fmt.Println(kvbase.Load("test-collection")) - fmt.Println(kvbase.Load("test-segment")) -} - -func Sync() { - -} diff --git a/pkg/message/message.pb.go b/pkg/message/message.pb.go index a2d5aebf43..bcc0b45f53 100644 --- a/pkg/message/message.pb.go +++ b/pkg/message/message.pb.go @@ -2086,7 +2086,8 @@ func (m *TimeSyncMsg) GetSyncType() SyncType { type Key2SegMsg struct { Uid int64 `protobuf:"varint,1,opt,name=uid" json:"uid,omitempty"` - SegmentId []int64 `protobuf:"varint,2,rep,packed,name=segment_id,json=segmentId" json:"segment_id,omitempty"` + Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"` + SegmentId []int64 `protobuf:"varint,3,rep,packed,name=segment_id,json=segmentId" json:"segment_id,omitempty"` } func (m *Key2SegMsg) Reset() { *m = Key2SegMsg{} } @@ -2101,6 +2102,13 @@ func (m *Key2SegMsg) GetUid() int64 { return 0 } +func (m *Key2SegMsg) GetTimestamp() uint64 { + if m != nil { + return m.Timestamp + } + return 0 +} + func (m *Key2SegMsg) GetSegmentId() []int64 { if m != nil { return m.SegmentId @@ -2167,7 +2175,7 @@ func init() { func init() { proto.RegisterFile("message.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2837 bytes of a gzipped FileDescriptorProto + // 2841 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x5a, 0xdd, 0x72, 0xdb, 0xc6, 0xf5, 0x27, 0x08, 0x8a, 0x24, 0x0e, 0x48, 0x09, 0x5a, 0xcb, 0xb6, 0x6c, 0xc7, 0x7f, 0x3b, 0xf8, 0xcf, 0xb4, 0x8e, 0x3b, 0xe3, 0x49, 0x94, 0xd4, 0x76, 0xeb, 0x24, 0x0d, 0x3f, 0x20, 0x09, 0x35, @@ -2286,64 +2294,64 @@ var fileDescriptor0 = []byte{ 0x51, 0xb5, 0xbc, 0x21, 0xe9, 0x4e, 0xfc, 0x1e, 0xb5, 0xcf, 0x4d, 0x28, 0x8d, 0x08, 0x09, 0x6d, 0xd3, 0x15, 0x6d, 0x5c, 0x91, 0xfe, 0x34, 0x19, 0x40, 0x6b, 0x0a, 0x30, 0xcf, 0x01, 0x4e, 0x09, 0x68, 0x0f, 0x94, 0x68, 0xe2, 0xf7, 0xec, 0xa5, 0x2d, 0x12, 0x95, 0xcf, 0xbc, 0x5d, 0x8e, 0xc4, - 0x48, 0xff, 0x0c, 0xe0, 0x39, 0x99, 0xec, 0x75, 0x49, 0x9f, 0x6e, 0x2c, 0x4c, 0x22, 0xcd, 0x4c, - 0x32, 0xdf, 0xfd, 0xca, 0x99, 0xb0, 0x7b, 0xf8, 0xd7, 0x02, 0x28, 0xd3, 0x6f, 0x0f, 0x48, 0x85, - 0x52, 0xf7, 0xa4, 0xd1, 0x30, 0xba, 0x5d, 0x2d, 0x87, 0x76, 0x40, 0x3b, 0x69, 0x1b, 0x5f, 0x1e, - 0x1b, 0x0d, 0xcb, 0x68, 0xda, 0x06, 0xc6, 0x1d, 0xac, 0x49, 0x08, 0xc1, 0x66, 0xa3, 0xd3, 0x6e, - 0x1b, 0x0d, 0xcb, 0xde, 0xaf, 0x99, 0x2d, 0xa3, 0xa9, 0xe5, 0xd1, 0x75, 0xd8, 0x3e, 0x36, 0xf0, - 0x91, 0xd9, 0xed, 0x9a, 0x9d, 0xb6, 0xdd, 0x34, 0xda, 0xa6, 0xd1, 0xd4, 0x64, 0x74, 0x0b, 0xae, - 0x37, 0x3a, 0xad, 0x96, 0xd1, 0xb0, 0x28, 0xb9, 0xdd, 0xb1, 0x6c, 0xe3, 0x4b, 0xb3, 0x6b, 0x75, - 0xb5, 0x02, 0x95, 0x6d, 0xb6, 0x5a, 0xc6, 0x41, 0xad, 0x65, 0xd7, 0xf0, 0xc1, 0xc9, 0x91, 0xd1, - 0xb6, 0xb4, 0x0d, 0x2a, 0x27, 0xa1, 0x36, 0xcd, 0x23, 0xa3, 0x4d, 0xc5, 0x69, 0x25, 0x74, 0x03, - 0x50, 0x42, 0x36, 0xdb, 0x4d, 0xe3, 0x4b, 0xdb, 0xfa, 0xea, 0xd8, 0xd0, 0xca, 0xe8, 0x0e, 0xdc, - 0x4c, 0xe8, 0xe9, 0x7d, 0x6a, 0x47, 0x86, 0xa6, 0x20, 0x0d, 0x2a, 0xc9, 0xa4, 0xd5, 0x39, 0x7e, - 0xae, 0x41, 0x5a, 0x3a, 0xee, 0xbc, 0xc2, 0x46, 0xa3, 0x83, 0x9b, 0x9a, 0x9a, 0x26, 0xbf, 0x34, - 0x1a, 0x56, 0x07, 0xdb, 0x66, 0x53, 0xab, 0x50, 0xf0, 0x09, 0xb9, 0x6b, 0xd4, 0x70, 0xe3, 0xd0, - 0xc6, 0x46, 0xf7, 0xa4, 0x65, 0x69, 0x55, 0x6a, 0x82, 0x7d, 0xb3, 0x65, 0x30, 0x8d, 0xf6, 0x3b, - 0x27, 0xed, 0xa6, 0xb6, 0x89, 0xb6, 0x40, 0x3d, 0x32, 0xac, 0x5a, 0x62, 0x93, 0x2d, 0xba, 0x7f, - 0xa3, 0xd6, 0x38, 0x34, 0x12, 0x8a, 0x86, 0x76, 0x61, 0xa7, 0x51, 0x6b, 0x53, 0xa6, 0x06, 0x36, - 0x6a, 0x96, 0x61, 0xef, 0x77, 0x5a, 0x4d, 0x03, 0x6b, 0xdb, 0x54, 0xc1, 0xb9, 0x19, 0xb3, 0x65, - 0x68, 0x28, 0xc5, 0xd1, 0x34, 0x5a, 0xc6, 0x8c, 0xe3, 0x5a, 0x8a, 0x23, 0x99, 0xa1, 0x1c, 0x3b, - 0x54, 0x99, 0xfa, 0x89, 0xd9, 0x6a, 0x0a, 0x43, 0x71, 0xa7, 0x5d, 0x47, 0xdb, 0x50, 0x4d, 0x94, - 0x69, 0xb7, 0xcc, 0xae, 0xa5, 0xdd, 0x40, 0x37, 0xe1, 0x5a, 0x42, 0x3a, 0x32, 0x2c, 0x6c, 0x36, - 0xb8, 0x55, 0x6f, 0xd2, 0xb5, 0x9d, 0x13, 0xcb, 0xee, 0xec, 0xdb, 0x47, 0xc6, 0x51, 0x07, 0x7f, - 0xa5, 0xed, 0x3e, 0xfc, 0xa3, 0x04, 0xe5, 0xa4, 0x3b, 0x47, 0x65, 0x28, 0xb4, 0x3b, 0x6d, 0x43, - 0xcb, 0xd1, 0x51, 0xbd, 0xd3, 0x69, 0x69, 0x12, 0x1d, 0x99, 0x6d, 0xeb, 0xa9, 0x96, 0x47, 0x0a, - 0x6c, 0x98, 0x6d, 0xeb, 0xa3, 0xc7, 0x9a, 0x2c, 0x86, 0x1f, 0xef, 0x69, 0x05, 0x31, 0x7c, 0xfc, - 0x89, 0xb6, 0x41, 0x87, 0xfb, 0xad, 0x4e, 0xcd, 0xd2, 0x00, 0x01, 0x14, 0x9b, 0x9d, 0x93, 0x7a, - 0xcb, 0xd0, 0x54, 0x3a, 0xee, 0x5a, 0xd8, 0x6c, 0x1f, 0x68, 0x3b, 0x14, 0x81, 0xf0, 0x44, 0xdd, - 0x6c, 0xd7, 0xf0, 0x57, 0x9a, 0x4b, 0xad, 0x29, 0x48, 0x9c, 0x99, 0x3c, 0x6c, 0xc0, 0xd6, 0x5c, - 0x3f, 0x89, 0x8a, 0x90, 0x6f, 0x59, 0x5a, 0x0e, 0x95, 0x40, 0x6e, 0x59, 0x86, 0x26, 0x51, 0x82, - 0xf1, 0x42, 0xcb, 0xd3, 0xbf, 0x07, 0x96, 0x26, 0xd3, 0x89, 0x03, 0xcb, 0xd0, 0x0a, 0x94, 0xd0, - 0x36, 0xb4, 0x8d, 0x87, 0x4f, 0x61, 0x83, 0xf5, 0x28, 0x34, 0xf0, 0xcd, 0xf6, 0xcb, 0x5a, 0xcb, - 0x6c, 0x72, 0xbd, 0x8e, 0x4e, 0xba, 0x96, 0x26, 0x31, 0x54, 0x87, 0x9d, 0x93, 0x16, 0x0d, 0xf2, - 0x0a, 0x94, 0x29, 0x95, 0x7a, 0x5d, 0x93, 0x1f, 0xde, 0x87, 0x22, 0x2f, 0xbc, 0x74, 0x8d, 0xd9, - 0xee, 0x1a, 0x98, 0xee, 0x4c, 0x35, 0x62, 0xfe, 0xd0, 0xa4, 0x87, 0xf7, 0xa0, 0x9c, 0xa4, 0x2b, - 0x95, 0x88, 0x8d, 0x1a, 0x95, 0xad, 0xc0, 0xc6, 0x2b, 0x6c, 0xd2, 0x05, 0x7b, 0xdf, 0x57, 0xa1, - 0x7a, 0xc4, 0x92, 0xbb, 0x4b, 0xc2, 0xb7, 0x5e, 0x8f, 0xa0, 0x5f, 0x80, 0xd6, 0x08, 0x89, 0x13, - 0x93, 0xd9, 0x4d, 0x1a, 0x2d, 0xfc, 0x2c, 0x73, 0x7b, 0xd1, 0x5d, 0x5a, 0xcf, 0xa1, 0x7d, 0xa8, - 0x1e, 0x3a, 0x51, 0x8a, 0xfb, 0xce, 0x5c, 0xff, 0x9b, 0x2e, 0xce, 0xb7, 0x6f, 0x9c, 0xeb, 0x94, - 0xf8, 0x6b, 0x51, 0x0e, 0x99, 0x80, 0x9a, 0x24, 0xea, 0x85, 0xde, 0x29, 0x59, 0x55, 0xd8, 0x42, - 0x9c, 0x7a, 0x0e, 0xbd, 0xa0, 0x7e, 0x1a, 0xfb, 0xf1, 0xaa, 0x72, 0xee, 0x2d, 0x99, 0x9c, 0x3e, - 0x2b, 0xe5, 0xd0, 0x2f, 0x61, 0xab, 0xfb, 0x86, 0xfe, 0x4c, 0xe6, 0xa2, 0x39, 0x2b, 0x89, 0x67, - 0xa7, 0xa5, 0xb2, 0x92, 0xef, 0x97, 0x7a, 0x0e, 0x1d, 0x03, 0xca, 0xca, 0x62, 0x4f, 0x17, 0x17, - 0x22, 0x5c, 0x36, 0xc9, 0x9e, 0x2a, 0x72, 0xa8, 0x09, 0x9b, 0xcd, 0x30, 0x18, 0xad, 0xaa, 0xef, - 0x12, 0x4f, 0x7e, 0x06, 0x2a, 0x0f, 0x05, 0xf6, 0x48, 0x86, 0xb2, 0xbd, 0xe5, 0xec, 0xe1, 0x6c, - 0x19, 0x7b, 0x03, 0xaa, 0x89, 0x03, 0x2f, 0x11, 0xb0, 0x6c, 0x42, 0xcf, 0xa1, 0x67, 0xa0, 0x50, - 0x4d, 0x7e, 0x18, 0x02, 0x03, 0xb6, 0xb8, 0x02, 0xd3, 0x8f, 0x7c, 0x73, 0x76, 0xc8, 0x7e, 0x49, - 0x5c, 0x2e, 0xa6, 0x72, 0xe8, 0x44, 0x2b, 0xca, 0x58, 0x1e, 0xd0, 0xcf, 0x61, 0x93, 0xba, 0x79, - 0xba, 0x3e, 0xba, 0xd8, 0x29, 0xb7, 0x17, 0xef, 0x22, 0x62, 0x86, 0x1a, 0x37, 0x0c, 0x46, 0x57, - 0x53, 0xec, 0x53, 0x28, 0xf2, 0xa6, 0x16, 0xed, 0xce, 0x59, 0x76, 0xfa, 0xfd, 0x69, 0x4e, 0x9f, - 0xe9, 0xc7, 0x46, 0x66, 0x96, 0xea, 0xf4, 0x45, 0xac, 0x3e, 0x31, 0x9b, 0x73, 0x10, 0xb2, 0x0f, - 0x5a, 0xb7, 0x17, 0x3f, 0xb2, 0xeb, 0x39, 0x74, 0x48, 0xaf, 0x54, 0xb3, 0x87, 0x35, 0xf4, 0x7f, - 0x73, 0x1d, 0xfd, 0xdc, 0x9b, 0xdb, 0x05, 0x80, 0x3e, 0x87, 0x22, 0x6f, 0x0f, 0xd1, 0xd2, 0x6f, - 0x1c, 0xb7, 0xb3, 0x33, 0xa9, 0x8f, 0x08, 0x2c, 0x0f, 0xb7, 0xe6, 0xbe, 0xb5, 0xa0, 0xf7, 0x17, - 0x08, 0xca, 0x7e, 0x89, 0xb9, 0x50, 0xe2, 0x13, 0x90, 0x1b, 0x43, 0x77, 0x49, 0x65, 0x98, 0x03, - 0x99, 0x7a, 0x83, 0xcf, 0xa1, 0x1a, 0xc0, 0xec, 0x81, 0x14, 0x65, 0x1b, 0xd6, 0xb9, 0x97, 0xd3, - 0x65, 0xce, 0x3d, 0x80, 0xed, 0xe3, 0x90, 0x0c, 0x02, 0xc7, 0xbd, 0x62, 0x19, 0x78, 0x02, 0x1b, - 0xec, 0x15, 0x79, 0x2e, 0xfd, 0x66, 0x2f, 0xcb, 0xcb, 0x18, 0x9f, 0xb1, 0xc7, 0xf7, 0x91, 0xd3, - 0x8b, 0xd1, 0xad, 0xf3, 0x6f, 0x20, 0xe2, 0x49, 0x79, 0x19, 0x73, 0x1d, 0xca, 0xc2, 0x6f, 0x75, - 0x74, 0x7b, 0x99, 0x3b, 0x8f, 0xeb, 0x17, 0x99, 0xbf, 0x5e, 0xfa, 0x7a, 0x63, 0x18, 0xf5, 0x47, - 0xa7, 0xa7, 0x45, 0xf6, 0x9f, 0x31, 0x1f, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x60, 0x92, 0xd0, - 0x02, 0x2a, 0x23, 0x00, 0x00, + 0x48, 0xff, 0x06, 0xe0, 0x39, 0x99, 0xec, 0x75, 0x49, 0x9f, 0x6e, 0x2c, 0x4c, 0x22, 0x2d, 0x31, + 0x49, 0xfe, 0xe2, 0xa0, 0x94, 0x59, 0xcf, 0x31, 0x0b, 0xca, 0x87, 0x7f, 0x2d, 0x80, 0x32, 0xfd, + 0x32, 0x81, 0x54, 0x28, 0x75, 0x4f, 0x1a, 0x0d, 0xa3, 0xdb, 0xd5, 0x72, 0x68, 0x07, 0xb4, 0x93, + 0xb6, 0xf1, 0xe5, 0xb1, 0xd1, 0xb0, 0x8c, 0xa6, 0x6d, 0x60, 0xdc, 0xc1, 0x9a, 0x84, 0x10, 0x6c, + 0x36, 0x3a, 0xed, 0xb6, 0xd1, 0xb0, 0xec, 0xfd, 0x9a, 0xd9, 0x32, 0x9a, 0x5a, 0x1e, 0x5d, 0x87, + 0xed, 0x63, 0x03, 0x1f, 0x99, 0xdd, 0xae, 0xd9, 0x69, 0xdb, 0x4d, 0xa3, 0x6d, 0x1a, 0x4d, 0x4d, + 0x46, 0xb7, 0xe0, 0x7a, 0xa3, 0xd3, 0x6a, 0x19, 0x0d, 0x8b, 0x92, 0xdb, 0x1d, 0xcb, 0x36, 0xbe, + 0x34, 0xbb, 0x56, 0x57, 0x2b, 0x50, 0xd9, 0x66, 0xab, 0x65, 0x1c, 0xd4, 0x5a, 0x76, 0x0d, 0x1f, + 0x9c, 0x1c, 0x19, 0x6d, 0x4b, 0xdb, 0xa0, 0x72, 0x12, 0x6a, 0xd3, 0x3c, 0x32, 0xda, 0x54, 0x9c, + 0x56, 0x42, 0x37, 0x00, 0x25, 0x64, 0xb3, 0xdd, 0x34, 0xbe, 0xb4, 0xad, 0xaf, 0x8e, 0x0d, 0xad, + 0x8c, 0xee, 0xc0, 0xcd, 0x84, 0x9e, 0xde, 0xa7, 0x76, 0x64, 0x68, 0x0a, 0xd2, 0xa0, 0x92, 0x4c, + 0x5a, 0x9d, 0xe3, 0xe7, 0x1a, 0xa4, 0xa5, 0xe3, 0xce, 0x2b, 0x6c, 0x34, 0x3a, 0xb8, 0xa9, 0xa9, + 0x69, 0xf2, 0x4b, 0xa3, 0x61, 0x75, 0xb0, 0x6d, 0x36, 0xb5, 0x0a, 0x05, 0x9f, 0x90, 0xbb, 0x46, + 0x0d, 0x37, 0x0e, 0x6d, 0x6c, 0x74, 0x4f, 0x5a, 0x96, 0x56, 0xa5, 0x26, 0xd8, 0x37, 0x5b, 0x06, + 0xd3, 0x68, 0xbf, 0x73, 0xd2, 0x6e, 0x6a, 0x9b, 0x68, 0x0b, 0xd4, 0x23, 0xc3, 0xaa, 0x25, 0x36, + 0xd9, 0xa2, 0xfb, 0x37, 0x6a, 0x8d, 0x43, 0x23, 0xa1, 0x68, 0x68, 0x17, 0x76, 0x1a, 0xb5, 0x36, + 0x65, 0x6a, 0x60, 0xa3, 0x66, 0x19, 0xf6, 0x7e, 0xa7, 0xd5, 0x34, 0xb0, 0xb6, 0x4d, 0x15, 0x9c, + 0x9b, 0x31, 0x5b, 0x86, 0x86, 0x52, 0x1c, 0x4d, 0xa3, 0x65, 0xcc, 0x38, 0xae, 0xa5, 0x38, 0x92, + 0x19, 0xca, 0xb1, 0x43, 0x95, 0xa9, 0x9f, 0x98, 0xad, 0xa6, 0x30, 0x14, 0x77, 0xda, 0x75, 0xb4, + 0x0d, 0xd5, 0x44, 0x99, 0x76, 0xcb, 0xec, 0x5a, 0xda, 0x0d, 0x74, 0x13, 0xae, 0x25, 0xa4, 0x23, + 0xc3, 0xc2, 0x66, 0x83, 0x5b, 0xf5, 0x26, 0x5d, 0xdb, 0x39, 0xb1, 0xec, 0xce, 0xbe, 0x7d, 0x64, + 0x1c, 0x75, 0xf0, 0x57, 0xda, 0xee, 0xc3, 0x3f, 0x4a, 0x50, 0x4e, 0x7a, 0x77, 0x54, 0x86, 0x42, + 0xbb, 0xd3, 0x36, 0xb4, 0x1c, 0x1d, 0xd5, 0x3b, 0x9d, 0x96, 0x26, 0xd1, 0x91, 0xd9, 0xb6, 0x9e, + 0x6a, 0x79, 0xa4, 0xc0, 0x86, 0xd9, 0xb6, 0x3e, 0x7a, 0xac, 0xc9, 0x62, 0xf8, 0xf1, 0x9e, 0x56, + 0x10, 0xc3, 0xc7, 0x9f, 0x68, 0x1b, 0x74, 0xb8, 0xdf, 0xea, 0xd4, 0x2c, 0x0d, 0x10, 0x40, 0xb1, + 0xd9, 0x39, 0xa9, 0xb7, 0x0c, 0x4d, 0xa5, 0xe3, 0xae, 0x85, 0xcd, 0xf6, 0x81, 0xb6, 0x43, 0x11, + 0x08, 0x4f, 0xd4, 0xcd, 0x76, 0x0d, 0x7f, 0xa5, 0xb9, 0xd4, 0x9a, 0x82, 0xc4, 0x99, 0xc9, 0xc3, + 0x06, 0x6c, 0xcd, 0x75, 0x9b, 0xa8, 0x08, 0xf9, 0x96, 0xa5, 0xe5, 0x50, 0x09, 0xe4, 0x96, 0x65, + 0x68, 0x12, 0x25, 0x18, 0x2f, 0xb4, 0x3c, 0xfd, 0x7b, 0x60, 0x69, 0x32, 0x9d, 0x38, 0xb0, 0x0c, + 0xad, 0x40, 0x09, 0x6d, 0x43, 0xdb, 0x78, 0xf8, 0x14, 0x36, 0x58, 0x07, 0x43, 0x03, 0xdf, 0x6c, + 0xbf, 0xac, 0xb5, 0xcc, 0x26, 0xd7, 0xeb, 0xe8, 0xa4, 0x6b, 0x69, 0x12, 0x43, 0x75, 0xd8, 0x39, + 0x69, 0xd1, 0x20, 0xaf, 0x40, 0x99, 0x52, 0xa9, 0xd7, 0x35, 0xf9, 0xe1, 0x7d, 0x28, 0xf2, 0xb2, + 0x4c, 0xd7, 0x98, 0xed, 0xae, 0x81, 0xe9, 0xce, 0x54, 0x23, 0xe6, 0x0f, 0x4d, 0x7a, 0x78, 0x0f, + 0xca, 0x49, 0x32, 0x53, 0x89, 0xd8, 0xa8, 0x51, 0xd9, 0x0a, 0x6c, 0xbc, 0xc2, 0x26, 0x5d, 0xb0, + 0xf7, 0x7d, 0x15, 0xaa, 0x47, 0x2c, 0xf5, 0xbb, 0x24, 0x7c, 0xeb, 0xf5, 0x08, 0xfa, 0x05, 0x68, + 0x8d, 0x90, 0x38, 0x31, 0x99, 0xdd, 0xb3, 0xd1, 0xc2, 0x8f, 0x36, 0xb7, 0x17, 0xdd, 0xb4, 0xf5, + 0x1c, 0xda, 0x87, 0xea, 0xa1, 0x13, 0xa5, 0xb8, 0xef, 0xcc, 0x75, 0xc7, 0xe9, 0xd2, 0x7d, 0xfb, + 0xc6, 0xb9, 0x3e, 0x8a, 0xbf, 0x25, 0xe5, 0x90, 0x09, 0xa8, 0x49, 0xa2, 0x5e, 0xe8, 0x9d, 0x92, + 0x55, 0x85, 0x2d, 0xc4, 0xa9, 0xe7, 0xd0, 0x0b, 0xea, 0xa7, 0xb1, 0x1f, 0xaf, 0x2a, 0xe7, 0xde, + 0x92, 0xc9, 0xe9, 0xa3, 0x53, 0x0e, 0xfd, 0x12, 0xb6, 0xba, 0x6f, 0xe8, 0xcf, 0x64, 0x2e, 0x9a, + 0xb3, 0x92, 0x78, 0x94, 0x5a, 0x2a, 0x2b, 0xf9, 0xba, 0xa9, 0xe7, 0xd0, 0x31, 0xa0, 0xac, 0x2c, + 0xf6, 0xb0, 0x71, 0x21, 0xc2, 0x65, 0x93, 0xec, 0x21, 0x23, 0x87, 0x9a, 0xb0, 0xd9, 0x0c, 0x83, + 0xd1, 0xaa, 0xfa, 0x2e, 0xf1, 0xe4, 0x67, 0xa0, 0xf2, 0x50, 0x60, 0x4f, 0x68, 0x28, 0xdb, 0x79, + 0xce, 0x9e, 0xd5, 0x96, 0xb1, 0x37, 0xa0, 0x9a, 0x38, 0xf0, 0x12, 0x01, 0xcb, 0x26, 0xf4, 0x1c, + 0x7a, 0x06, 0x0a, 0xd5, 0xe4, 0x87, 0x21, 0x30, 0x60, 0x8b, 0x2b, 0x30, 0xfd, 0x04, 0x38, 0x67, + 0x87, 0xec, 0x77, 0xc6, 0xe5, 0x62, 0x2a, 0x87, 0x4e, 0xb4, 0xa2, 0x8c, 0xe5, 0x01, 0xfd, 0x1c, + 0x36, 0xa9, 0x9b, 0xa7, 0xeb, 0xa3, 0x8b, 0x9d, 0x72, 0x7b, 0xf1, 0x2e, 0x22, 0x66, 0xa8, 0x71, + 0xc3, 0x60, 0x74, 0x35, 0xc5, 0x3e, 0x85, 0x22, 0x6f, 0x79, 0xd1, 0xee, 0x9c, 0x65, 0xa7, 0x5f, + 0xa7, 0xe6, 0xf4, 0x99, 0x7e, 0x8a, 0x64, 0x66, 0xa9, 0x4e, 0xdf, 0xcb, 0xea, 0x13, 0xb3, 0x39, + 0x07, 0x21, 0xfb, 0xdc, 0x75, 0x7b, 0xf1, 0x13, 0xbc, 0x9e, 0x43, 0x87, 0xf4, 0xc2, 0x35, 0x7b, + 0x76, 0x43, 0xff, 0x37, 0xd7, 0xef, 0xcf, 0xbd, 0xc8, 0x5d, 0x00, 0xe8, 0x73, 0x28, 0xf2, 0xe6, + 0x11, 0x2d, 0xfd, 0x02, 0x72, 0x3b, 0x3b, 0x93, 0xfa, 0xc4, 0xc0, 0xf2, 0x70, 0x6b, 0xee, 0x4b, + 0x0c, 0x7a, 0x7f, 0x81, 0xa0, 0xec, 0x77, 0x9a, 0x0b, 0x25, 0x3e, 0x01, 0xb9, 0x31, 0x74, 0x97, + 0x54, 0x86, 0x39, 0x90, 0xa9, 0x17, 0xfa, 0x1c, 0xaa, 0x01, 0xcc, 0x9e, 0x4f, 0x51, 0xb6, 0x9d, + 0x9d, 0x7b, 0x57, 0x5d, 0xe6, 0xdc, 0x03, 0xd8, 0x3e, 0x0e, 0xc9, 0x20, 0x70, 0xdc, 0x2b, 0x96, + 0x81, 0x27, 0xb0, 0xc1, 0xde, 0x98, 0xe7, 0xd2, 0x6f, 0xf6, 0xee, 0xbc, 0x8c, 0xf1, 0x19, 0x7b, + 0x9a, 0x1f, 0x39, 0xbd, 0x18, 0xdd, 0x3a, 0xff, 0x42, 0x22, 0x1e, 0x9c, 0x97, 0x31, 0xd7, 0xa1, + 0x2c, 0xfc, 0x56, 0x47, 0xb7, 0x97, 0xb9, 0xf3, 0xb8, 0x7e, 0x91, 0xf9, 0xeb, 0xa5, 0xaf, 0x37, + 0x86, 0x51, 0x7f, 0x74, 0x7a, 0x5a, 0x64, 0xff, 0x37, 0xf3, 0xf1, 0x7f, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x5b, 0x74, 0x17, 0x4d, 0x48, 0x23, 0x00, 0x00, } diff --git a/proto/message.proto b/proto/message.proto index 96a2924607..6742fc2793 100644 --- a/proto/message.proto +++ b/proto/message.proto @@ -708,5 +708,6 @@ message TimeSyncMsg{ message Key2SegMsg { int64 uid = 1; - repeated int64 segment_id = 2; + uint64 timestamp = 2; + repeated int64 segment_id = 3; }